Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL][ATL80][ATL100] Sync with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=69921
This commit is contained in:
Amine Khaldi 2015-11-17 12:54:52 +00:00
parent f2ae834b5f
commit 807f828f6e
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/atl/CMakeLists.txt
View file

@ -1,4 +1,7 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D__WINESRC__
-D_ATL_VER=_ATL_VER_30)
@ -27,6 +30,6 @@ add_typelib(atl_lib.idl)
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)

9
reactos/dll/win32/atl/registrar.c
View file

@ -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 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO
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);

5
reactos/dll/win32/atl100/CMakeLists.txt
View file

@ -1,4 +1,7 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D__WINESRC__
-D_ATL_VER=_ATL_VER_100)
@ -19,6 +22,6 @@ add_library(atl100 SHARED
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)

5
reactos/dll/win32/atl80/CMakeLists.txt
View file

@ -1,4 +1,7 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D__WINESRC__
-D_ATL_VER=_ATL_VER_80)
@ -17,6 +20,6 @@ list(APPEND SOURCE
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)

6
reactos/media/doc/README.WINE
View file

@ -45,9 +45,9 @@ reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.47
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