From a63c9f220471a952863ecd7acd0616bbd20841fc Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 26 Sep 2013 16:46:39 +0000 Subject: [PATCH] [SENSAPI] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60376 --- reactos/dll/win32/sensapi/CMakeLists.txt | 3 --- reactos/dll/win32/sensapi/sensapi.c | 22 ---------------------- reactos/media/doc/README.WINE | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/reactos/dll/win32/sensapi/CMakeLists.txt b/reactos/dll/win32/sensapi/CMakeLists.txt index 70e9a32dfa4..770f2a499b6 100644 --- a/reactos/dll/win32/sensapi/CMakeLists.txt +++ b/reactos/dll/win32/sensapi/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(sensapi.dll sensapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def) add_library(sensapi SHARED ${SOURCE}) - set_module_type(sensapi win32dll) target_link_libraries(sensapi wine) add_importlibs(sensapi msvcrt kernel32 ntdll) - add_cd_file(TARGET sensapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/sensapi/sensapi.c b/reactos/dll/win32/sensapi/sensapi.c index 22fbb6e5094..209cc744876 100644 --- a/reactos/dll/win32/sensapi/sensapi.c +++ b/reactos/dll/win32/sensapi/sensapi.c @@ -46,28 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -static HMODULE SENSAPI_hModule; - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - SENSAPI_hModule = hinstDLL; - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} - BOOL WINAPI IsDestinationReachableA(LPCSTR lpszDestination, LPQOCINFO lpQOCInfo) { FIXME("%s,%p\n", lpszDestination, lpQOCInfo); diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 6eec8ab8573..ed8064e8c1b 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -171,7 +171,7 @@ reactos/dll/win32/schannel # Synced to Wine-1.5.19 reactos/dll/win32/scrrun # Synced to Wine-1.7.1 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to Wine-1.5.4 +reactos/dll/win32/sensapi # Synced to Wine-1.7.1 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 reactos/dll/win32/shdocvw # Synced to Wine-1.5.26