From 4027a1149c6a273a09abe99cdf291a7296ecf076 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Wed, 19 Apr 2006 20:34:53 +0200
Subject: [PATCH] shdocvw: Move IEWinMain to iexplore.c.

---
 dlls/shdocvw/iexplore.c     | 30 ++++++++++++++++++++++++++++++
 dlls/shdocvw/shdocvw_main.c | 30 ------------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c
index b39e2930f6c..62bc81ce307 100644
--- a/dlls/shdocvw/iexplore.c
+++ b/dlls/shdocvw/iexplore.c
@@ -580,3 +580,33 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv)
 
     return hres;
 }
+
+/******************************************************************
+ *		IEWinMain            (SHDOCVW.101)
+ *
+ * Only returns on error.
+ */
+DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow)
+{
+    LPWSTR url;
+    DWORD len;
+
+    FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow);
+
+    CoInitialize(NULL);
+
+    /* FIXME: parse the command line properly, handle -Embedding */
+
+    len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0);
+    url = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR));
+    MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len);
+
+    create_ie_window(url);
+
+    HeapFree(GetProcessHeap(), 0, url);
+
+     CoUninitialize();
+
+    ExitProcess(0);
+    return 0;
+}
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index e93609574ba..0093243a2d6 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -637,33 +637,3 @@ DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown,
         return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp);
     return ERROR_CALL_NOT_IMPLEMENTED;
 }
-
-/******************************************************************
- *		IEWinMain            (SHDOCVW.101)
- *
- * Only returns on error.
- */
-DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow)
-{
-    LPWSTR url;
-    DWORD len;
-
-    FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow);
-
-    CoInitialize(NULL);
-
-    /* FIXME: parse the command line properly, handle -Embedding */
-
-    len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0);
-    url = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR));
-    MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len);
-
-    create_ie_window(url);
-
-    HeapFree(GetProcessHeap(), 0, url);
-
-    CoUninitialize();
-
-    ExitProcess(0);
-    return 0;
-}
-- 
2.11.4.GIT