Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHLWAPI]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60380
This commit is contained in:
Amine Khaldi 2013-09-26 16:51:42 +00:00
parent 479a687ca4
commit 1cae2abf57
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/shlwapi/CMakeLists.txt
View file

@ -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 @@ list(APPEND SOURCE
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)

14
reactos/dll/win32/shlwapi/shlwapi.spec
View file

@ -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)

1
reactos/dll/win32/shlwapi/shlwapi_main.c
View file

@ -68,6 +68,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
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;
}

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

@ -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/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