[ros-diffs] [akhaldi] 69921: [ATL][ATL80][ATL100] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Tue Nov 17 12:54:52 2015
New Revision: 69921

URL: http://svn.reactos.org/svn/reactos?rev=69921&view=rev
Log:
[ATL][ATL80][ATL100] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/dll/win32/atl/CMakeLists.txt
    trunk/reactos/dll/win32/atl/registrar.c
    trunk/reactos/dll/win32/atl100/CMakeLists.txt
    trunk/reactos/dll/win32/atl80/CMakeLists.txt
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t…
==============================================================================
--- trunk/reactos/dll/win32/atl/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/CMakeLists.txt	[iso-8859-1] Tue Nov 17 12:54:52 2015
@@ -1,3 +1,6 @@
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(
     -D__WINESRC__
@@ -27,6 +30,6 @@
 add_dependencies(atl stdole2)
 set_module_type(atl win32dll)
 target_link_libraries(atl uuid wine)
-add_importlibs(atl oleaut32 ole32 user32 gdi32 advapi32 shlwapi msvcrt kernel32 ntdll)
+add_importlibs(atl oleaut32 ole32 user32 gdi32 advapi32 advapi32_vista shlwapi msvcrt
kernel32 ntdll)
 add_pch(atl precomp.h SOURCE)
 add_cd_file(TARGET atl DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/atl/registrar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?…
==============================================================================
--- trunk/reactos/dll/win32/atl/registrar.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/registrar.c	[iso-8859-1] Tue Nov 17 12:54:52 2015
@@ -18,11 +18,6 @@
 
 #include <precomp.h>
 
-#define NO_SHLWAPI_PATH
-#define NO_SHLWAPI_STRFCNS
-#define NO_SHLWAPI_GDI
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
 
 /**************************************************************
  * ATLRegistrar implementation
@@ -232,10 +227,10 @@
                 strbuf_write(buf->str, &name, -1);
             }else if(key_type == DO_DELETE) {
                 TRACE("Deleting %s\n", debugstr_w(buf->str));
-                SHDeleteKeyW(parent_key, buf->str);
+                RegDeleteTreeW(parent_key, buf->str);
             }else {
                 if(key_type == FORCE_REMOVE)
-                    SHDeleteKeyW(parent_key, buf->str);
+                    RegDeleteTreeW(parent_key, buf->str);
                 lres = RegCreateKeyW(parent_key, buf->str, &hkey);
                 if(lres != ERROR_SUCCESS) {
                     WARN("Could not create(open) key: %08x\n", lres);

Modified: trunk/reactos/dll/win32/atl100/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/atl100/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl100/CMakeLists.txt	[iso-8859-1] Tue Nov 17 12:54:52 2015
@@ -1,3 +1,6 @@
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(
     -D__WINESRC__
@@ -19,6 +22,6 @@
 
 set_module_type(atl100 win32dll)
 target_link_libraries(atl100 uuid wine)
-add_importlibs(atl100 ole32 oleaut32 user32 gdi32 advapi32 shlwapi msvcrt kernel32
ntdll)
+add_importlibs(atl100 ole32 oleaut32 user32 gdi32 advapi32 advapi32_vista shlwapi msvcrt
kernel32 ntdll)
 add_pch(atl100 precomp.h SOURCE)
 add_cd_file(TARGET atl100 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/atl80/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/atl80/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl80/CMakeLists.txt	[iso-8859-1] Tue Nov 17 12:54:52 2015
@@ -1,3 +1,6 @@
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(
     -D__WINESRC__
@@ -17,6 +20,6 @@
 add_library(atl80 SHARED ${SOURCE})
 set_module_type(atl80 win32dll)
 target_link_libraries(atl80 uuid wine)
-add_importlibs(atl80 oleaut32 user32 ole32 gdi32 advapi32 shlwapi msvcrt kernel32 ntdll)
+add_importlibs(atl80 oleaut32 user32 ole32 gdi32 advapi32 advapi32_vista shlwapi msvcrt
kernel32 ntdll)
 add_pch(atl80 precomp.h SOURCE)
 add_cd_file(TARGET atl80 DESTINATION reactos/system32 FOR all)

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] Tue Nov 17 12:54:52 2015
@@ -45,9 +45,9 @@
 reactos/dll/win32/activeds            # Synced to WineStaging-1.7.47
 reactos/dll/win32/actxprxy            # Synced to WineStaging-1.7.47
 reactos/dll/win32/advpack             # Synced to WineStaging-1.7.55
-reactos/dll/win32/atl                 # Synced to WineStaging-1.7.47
-reactos/dll/win32/atl80               # Synced to WineStaging-1.7.47
-reactos/dll/win32/atl100              # Synced to WineStaging-1.7.47
+reactos/dll/win32/atl                 # Synced to WineStaging-1.7.55
+reactos/dll/win32/atl80               # Synced to WineStaging-1.7.55
+reactos/dll/win32/atl100              # Synced to WineStaging-1.7.55
 reactos/dll/win32/avifil32            # Synced to WineStaging-1.7.47
 reactos/dll/win32/bcrypt              # Synced to WineStaging-1.7.47
 reactos/dll/win32/browseui            # Out of sync