Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 60389: - Separate NtGdiHfontCreate to allow calling it direct without SEH.
by jimtabor＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: jimtabor Date: Thu Sep 26 23:59:19 2013 New Revision: 60389 URL: http://svn.reactos.org/svn/reactos?rev=60389&view=rev Log: - Separate NtGdiHfontCreate to allow calling it direct without SEH. Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Thu Sep 26 23:59:19 2013 @@ -1003,6 +1003,61 @@ return Ret; } + +HFONT +APIENTRY +HfontCreate( + IN PENUMLOGFONTEXDVW pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData ) +{ + HFONT hNewFont; + PLFONT plfont; + + if (!pelfw) + { + return NULL; + } + + plfont = LFONT_AllocFontWithHandle(); + if (!plfont) + { + return NULL; + } + hNewFont = plfont->BaseObject.hHmgr; + + plfont->lft = lft; + plfont->fl = fl; + RtlCopyMemory (&plfont->logfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); + ExInitializePushLock(&plfont->lock); + + if (pelfw->elfEnumLogfontEx.elfLogFont.lfEscapement != + pelfw->elfEnumLogfontEx.elfLogFont.lfOrientation) + { + /* This should really depend on whether GM_ADVANCED is set */ + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + LFONT_UnlockFont(plfont); + + if (pvCliData && hNewFont) + { + // FIXME: Use GDIOBJ_InsertUserData + KeEnterCriticalRegion(); + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hNewFont); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + Entry->UserData = pvCliData; + } + KeLeaveCriticalRegion(); + } + + return hNewFont; +} + + HFONT APIENTRY NtGdiHfontCreate( @@ -1013,8 +1068,6 @@ IN PVOID pvCliData ) { ENUMLOGFONTEXDVW SafeLogfont; - HFONT hNewFont; - PLFONT plfont; NTSTATUS Status = STATUS_SUCCESS; /* Silence GCC warnings */ @@ -1042,40 +1095,7 @@ return NULL; } - plfont = LFONT_AllocFontWithHandle(); - if (!plfont) - { - return NULL; - } - hNewFont = plfont->BaseObject.hHmgr; - - plfont->lft = lft; - plfont->fl = fl; - RtlCopyMemory (&plfont->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); - ExInitializePushLock(&plfont->lock); - - if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != - SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) - { - /* This should really depend on whether GM_ADVANCED is set */ - plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - LFONT_UnlockFont(plfont); - - if (pvCliData && hNewFont) - { - // FIXME: Use GDIOBJ_InsertUserData - KeEnterCriticalRegion(); - { - INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hNewFont); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - Entry->UserData = pvCliData; - } - KeLeaveCriticalRegion(); - } - - return hNewFont; + return HfontCreate(&SafeLogfont, cjElfw, lft, fl, pvCliData); }

1 0

[hbelusca] 60388: [NDK]: One can use either RtlGetLengthWithoutTrailingPathSeparators or RtlGetLengthWithoutTrailingPathSeperators...
by hbelusca＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: hbelusca Date: Thu Sep 26 20:12:21 2013 New Revision: 60388 URL: http://svn.reactos.org/svn/reactos?rev=60388&view=rev Log: [NDK]: One can use either RtlGetLengthWithoutTrailingPathSeparators or RtlGetLengthWithoutTrailingPathSeperators... Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Thu Sep 26 20:12:21 2013 @@ -2733,6 +2733,12 @@ _In_ PCUNICODE_STRING PathString, _Out_ PULONG Length ); +/* + * NOTE: the export is called RtlGetLengthWithoutTrailingPathSeperators + * (with a 'e' instead of a 'a' in "Seperators"). + */ +#define RtlGetLengthWithoutTrailingPathSeperators \ + RtlGetLengthWithoutTrailingPathSeparators NTSYSAPI ULONG

1 0

[jimtabor] 60387: - Remove old code.
by jimtabor＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: jimtabor Date: Thu Sep 26 20:06:18 2013 New Revision: 60387 URL: http://svn.reactos.org/svn/reactos?rev=60387&view=rev Log: - Remove old code. Modified: trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Thu Sep 26 20:06:18 2013 @@ -36,9 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); /* GLOBALS *******************************************************************/ - -static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555, - 0xaaaa, 0x5555, 0xaaaa, 0x5555 }; /* These tables are used in: * UITOOLS_DrawDiagEdge() @@ -623,9 +620,7 @@ { if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255)) { -// HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55); gpsi->hbrGray HBRUSH hbsave; -// HBRUSH hb = CreatePatternBrush(hbm); COLORREF bg; FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); @@ -634,8 +629,6 @@ PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); SelectObject(dc, hbsave); SetBkColor(dc, bg); -// DeleteObject(hb); -// DeleteObject(hbm); } else {

1 0

