[SHLWAPI]

* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60380

diff --git a/reactos/dll/win32/shlwapi/CMakeLists.txt b/reactos/dll/win32/shlwapi/CMakeLists.txt
index 082455d..f760833 100644 (file)
--- a/reactos/dll/win32/shlwapi/CMakeLists.txt
+++ b/reactos/dll/win32/shlwapi/CMakeLists.txt
@@ -1,12 +1,9 @@
 
 

-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

 add_definitions(
     -D__WINESRC__
     -D_SHLWAPI_)
 
 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
 spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE


@@ -24,14 +21,12 @@ list(APPEND SOURCE
     thread.c
     url.c
     wsprintf.c
     thread.c
     url.c
     wsprintf.c

-    shlwapi.rc

     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def)
 
     ${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)
 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)
 add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all)

-

diff --git a/reactos/dll/win32/shlwapi/shlwapi.spec b/reactos/dll/win32/shlwapi/shlwapi.spec
index 72c2060..da9991f 100644 (file)
--- a/reactos/dll/win32/shlwapi/shlwapi.spec
+++ b/reactos/dll/win32/shlwapi/shlwapi.spec
@@ -548,13 +548,13 @@
 
 @ stdcall AssocCreate(double double ptr ptr)
 @ stdcall AssocGetPerceivedType(wstr ptr ptr ptr)
 
 @ 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)
 @ stdcall ChrCmpIA(long long)
 @ stdcall ChrCmpIW(long long)
 @ stdcall ColorAdjustLuma(long long long)

diff --git a/reactos/dll/win32/shlwapi/shlwapi_main.c b/reactos/dll/win32/shlwapi/shlwapi_main.c
index 957e1d3..44889e6 100644 (file)
--- a/reactos/dll/win32/shlwapi/shlwapi_main.c
+++ b/reactos/dll/win32/shlwapi/shlwapi_main.c
@@ -68,6 +68,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
            SHLWAPI_ThreadRef_index = TlsAlloc();
            break;
          case DLL_PROCESS_DETACH:
            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;
        }
            if (SHLWAPI_ThreadRef_index != TLS_OUT_OF_INDEXES) TlsFree(SHLWAPI_ThreadRef_index);
            break;
        }

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 9e8d8bf..2d59d02 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -177,7 +177,7 @@ reactos/dll/win32/shdoclc         # Synced to Wine-1.5.19
 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/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
 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