[ros-diffs] [akhaldi] 60380: [SHLWAPI] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 16:51:42 2013
New Revision: 60380

URL: http://svn.reactos.org/svn/reactos?rev=60380&view=rev
Log:
[SHLWAPI]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/shlwapi/CMakeLists.txt
    trunk/reactos/dll/win32/shlwapi/shlwapi.spec
    trunk/reactos/dll/win32/shlwapi/shlwapi_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt	[iso-8859-1] Thu Sep 26 16:51:42 2013
@@ -1,12 +1,9 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(
     -D__WINESRC__
     -D_SHLWAPI_)
 
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
-
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
@@ -24,14 +21,12 @@
     thread.c
     url.c
     wsprintf.c
-    shlwapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def)
 
-add_library(shlwapi SHARED ${SOURCE})
+add_library(shlwapi SHARED ${SOURCE} shlwapi.rc)
 set_module_type(shlwapi win32dll)
-target_link_libraries(shlwapi wine uuid)
-add_delay_importlibs(shlwapi userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon
shell32 winmm version)
-add_importlibs(shlwapi user32 gdi32 advapi32 msvcrt wininet kernel32 ntdll)
+target_link_libraries(shlwapi uuid wine)
+add_delay_importlibs(shlwapi userenv oleaut32 ole32 comdlg32 mpr mlang urlmon shell32
winmm version)
+add_importlibs(shlwapi user32 gdi32 advapi32 wininet msvcrt kernel32 ntdll)
 add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all)
-

Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec	[iso-8859-1] Thu Sep 26 16:51:42 2013
@@ -548,13 +548,13 @@
 
 @ stdcall AssocCreate(double double ptr ptr)
 @ stdcall AssocGetPerceivedType(wstr ptr ptr ptr)
-@ stdcall AssocIsDangerous(long)
-@ stdcall AssocQueryKeyA(long long str ptr ptr)
-@ stdcall AssocQueryKeyW(long long wstr ptr ptr)
-@ stdcall AssocQueryStringA(long long ptr ptr ptr ptr)
-@ stdcall AssocQueryStringByKeyA(long long ptr ptr ptr ptr)
-@ stdcall AssocQueryStringByKeyW(long long ptr ptr ptr ptr)
-@ stdcall AssocQueryStringW(long long ptr ptr ptr ptr)
+@ stdcall AssocIsDangerous(wstr)
+@ stdcall AssocQueryKeyA(long long str str ptr)
+@ stdcall AssocQueryKeyW(long long wstr wstr ptr)
+@ stdcall AssocQueryStringA(long long str str ptr ptr)
+@ stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr)
+@ stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr)
+@ stdcall AssocQueryStringW(long long wstr wstr ptr ptr)
 @ stdcall ChrCmpIA(long long)
 @ stdcall ChrCmpIW(long long)
 @ stdcall ColorAdjustLuma(long long long)

Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi_main.c	[iso-8859-1] Thu Sep 26 16:51:42 2013
@@ -68,6 +68,7 @@
 	    SHLWAPI_ThreadRef_index = TlsAlloc();
 	    break;
 	  case DLL_PROCESS_DETACH:
+            if (fImpLoad) break;
 	    if (SHLWAPI_ThreadRef_index != TLS_OUT_OF_INDEXES)
TlsFree(SHLWAPI_ThreadRef_index);
 	    break;
 	}

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] Thu Sep 26 16:51:42 2013
@@ -177,7 +177,7 @@
 reactos/dll/win32/shdocvw         # Synced to Wine-1.7.1
 reactos/dll/win32/shell32         # Forked at Wine-20071011
 reactos/dll/win32/shfolder        # Synced to Wine-1.7.1
-reactos/dll/win32/shlwapi         # Synced to Wine-1.5.26
+reactos/dll/win32/shlwapi         # Synced to Wine-1.7.1
 reactos/dll/win32/slbcsp          # Synced to Wine-1.5.19
 reactos/dll/win32/snmpapi         # Synced to Wine-1.5.19
 reactos/dll/win32/softpub         # Synced to Wine-1.5.19