Author: akhaldi
Date: Fri Sep 20 09:46:21 2013
New Revision: 60236
URL:
http://svn.reactos.org/svn/reactos?rev=60236&view=rev
Log:
[INETMIB1]
* Sync with Wine 1.7.1.
CORE-7469
Modified:
trunk/reactos/dll/win32/inetmib1/CMakeLists.txt
trunk/reactos/dll/win32/inetmib1/main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/inetmib1/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] Fri Sep 20 09:46:21 2013
@@ -13,11 +13,5 @@
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)
Modified: trunk/reactos/dll/win32/inetmib1/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/main.c?…
==============================================================================
--- trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] Fri Sep 20 09:46:21 2013
@@ -1456,10 +1456,9 @@
DisableThreadLibraryCalls(hinstDLL);
break;
case DLL_PROCESS_DETACH:
+ if (lpvReserved) break;
cleanup();
break;
- default:
- break;
}
return TRUE;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 20 09:46:21 2013
@@ -85,7 +85,7 @@
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