Changeset 5416 for trunk/src/comctl32/initterm.cpp

Timestamp:

Mar 31, 2001, 3:25:59 PM (24 years ago)

Author:

sandervl

Message:

Resync with Wine + previous merge fixes

File:

• trunk/src/comctl32/initterm.cpp (modified) (2 diffs)

trunk/src/comctl32/initterm.cpp

@@ -43 +43 @@
 static HMODULE dllHandle = 0;
 
-void CDECL RegisterCOMCTL32WindowClasses(unsigned long hinstDLL);
-void CDECL UnregisterCOMCTL32WindowClasses(void);
+BOOL WINAPI COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 
 //******************************************************************************
@@ -53 +52 @@
    {
    case DLL_PROCESS_ATTACH:
-        /* register Win32 window classes implemented in this DLL */
-        RegisterCOMCTL32WindowClasses(hinstDLL);
-        return TRUE;
-
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
-        return TRUE;
+        return COMCTL32_LibMain(hinstDLL, fdwReason, fImpLoad);
 
    case DLL_PROCESS_DETACH:
-        /* unregister Win32 window classes */
-        UnregisterCOMCTL32WindowClasses();
+   {
+        BOOL ret = COMCTL32_LibMain(hinstDLL, fdwReason, fImpLoad);
         ctordtorTerm();
-        return TRUE;
+        return ret;
+   }
    }
    return FALSE;