From add3ddda329d199ce2561561ea16e6772b78c6e4 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 20 Nov 2015 11:06:46 +0000 Subject: [PATCH] [LOCALSPL] Sync with Wine Staging 1.7.55. CORE-10536 svn path=/trunk/; revision=69960 --- reactos/dll/win32/localspl/CMakeLists.txt | 5 ++++- reactos/dll/win32/localspl/provider.c | 2 +- reactos/media/doc/README.WINE | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/localspl/CMakeLists.txt b/reactos/dll/win32/localspl/CMakeLists.txt index 92e88073716..e9c6970c377 100644 --- a/reactos/dll/win32/localspl/CMakeLists.txt +++ b/reactos/dll/win32/localspl/CMakeLists.txt @@ -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) diff --git a/reactos/dll/win32/localspl/provider.c b/reactos/dll/win32/localspl/provider.c index d07a04ca626..4546a22b854 100644 --- a/reactos/dll/win32/localspl/provider.c +++ b/reactos/dll/win32/localspl/provider.c @@ -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; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 5cdf15db325..e5bb20c746a 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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