[akhaldi] 60386: [SPOOLSS_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:57:52 2013 New Revision: 60386 URL: http://svn.reactos.org/svn/reactos?rev=60386&view=rev Log: [SPOOLSS_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/spoolss/CMakeLists.txt trunk/rostests/winetests/spoolss/testlist.c Modified: trunk/rostests/winetests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/CMakeLi… ============================================================================== --- trunk/rostests/winetests/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/spoolss/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:57:52 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(spoolss_winetest spoolss.c testlist.c) -target_link_libraries(spoolss_winetest wine) set_module_type(spoolss_winetest win32cui) -add_importlibs(spoolss_winetest msvcrt kernel32 ntdll) +add_importlibs(spoolss_winetest msvcrt kernel32) add_cd_file(TARGET spoolss_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/spoolss/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/testlis… ============================================================================== --- trunk/rostests/winetests/spoolss/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/spoolss/testlist.c [iso-8859-1] Thu Sep 26 16:57:52 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_spoolss(void);

1 0

[akhaldi] 60385: [SPOOLSS] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:57:33 2013 New Revision: 60385 URL: http://svn.reactos.org/svn/reactos?rev=60385&view=rev Log: [SPOOLSS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt trunk/reactos/dll/win32/spoolss/spoolss_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:57:33 2013 @@ -1,7 +1,6 @@ +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) - spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -11,9 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) add_library(spoolss SHARED ${SOURCE}) -allow_warnings(spoolss) set_module_type(spoolss win32dll) target_link_libraries(spoolss wine) -add_importlibs(spoolss winspool msvcrt kernel32 ntdll) - +add_importlibs(spoolss msvcrt kernel32 ntdll) add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/spoolss/spoolss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss_… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] Thu Sep 26 16:57:33 2013 @@ -57,6 +57,7 @@ break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; backend_unload_all(); 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:57:33 2013 @@ -181,7 +181,7 @@ reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 reactos/dll/win32/softpub # Synced to Wine-1.5.19 -reactos/dll/win32/spoolss # Synced to Wine-1.5.19 +reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.5.4

1 0

[akhaldi] 60384: [SNMPAPI_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:56:01 2013 New Revision: 60384 URL: http://svn.reactos.org/svn/reactos?rev=60384&view=rev Log: [SNMPAPI_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/snmpapi/CMakeLists.txt trunk/rostests/winetests/snmpapi/testlist.c Modified: trunk/rostests/winetests/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/snmpapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:56:01 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(snmpapi_winetest util.c testlist.c) -target_link_libraries(snmpapi_winetest wine) set_module_type(snmpapi_winetest win32cui) -add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32 ntdll) +add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32) add_cd_file(TARGET snmpapi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/snmpapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/testlis… ============================================================================== --- trunk/rostests/winetests/snmpapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/snmpapi/testlist.c [iso-8859-1] Thu Sep 26 16:56:01 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_util(void);

1 0

[akhaldi] 60383: [SNMPAPI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:55:40 2013 New Revision: 60383 URL: http://svn.reactos.org/svn/reactos?rev=60383&view=rev Log: [SNMPAPI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt trunk/reactos/dll/win32/snmpapi/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:55:40 2013 @@ -8,11 +8,10 @@ list(APPEND SOURCE main.c - snmpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/snmpapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def) -add_library(snmpapi SHARED ${SOURCE}) +add_library(snmpapi SHARED ${SOURCE} snmpapi.rc) set_module_type(snmpapi win32dll) target_link_libraries(snmpapi wine) add_importlibs(snmpapi msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/snmpapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/main.c [iso-8859-1] Thu Sep 26 16:55:40 2013 @@ -133,8 +133,6 @@ DisableThreadLibraryCalls(hInstDLL); startTime = GetTickCount64(); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; 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:55:40 2013 @@ -179,7 +179,7 @@ reactos/dll/win32/shfolder # Synced to Wine-1.7.1 reactos/dll/win32/shlwapi # Synced to Wine-1.7.1 reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 -reactos/dll/win32/snmpapi # Synced to Wine-1.5.19 +reactos/dll/win32/snmpapi # Synced to Wine-1.7.1 reactos/dll/win32/softpub # Synced to Wine-1.5.19 reactos/dll/win32/spoolss # Synced to Wine-1.5.19 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19

1 0

[akhaldi] 60382: [SLBCSP] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:53:57 2013 New Revision: 60382 URL: http://svn.reactos.org/svn/reactos?rev=60382&view=rev Log: [SLBCSP] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/slbcsp/CMakeLists.txt trunk/reactos/dll/win32/slbcsp/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:53:57 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(slbcsp.dll slbcsp.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def) add_library(slbcsp SHARED ${SOURCE}) - set_module_type(slbcsp win32dll) - target_link_libraries(slbcsp wine) - add_importlibs(slbcsp msvcrt kernel32 ntdll) - add_cd_file(TARGET slbcsp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/slbcsp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/slbcsp/main.c [iso-8859-1] Thu Sep 26 16:53:57 2013 @@ -39,10 +39,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; } 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:53:57 2013 @@ -178,7 +178,7 @@ 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.7.1 -reactos/dll/win32/slbcsp # Synced to Wine-1.5.19 +reactos/dll/win32/slbcsp # Synced to Wine-1.7.1 reactos/dll/win32/snmpapi # Synced to Wine-1.5.19 reactos/dll/win32/softpub # Synced to Wine-1.5.19 reactos/dll/win32/spoolss # Synced to Wine-1.5.19

1 0

[akhaldi] 60381: [SHLWAPI_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

Author: akhaldi Date: Thu Sep 26 16:52:35 2013 New Revision: 60381 URL: http://svn.reactos.org/svn/reactos?rev=60381&view=rev Log: [SHLWAPI_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt trunk/rostests/winetests/shlwapi/generated.c Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] Thu Sep 26 16:52:35 2013 @@ -1,7 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) - -remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) list(APPEND SOURCE assoc.c @@ -18,7 +14,7 @@ testlist.c) add_executable(shlwapi_winetest ${SOURCE}) -target_link_libraries(shlwapi_winetest wine uuid) +target_link_libraries(shlwapi_winetest uuid) set_module_type(shlwapi_winetest win32cui) add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET shlwapi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/shlwapi/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/generat… ============================================================================== --- trunk/rostests/winetests/shlwapi/generated.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/generated.c [iso-8859-1] Thu Sep 26 16:52:35 2013 @@ -9,9 +9,11 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#ifndef __REACTOS__ #define WINVER 0x0501 #define _WIN32_IE 0x0501 #define _WIN32_WINNT 0x0501 +#endif #define WINE_NOWINSOCK

1 0

[akhaldi] 60380: [SHLWAPI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 26 Sep '13

26 Sep '13

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs