Module: wine Branch: master Commit: 1b4c1ab900b8d640a208fd83810eee44e306f7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4c1ab900b8d640a208fd8381... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:13:04 2013 +0200 comctl32: Don't bother to unregister classes at process exit. --- dlls/comctl32/commctrl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c0d0043..f08288d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -157,7 +157,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: - /* clean up subclassing */ + if (lpvReserved) break; + /* clean up subclassing */ THEMING_Uninitialize(); /* unregister all common control classes */ @@ -185,14 +186,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /* delete local pattern brush */ DeleteObject (COMCTL32_hPattern55AABrush); - COMCTL32_hPattern55AABrush = NULL; DeleteObject (COMCTL32_hPattern55AABitmap); - COMCTL32_hPattern55AABitmap = NULL; /* delete global subclassing atom */ GlobalDeleteAtom (LOWORD(COMCTL32_wSubclass)); TRACE("Subclassing atom deleted: %p\n", COMCTL32_wSubclass); - COMCTL32_wSubclass = NULL; break; }