Author: akhaldi
Date: Thu Sep 26 16:46:39 2013
New Revision: 60376
URL:
http://svn.reactos.org/svn/reactos?rev=60376&view=rev
Log:
[SENSAPI]
* Sync with Wine 1.7.1.
CORE-7469
Modified:
trunk/reactos/dll/win32/sensapi/CMakeLists.txt
trunk/reactos/dll/win32/sensapi/sensapi.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/sensapi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:46:39 2013
@@ -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 @@
${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)
Modified: trunk/reactos/dll/win32/sensapi/sensapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/sensapi.…
==============================================================================
--- trunk/reactos/dll/win32/sensapi/sensapi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sensapi/sensapi.c [iso-8859-1] Thu Sep 26 16:46:39 2013
@@ -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);
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] Thu Sep 26 16:46:39 2013
@@ -171,7 +171,7 @@
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