Author: akhaldi
Date: Fri Nov 20 11:06:46 2015
New Revision: 69960
URL:
http://svn.reactos.org/svn/reactos?rev=69960&view=rev
Log:
[LOCALSPL] Sync with Wine Staging 1.7.55. CORE-10536
Modified:
trunk/reactos/dll/win32/localspl/CMakeLists.txt
trunk/reactos/dll/win32/localspl/provider.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Fri Nov 20 11:06:46 2015
@@ -1,3 +1,6 @@
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -17,6 +20,6 @@
set_module_type(localspl win32dll)
target_link_libraries(localspl wine)
-add_importlibs(localspl spoolss user32 advapi32 shlwapi msvcrt kernel32 ntdll)
+add_importlibs(localspl spoolss user32 advapi32 advapi32_vista msvcrt kernel32 ntdll)
add_pch(localspl localspl_private.h SOURCE)
add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/localspl/provider.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide…
==============================================================================
--- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Fri Nov 20 11:06:46 2015
@@ -1838,7 +1838,7 @@
return FALSE;
}
- if(SHDeleteKeyW(hroot, pMonitorName) == ERROR_SUCCESS) {
+ if(RegDeleteTreeW(hroot, pMonitorName) == ERROR_SUCCESS) {
TRACE("%s deleted\n", debugstr_w(pMonitorName));
RegCloseKey(hroot);
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 Nov 20 11:06:46 2015
@@ -90,7 +90,7 @@
reactos/dll/win32/jscript # Synced to WineStaging-1.7.55
reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.47
reactos/dll/win32/loadperf # Synced to WineStaging-1.7.47
-reactos/dll/win32/localspl # Synced to WineStaging-1.7.47
+reactos/dll/win32/localspl # Synced to WineStaging-1.7.55
reactos/dll/win32/localui # Synced to WineStaging-1.7.47
reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47
reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47