[SNMPAPI]
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 16:55:40 +0000 (16:55 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 16:55:40 +0000 (16:55 +0000)
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60383

reactos/dll/win32/snmpapi/CMakeLists.txt
reactos/dll/win32/snmpapi/main.c
reactos/media/doc/README.WINE

index 6a5f18f..7a5fa8b 100644 (file)
@@ -8,11 +8,10 @@ spec2def(snmpapi.dll snmpapi.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     main.c
-    snmpapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/snmpapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def)
 
-add_library(snmpapi SHARED ${SOURCE})
+add_library(snmpapi SHARED ${SOURCE} snmpapi.rc)
 set_module_type(snmpapi win32dll)
 target_link_libraries(snmpapi wine)
 add_importlibs(snmpapi msvcrt kernel32 ntdll)
index e66f3c9..ddd4d1f 100644 (file)
@@ -133,8 +133,6 @@ BOOL WINAPI DllMain(
         DisableThreadLibraryCalls(hInstDLL);
         startTime = GetTickCount64();
         break;
-    case DLL_PROCESS_DETACH:
-        break;
     }
 
     return TRUE;
index f7da4d1..7d91364 100644 (file)
@@ -179,7 +179,7 @@ reactos/dll/win32/shell32         # Forked at Wine-20071011
 reactos/dll/win32/shfolder        # Synced to Wine-1.7.1
 reactos/dll/win32/shlwapi         # Synced to Wine-1.7.1
 reactos/dll/win32/slbcsp          # Synced to Wine-1.7.1
-reactos/dll/win32/snmpapi         # Synced to Wine-1.5.19
+reactos/dll/win32/snmpapi         # Synced to Wine-1.7.1
 reactos/dll/win32/softpub         # Synced to Wine-1.5.19
 reactos/dll/win32/spoolss         # Synced to Wine-1.5.19
 reactos/dll/win32/stdole2.tlb     # Synced to Wine-1.5.19