Jacek Caban : hhctrl.ocx: Move DllMain to hhctrl.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5faa1f6b1e371a77ea8de389fd386b50c66c1802
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5faa1f6b1e371a77ea8de389fd...

Author: Jacek Caban 
Date:   Thu Feb 22 22:48:35 2007 +0100

hhctrl.ocx: Move DllMain to hhctrl.c.

---

dlls/hhctrl.ocx/Makefile.in |    1 -
 dlls/hhctrl.ocx/hhctrl.c    |   18 +++++++++++++++++
 dlls/hhctrl.ocx/main.c      |   45 -------------------------------------------
 3 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in
index d3dca8f..ae517c9 100644
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@@ -10,7 +10,6 @@ C_SRCS = \
    chm.c \
    help.c \
    hhctrl.c \
-	main.c \
    regsvr.c \
    webbrowser.c

diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c
index 2881da0..445438d 100644
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -27,6 +27,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);

int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine);

+HINSTANCE hhctrl_hinstance;
+
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved)
+{
+    TRACE("(%p,%d,%p)\n", hInstance, fdwReason, lpvReserved);
+
+    switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        hhctrl_hinstance = hInstance;
+        DisableThreadLibraryCalls(hInstance);
+        break;
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}
+
 static const char *command_to_string(UINT command)
 {
 #define X(x) case x: return #x
diff --git a/dlls/hhctrl.ocx/main.c b/dlls/hhctrl.ocx/main.c
deleted file mode 100644
index 1faf1d0..0000000
--- a/dlls/hhctrl.ocx/main.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * HTML Help
- *
- * Copyright 2005 James Hawkins
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
-
-HINSTANCE hhctrl_hinstance;
-
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(%p,%d,%p)\n", hInstance, fdwReason, lpvReserved);
-
-    switch (fdwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        hhctrl_hinstance = hInstance;
-        DisableThreadLibraryCalls(hInstance);
-        break;
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}