From b2cee3e28cc3d21f80b970a1b3c726844de4e5fc Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 26 Sep 2013 16:55:40 +0000 Subject: [PATCH] [SNMPAPI] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60383 --- reactos/dll/win32/snmpapi/CMakeLists.txt | 3 +-- reactos/dll/win32/snmpapi/main.c | 2 -- reactos/media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/snmpapi/CMakeLists.txt b/reactos/dll/win32/snmpapi/CMakeLists.txt index 6a5f18f9497..7a5fa8b7a22 100644 --- a/reactos/dll/win32/snmpapi/CMakeLists.txt +++ b/reactos/dll/win32/snmpapi/CMakeLists.txt @@ -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) diff --git a/reactos/dll/win32/snmpapi/main.c b/reactos/dll/win32/snmpapi/main.c index e66f3c9f5b9..ddd4d1f2ee8 100644 --- a/reactos/dll/win32/snmpapi/main.c +++ b/reactos/dll/win32/snmpapi/main.c @@ -133,8 +133,6 @@ BOOL WINAPI DllMain( DisableThreadLibraryCalls(hInstDLL); startTime = GetTickCount64(); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index f7da4d1bf35..7d91364ad40 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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 -- 2.17.1