[LOCALSPL] Sync with Wine Staging 1.7.55. CORE-10536
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 20 Nov 2015 11:06:46 +0000 (11:06 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 20 Nov 2015 11:06:46 +0000 (11:06 +0000)
svn path=/trunk/; revision=69960

reactos/dll/win32/localspl/CMakeLists.txt
reactos/dll/win32/localspl/provider.c
reactos/media/doc/README.WINE

index 92e8807..e9c6970 100644 (file)
@@ -1,4 +1,7 @@
 
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
+
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(localspl.dll localspl.spec)
@@ -17,6 +20,6 @@ add_library(localspl SHARED
 
 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)
index d07a04c..4546a22 100644 (file)
@@ -1838,7 +1838,7 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo
         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;
index 5cdf15d..e5bb20c 100644 (file)
@@ -90,7 +90,7 @@ reactos/dll/win32/itss                # Synced to WineStaging-1.7.47
 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