From 9f9da88fd008986ff696f61a96c14c4b6433cb6e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 20 Sep 2013 09:46:21 +0000 Subject: [PATCH] [INETMIB1] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60236 --- reactos/dll/win32/inetmib1/CMakeLists.txt | 8 +------- reactos/dll/win32/inetmib1/main.c | 3 +-- reactos/media/doc/README.WINE | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/reactos/dll/win32/inetmib1/CMakeLists.txt b/reactos/dll/win32/inetmib1/CMakeLists.txt index 85ff339263b..8764effe22d 100644 --- a/reactos/dll/win32/inetmib1/CMakeLists.txt +++ b/reactos/dll/win32/inetmib1/CMakeLists.txt @@ -13,11 +13,5 @@ add_library(inetmib1 SHARED ${SOURCE}) set_module_type(inetmib1 win32dll) target_link_libraries(inetmib1 wine) add_delay_importlibs(inetmib1 iphlpapi) - -add_importlibs(inetmib1 - msvcrt - snmpapi - kernel32 - ntdll) - +add_importlibs(inetmib1 snmpapi msvcrt kernel32 ntdll) add_cd_file(TARGET inetmib1 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/inetmib1/main.c b/reactos/dll/win32/inetmib1/main.c index d56c2b37d7c..9bb2eb3e467 100644 --- a/reactos/dll/win32/inetmib1/main.c +++ b/reactos/dll/win32/inetmib1/main.c @@ -1456,10 +1456,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; cleanup(); break; - default: - break; } return TRUE; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 3761fbfa41f..aebcae295d8 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -85,7 +85,7 @@ reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 reactos/dll/win32/imagehlp # Synced to Wine-1.7.1 reactos/dll/win32/imm32 # Synced to Wine-1.5.19 reactos/dll/win32/inetcomm # Synced to Wine-1.7.1 -reactos/dll/win32/inetmib1 # Synced to Wine-1.5.4 +reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 reactos/dll/win32/initpki # Synced to Wine-1.5.19 reactos/dll/win32/inseng # Synced to Wine-1.5.4 reactos/dll/win32/iphlpapi # Out of sync