diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index d3dca8f47f2..ae517c9ae49 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 2881da06880..445438d0822 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 1faf1d017e0..00000000000 --- 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 - -#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; -}