Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[akhaldi] 74851: [USP10] Sync with Wine Staging 2.9. CORE-13362 30e8768 usp10: Validate substition record sequence indices in GSUB_apply_ContextSubst(). ebe75cb usp10: Simplify the "sr_2" assignmen...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 4 01:46:51 2017 New Revision: 74851 URL: http://svn.reactos.org/svn/reactos?rev=74851&view=rev Log: [USP10] Sync with Wine Staging 2.9. CORE-13362 30e8768 usp10: Validate substition record sequence indices in GSUB_apply_ContextSubst(). ebe75cb usp10: Simplify the "sr_2" assignments in GSUB_apply_ContextSubst(). 6c13170 usp10: Range check glyph counts in GSUB_apply_ContextSubst(). c5619be usp10: Validate positioning record sequence indices in GPOS_apply_ContextPos(). 82d36ba usp10: Simplify the "pr_2" assignment in GPOS_apply_ContextPos(). 1b02c1a usp10: Range check glyph counts in GPOS_apply_ContextPos(). d1ca880 usp10: Validate substition record sequence indices in GSUB_apply_ChainContextSubst(). 34a9400 usp10: Validate positioning record sequence indices in GPOS_apply_ChainContextPos(). 9694aeb usp10: Avoid special handling if the substitution count is 0 in GSUB_apply_ChainContextSubst(). f7b943e usp10: Range check glyph counts in GSUB_apply_ChainContextSubst(). 24943fe usp10: Simplify the chaining context table assignments in GSUB_apply_ChainContextSubst(). 02316e6 usp10: Rename the chaining context tables in GSUB_apply_ChainContextSubst() to something more descriptive. 0389768 usp10: Return early if the number of positioning operations is 0 in GPOS_apply_ChainContextPos(). 7dfe9b9 usp10: Range check glyph counts in GPOS_apply_ChainContextPos(). f6c0146 usp10: Simplify the chaining context table assignments in GPOS_apply_ChainContextPos(). fb3ea0a usp10: Rename the chaining context tables in GPOS_apply_ChainContextPos() to something more descriptive. 04e5466 usp10: Handle invalid arguments in ScriptIsComplex(). 4553871 usp10: Check if corresponding headers are present before accessing their feature lists in _initialize_feature_cache. 63bcfa3 usp10: Get rid of the code duplication between GSUB_initialize_feature_cache() and GPOS_expand_feature_cache(). 9b0f3f1 usp10: Get rid of some code duplication in GPOS_expand_feature_cache(). 0ffd5b4 usp10: Double the languages array size when growing it in GPOS_expand_language_cache(). 218be44 usp10: Double the scripts array size when growing it in GPOS_expand_script_cache(). 9a15753 usp10: Introduce a helper function to lookup a language in a LoadedScript structure. 2a0ffc9 usp10: Introduce a helper function to lookup a script in the script cache. 213d358 usp10: Avoid LPVOID. 1403087 usp10: Avoid LPCVOID. a204e58 usp10: Avoid LPWSTR. cdd47c3 usp10: Avoid LPCWSTR. af617aa usp10: Avoid LPBYTE. 34c2f74 usp10: Avoid LPWORD. ab8ec60 usp10: Avoid LPPOINT. ba66b62 usp10: Avoid LPOUTLINETEXTMETRICW. df21247 usp10: Make the script cache parameter to get_opentype_script() const. c8f87ad usp10: Make the script cache parameter to GPOS_apply_MarkToBase() const. cd9db34 usp10: Pass const metrics to GPOS_convert_design_units_to_device(). c3dc9ed usp10: Use heap_free() instead of HeapFree(). 6a0e5bb usp10: Use heap_alloc() instead of HeapAlloc(). 77e5a2f usp10: Use heap_alloc_zero() instead of HeapAlloc() with HEAP_ZERO_MEMORY. 3c704c2 usp10: Use bsearch() to lookup the script range in get_char_script(). a523b46 usp10: Introduce an enumeration for script types. 502d239 usp10: Do not fall back to presentation form B if the contextual feature exists in ContextualShape_Arabic(). f13dea5 usp10: Properly determine the glyph run direction when shaping Script_Arabic. c94a5fd usp10: Take the script direction into account when applying OpenType features. 1727dd4 usp10: Use USP10_FindGlyphInLogClust() in UpdateClusters(). bab506e usp10: Use memmove() in GSUB_apply_LigatureSubst(). 66df220 usp10: Make feature tables const. b32fb23 usp10: Fix ScriptGetProperties spec file entry. 1a42ee3 usp10: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. 892393b usp10: Filter out DeltaFormat == 0 too, valid range is [1, 3]. 66dce1e usp10: Introduce an enumeration for GSUB lookup types. fefd151 usp10: Ignore device tables with invalid delta format. b6d541c usp10: Iterate in visual order in GPOS_apply_feature(). 6fec9b1 usp10: Return the logical offset in GPOS_apply_lookup(). 8d15667 usp10: Return the logical offset in GPOS_apply_ChainContextPos(). 2210196 usp10: Return the logical offset in GPOS_apply_ContextPos(). 6e84358 usp10: Return the logical offset in GPOS_apply_PairAdjustment(). 61e8a38 usp10: Introduce an enumeration for GPOS lookup types. 4b22953 usp10: Properly get glyph widths for OpenType fonts in ScriptPlaceOpenType(). Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indic.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10.spec trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… Modified: trunk/reactos/dll/win32/usp10/indic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indic.c?re… Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… Modified: trunk/reactos/dll/win32/usp10/usp10.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.spec… Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

7 years, 3 months

[akhaldi] 74850: [URLMON_WINETEST] Sync with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 4 01:46:38 2017 New Revision: 74850 URL: http://svn.reactos.org/svn/reactos?rev=74850&view=rev Log: [URLMON_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/urlmon/uri.c trunk/rostests/winetests/urlmon/url.c Modified: trunk/rostests/winetests/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/uri.c [iso-8859-1] Sun Jun 4 01:46:38 2017 @@ -7440,12 +7440,13 @@ return ret; } -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free(void* mem) { +static inline BOOL heap_free(void *mem) +{ return HeapFree(GetProcessHeap(), 0, mem); } Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Sun Jun 4 01:46:38 2017 @@ -190,6 +190,7 @@ static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; +static WCHAR http_cache_file[MAX_PATH]; static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static BOOL abort_start = FALSE; @@ -1935,6 +1936,14 @@ ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); } + if(test_protocol == HTTP_TEST && !emulate_protocol && http_cache_file[0]) { + HANDLE file = CreateFileW(http_cache_file, DELETE, FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "expected INVALID_HANDLE_VALUE, got %p\n", file); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + http_cache_file[0] = 0; + } + return S_OK; } @@ -2091,6 +2100,8 @@ else if(emulate_protocol) ok(!lstrcmpW(pstgmed->u.lpszFileName, cache_fileW), "unexpected file name %s\n", wine_dbgstr_w(pstgmed->u.lpszFileName)); + else if(test_protocol == HTTP_TEST) + lstrcpyW(http_cache_file, pstgmed->u.lpszFileName); else ok(pstgmed->u.lpszFileName != NULL, "lpszFileName == NULL\n"); }

7 years, 3 months

[akhaldi] 74849: [URLMON] Sync with Wine Staging 2.9. CORE-13362 700010f urlmon: Fix some spec file entries. c1ae3db urlmon: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. 9c4ac7f urlmon...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 4 01:46:26 2017 New Revision: 74849 URL: http://svn.reactos.org/svn/reactos?rev=74849&view=rev Log: [URLMON] Sync with Wine Staging 2.9. CORE-13362 700010f urlmon: Fix some spec file entries. c1ae3db urlmon: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. 9c4ac7f urlmon: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/dll/win32/urlmon/urlmon_main.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Sun Jun 4 01:46:26 2017 @@ -8,7 +8,7 @@ #107 CoInternetApproveExtension 108 stdcall -noname IsInternetESCEnabledLocal() #109 stub AsyncGetClassBits -110 stdcall AsyncInstallDistributionUnit(ptr ptr ptr long long ptr ptr ptr long) +110 stdcall AsyncInstallDistributionUnit(wstr wstr wstr long long wstr ptr ptr long) 111 stdcall -noname IsProtectedModeURL(ptr) #112 IsProtectedModeIUri #113 IsFileInSpecialDirs @@ -29,7 +29,7 @@ 128 stdcall CoInternetCreateZoneManager(ptr ptr long) #129 CoInternetFeatureSettingsChanged #130 stub CoInternetGetProtocolFlags -131 stdcall CoInternetGetSecurityUrl(ptr ptr long long) +131 stdcall CoInternetGetSecurityUrl(wstr ptr long long) 132 stdcall CoInternetGetSecurityUrlEx(ptr ptr long long) 133 stdcall CoInternetGetSession(long ptr long) 134 stdcall CoInternetIsFeatureEnabled(long long) @@ -38,7 +38,7 @@ 137 stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long) 138 stdcall CoInternetParseIUri(ptr long long wstr long ptr long) 139 stdcall CoInternetParseUrl(wstr long long wstr long ptr long) -140 stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) +140 stdcall CoInternetQueryInfo(wstr long long ptr long ptr long) 141 stdcall CoInternetSetFeatureEnabled(long long long) 142 stdcall CompareSecurityIds(ptr long ptr long long) #143 CompatFlagsFromClsid @@ -61,11 +61,11 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllRegisterServerEx() @ stdcall -private DllUnregisterServer() -163 stdcall Extract(long ptr) +163 stdcall Extract(ptr str) 164 stdcall FaultInIEFeature(long ptr ptr long) #165 stub FindMediaType #166 stub FindMediaTypeClass -167 stdcall FindMimeFromData(ptr ptr ptr long ptr long ptr long) +167 stdcall FindMimeFromData(ptr wstr ptr long wstr long ptr long) #168 GetAddSitesFileUrl 169 stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) #170 stub GetClassURL @@ -77,7 +77,7 @@ #176 GetPortFromUrlScheme #177 GetPropertyFromName #178 GetPropertyName -179 stdcall GetSoftwareUpdateInfo(ptr ptr) +179 stdcall GetSoftwareUpdateInfo(wstr ptr) #180 GetUrlmonThreadNotificationHwnd 181 stdcall -stub HlinkGoBack(ptr) 182 stdcall -stub HlinkGoForward(ptr) Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Sun Jun 4 01:46:26 2017 @@ -245,24 +245,24 @@ const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void *heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - -static inline void *heap_realloc_zero(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, size); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } static inline BOOL heap_free(void *mem) 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] Sun Jun 4 01:46:26 2017 @@ -188,7 +188,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11 -reactos/dll/win32/urlmon # Synced to WineStaging-2.2 +reactos/dll/win32/urlmon # Synced to WineStaging-2.9 reactos/dll/win32/usp10 # Synced to WineStaging-2.2 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23

7 years, 3 months

[akhaldi] 74848: [SHLWAPI_WINETEST] Sync with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 22:40:14 2017 New Revision: 74848 URL: http://svn.reactos.org/svn/reactos?rev=74848&view=rev Log: [SHLWAPI_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/shlwapi/istream.c trunk/rostests/winetests/shlwapi/string.c Modified: trunk/rostests/winetests/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/istream… ============================================================================== --- trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/istream.c [iso-8859-1] Sat Jun 3 22:40:14 2017 @@ -32,16 +32,7 @@ #include <winnls.h> #include <winreg.h> #include <objbase.h> -//#include "shlwapi.h" - - -/* Function pointers for the SHCreateStreamOnFile functions */ -static HMODULE hShlwapi; -static HRESULT (WINAPI *pSHCreateStreamOnFileA)(LPCSTR file, DWORD mode, IStream **stream); -static HRESULT (WINAPI *pSHCreateStreamOnFileW)(LPCWSTR file, DWORD mode, IStream **stream); -static HRESULT (WINAPI *pSHCreateStreamOnFileEx)(LPCWSTR file, DWORD mode, DWORD attributes, BOOL create, IStream *template, IStream **stream); - -static BOOL is_win2000_IE5 = FALSE; +#include <shlwapi.h> static void test_IStream_invalid_operations(IStream * stream, DWORD mode) { @@ -86,20 +77,9 @@ { ok(ret == STG_E_ACCESSDENIED /* XP */ || broken(ret == S_OK) /* Win2000 + IE5 */, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); - if (ret == S_OK) - is_win2000_IE5 = TRUE; } else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); - - /* IStream::Write calls below hang under Win2000 + IE5, Win2000 + IE6 SP1 - * and newer Windows versions pass these tests. - */ - if (is_win2000_IE5) - { - win_skip("broken IStream::Write implementation (win2000)\n"); - return; - } strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 5, NULL); @@ -290,7 +270,7 @@ /* invalid arguments */ stream = NULL; - ret = (*pSHCreateStreamOnFileA)(NULL, mode | stgm, &stream); + ret = SHCreateStreamOnFileA(NULL, mode | stgm, &stream); if (ret == E_INVALIDARG) /* Win98 SE */ { win_skip("Not supported\n"); return; @@ -304,34 +284,34 @@ if (0) /* This test crashes on WinXP SP2 */ { - ret = (*pSHCreateStreamOnFileA)(test_file, mode | stgm, NULL); + ret = SHCreateStreamOnFileA(test_file, mode | stgm, NULL); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); } stream = NULL; - ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CONVERT | stgm, &stream); + ret = SHCreateStreamOnFileA(test_file, mode | STGM_CONVERT | stgm, &stream); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_DELETEONRELEASE | stgm, &stream); + ret = SHCreateStreamOnFileA(test_file, mode | STGM_DELETEONRELEASE | stgm, &stream); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_TRANSACTED | stgm, &stream); + ret = SHCreateStreamOnFileA(test_file, mode | STGM_TRANSACTED | stgm, &stream); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); /* file does not exist */ stream = NULL; - ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); + ret = SHCreateStreamOnFileA(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CREATE | stgm, &stream); + ret = SHCreateStreamOnFileA(test_file, mode | STGM_CREATE | stgm, &stream); ok(ret == S_OK, "SHCreateStreamOnFileA: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); @@ -347,7 +327,7 @@ /* file exists */ stream = NULL; - ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); + ret = SHCreateStreamOnFileA(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); ok(ret == S_OK, "SHCreateStreamOnFileA: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); @@ -359,7 +339,7 @@ } stream = NULL; - ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CREATE | stgm, &stream); + ret = SHCreateStreamOnFileA(test_file, mode | STGM_CREATE | stgm, &stream); ok(ret == S_OK, "SHCreateStreamOnFileA: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); @@ -401,7 +381,7 @@ { /* Crashes on NT4 */ stream = NULL; - ret = (*pSHCreateStreamOnFileW)(NULL, mode | stgm, &stream); + ret = SHCreateStreamOnFileW(NULL, mode | stgm, &stream); ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ ret == E_INVALIDARG /* Vista */, "SHCreateStreamOnFileW: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); @@ -411,29 +391,29 @@ if (0) { /* This test crashes on WinXP SP2 */ - ret = (*pSHCreateStreamOnFileW)(test_file, mode | stgm, NULL); + ret = SHCreateStreamOnFileW(test_file, mode | stgm, NULL); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); } stream = NULL; - ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_CONVERT | stgm, &stream); + ret = SHCreateStreamOnFileW(test_file, mode | STGM_CONVERT | stgm, &stream); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_DELETEONRELEASE | stgm, &stream); + ret = SHCreateStreamOnFileW(test_file, mode | STGM_DELETEONRELEASE | stgm, &stream); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_TRANSACTED | stgm, &stream); + ret = SHCreateStreamOnFileW(test_file, mode | STGM_TRANSACTED | stgm, &stream); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); /* file does not exist */ stream = NULL; - ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); + ret = SHCreateStreamOnFileW(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); if (ret == E_INVALIDARG) /* Win98 SE */ { win_skip("Not supported\n"); return; @@ -443,7 +423,7 @@ ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_CREATE | stgm, &stream); + ret = SHCreateStreamOnFileW(test_file, mode | STGM_CREATE | stgm, &stream); ok(ret == S_OK, "SHCreateStreamOnFileW: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); @@ -459,7 +439,7 @@ /* file exists */ stream = NULL; - ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); + ret = SHCreateStreamOnFileW(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); ok(ret == S_OK, "SHCreateStreamOnFileW: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); @@ -471,7 +451,7 @@ } stream = NULL; - ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_CREATE | stgm, &stream); + ret = SHCreateStreamOnFileW(test_file, mode | STGM_CREATE | stgm, &stream); ok(ret == S_OK, "SHCreateStreamOnFileW: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); @@ -516,7 +496,7 @@ { /* Crashes on NT4 */ stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(NULL, mode, 0, FALSE, NULL, &stream); + ret = SHCreateStreamOnFileEx(NULL, mode, 0, FALSE, NULL, &stream); ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ ret == E_INVALIDARG /* Vista */, "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); @@ -524,11 +504,11 @@ } stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, template, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode, 0, FALSE, template, &stream); if (ret == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) { win_skip("File probably locked by Anti-Virus/Spam software, trying again\n"); Sleep(1000); - ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, template, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode, 0, FALSE, template, &stream); } ok( ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || ret == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), @@ -540,14 +520,14 @@ if (0) { /* This test crashes on WinXP SP2 */ - ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, NULL, NULL); + ret = SHCreateStreamOnFileEx(test_file, mode, 0, FALSE, NULL, NULL); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileEx: expected E_INVALIDARG, got 0x%08x\n", ret); } /* file does not exist */ stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, FALSE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_FAILIFTHERE | stgm, 0, FALSE, NULL, &stream); if ((stgm & STGM_TRANSACTED) == STGM_TRANSACTED && mode == STGM_READ) { ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* XP */ || ret == E_INVALIDARG /* Vista */, "SHCreateStreamOnFileEx: expected E_INVALIDARG or HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); @@ -565,7 +545,7 @@ ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, TRUE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_FAILIFTHERE | stgm, 0, TRUE, NULL, &stream); /* not supported on win9x */ if (broken(ret == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER) && stream == NULL)) { skip("Not supported\n"); @@ -588,11 +568,11 @@ } stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); if (ret == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) { win_skip("File probably locked by Anti-Virus/Spam software, trying again\n"); Sleep(1000); - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); } ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); @@ -609,11 +589,11 @@ } stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); if (ret == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) { win_skip("File probably locked by Anti-Virus/Spam software, trying again\n"); Sleep(1000); - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); } ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); @@ -630,7 +610,7 @@ /* file exists */ stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, FALSE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_FAILIFTHERE | stgm, 0, FALSE, NULL, &stream); ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); @@ -642,12 +622,12 @@ } stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, TRUE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_FAILIFTHERE | stgm, 0, TRUE, NULL, &stream); ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); @@ -659,7 +639,7 @@ } stream = NULL; - ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); + ret = SHCreateStreamOnFileEx(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); @@ -692,7 +672,7 @@ GetTempFileNameW(tmpPath, prefix, 0, srcFileName); GetTempFileNameW(tmpPath, prefix, 0, dstFileName); - ret = pSHCreateStreamOnFileEx(srcFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &src); + ret = SHCreateStreamOnFileEx(srcFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &src); ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret); written.QuadPart = 0; @@ -703,7 +683,7 @@ ret = IStream_Seek(src, distance, STREAM_SEEK_SET, &written); ok(SUCCEEDED(ret), "ISequentialStream_Seek failed with ret=0x%08x\n", ret); - ret = pSHCreateStreamOnFileEx(dstFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &dst); + ret = SHCreateStreamOnFileEx(dstFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &dst); ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret); /* Test using a count larger than the source file, so that the Read operation will fall short */ @@ -750,35 +730,15 @@ int i, j, k; - hShlwapi = LoadLibraryA("shlwapi.dll"); - - pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); - pSHCreateStreamOnFileW = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileW"); - pSHCreateStreamOnFileEx = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); - - if (!pSHCreateStreamOnFileA) - skip("SHCreateStreamOnFileA not found.\n"); - - if (!pSHCreateStreamOnFileW) - skip("SHCreateStreamOnFileW not found.\n"); - - if (!pSHCreateStreamOnFileEx) - skip("SHCreateStreamOnFileEx not found.\n"); - for (i = 0; i != sizeof(stgm_access)/sizeof(stgm_access[0]); i++) { for (j = 0; j != sizeof(stgm_sharing)/sizeof(stgm_sharing[0]); j ++) { - if (pSHCreateStreamOnFileA) - test_SHCreateStreamOnFileA(stgm_access[i], stgm_sharing[j]); - - if (pSHCreateStreamOnFileW) - test_SHCreateStreamOnFileW(stgm_access[i], stgm_sharing[j]); - - if (pSHCreateStreamOnFileEx) { - for (k = 0; k != sizeof(stgm_flags)/sizeof(stgm_flags[0]); k++) - test_SHCreateStreamOnFileEx(stgm_access[i], stgm_sharing[j] | stgm_flags[k]); - } + test_SHCreateStreamOnFileA(stgm_access[i], stgm_sharing[j]); + test_SHCreateStreamOnFileW(stgm_access[i], stgm_sharing[j]); + + for (k = 0; k != sizeof(stgm_flags)/sizeof(stgm_flags[0]); k++) + test_SHCreateStreamOnFileEx(stgm_access[i], stgm_sharing[j] | stgm_flags[k]); } } - if (pSHCreateStreamOnFileEx) test_SHCreateStreamOnFileEx_CopyTo(); + test_SHCreateStreamOnFileEx_CopyTo(); } Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… ============================================================================== --- trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] Sat Jun 3 22:40:14 2017 @@ -993,6 +993,7 @@ WCHAR wstr1[2*MAX_PATH+1], wbuf[2*MAX_PATH]; const WCHAR fmt[] = {'%','s',0}; STRRET strret; + HRESULT hres; int ret; int i; @@ -1064,9 +1065,27 @@ memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_WSTR; U(strret).pOleStr = StrDupW(wstr1); - expect_eq2(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, E_NOT_SUFFICIENT_BUFFER /* Vista */, HRESULT, "%x"); + hres = pStrRetToBufW(&strret, NULL, wbuf, 10); + ok(hres == E_NOT_SUFFICIENT_BUFFER || broken(hres == S_OK) /* winxp */, + "StrRetToBufW returned %08x\n", hres); + if (hres == E_NOT_SUFFICIENT_BUFFER) + expect_eq(wbuf[0], 0, WCHAR, "%x"); expect_eq(wbuf[9], 0, WCHAR, "%x"); expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); + + memset(wbuf, 0xbf, sizeof(wbuf)); + strret.uType = STRRET_CSTR; + StrCpyNA(U(strret).cStr, str1, MAX_PATH); + hres = pStrRetToBufW(&strret, NULL, wbuf, 10); + ok(hres == S_OK, "StrRetToBufW returned %08x\n", hres); + ok(!memcmp(wbuf, wstr1, 9*sizeof(WCHAR)) && !wbuf[9], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf)); + + memset(wbuf, 0xbf, sizeof(wbuf)); + strret.uType = STRRET_WSTR; + U(strret).pOleStr = NULL; + hres = pStrRetToBufW(&strret, NULL, wbuf, 10); + ok(hres == E_FAIL, "StrRetToBufW returned %08x\n", hres); + ok(!wbuf[0], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf)); } else win_skip("StrRetToBufW() is not available\n");

7 years, 3 months

[akhaldi] 74847: [SHLWAPI] Sync with Wine Staging 2.9. CORE-13362 98d0fa9 shlwapi: Use isalnumW() instead of isalnum() for WCHARs. dfb846c shlwapi: Fixed error handling in StrRetToBufW.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 22:39:50 2017 New Revision: 74847 URL: http://svn.reactos.org/svn/reactos?rev=74847&view=rev Log: [SHLWAPI] Sync with Wine Staging 2.9. CORE-13362 98d0fa9 shlwapi: Use isalnumW() instead of isalnum() for WCHARs. dfb846c shlwapi: Fixed error handling in StrRetToBufW. Modified: trunk/reactos/dll/win32/shlwapi/string.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/string.c [iso-8859-1] Sat Jun 3 22:39:50 2017 @@ -1500,47 +1500,58 @@ */ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, UINT len) { - TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); - - if (!src) + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); + + if (!dest || !len) + return E_FAIL; + + if (!src) + { + WARN("Invalid lpStrRet would crash under Win32!\n"); + if (dest) + *dest = '\0'; + return E_FAIL; + } + + *dest = '\0'; + + switch (src->uType) { + case STRRET_WSTR: { + size_t dst_len; + if (!src->u.pOleStr) + return E_FAIL; + dst_len = strlenW(src->u.pOleStr); + memcpy(dest, src->u.pOleStr, min(dst_len, len-1) * sizeof(WCHAR)); + dest[min(dst_len, len-1)] = 0; + CoTaskMemFree(src->u.pOleStr); + if (len <= dst_len) + { + dest[0] = 0; + return E_NOT_SUFFICIENT_BUFFER; + } + break; + } + + case STRRET_CSTR: + if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) + dest[len-1] = 0; + break; + + case STRRET_OFFSET: + if (pidl) { - WARN("Invalid lpStrRet would crash under Win32!\n"); - if (dest) - *dest = '\0'; - return E_FAIL; - } - - if (!dest || !len) - return E_FAIL; - - *dest = '\0'; - - switch (src->uType) - { - case STRRET_WSTR: - lstrcpynW(dest, src->u.pOleStr, len); - CoTaskMemFree(src->u.pOleStr); - break; - - case STRRET_CSTR: - if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) - dest[len-1] = 0; - break; - - case STRRET_OFFSET: - if (pidl) - { - if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, - dest, len )) - dest[len-1] = 0; - } - break; - - default: - FIXME("unknown type!\n"); - return E_NOTIMPL; - } - return S_OK; + if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, + dest, len )) + dest[len-1] = 0; + } + break; + + default: + FIXME("unknown type!\n"); + return E_NOTIMPL; + } + + return S_OK; } /************************************************************************* Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Sat Jun 3 22:39:50 2017 @@ -794,7 +794,7 @@ process_case = 1; break; } - if (isalnum(*mrelative) && (*(mrelative + 1) == ':')) { + if (isalnumW(*mrelative) && (*(mrelative + 1) == ':')) { /* case that becomes "file:///" */ strcpyW(preliminary, myfilestr); process_case = 1; 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] Sat Jun 3 22:39:50 2017 @@ -174,7 +174,7 @@ reactos/dll/win32/shdocvw # Synced to WineStaging-2.2 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.9.11 -reactos/dll/win32/shlwapi # Synced to WineStaging-2.2 +reactos/dll/win32/shlwapi # Synced to WineStaging-2.9 reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.11 reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/softpub # Synced to WineStaging-1.9.11

7 years, 3 months

[akhaldi] 74846: [SCRRUN_WINETEST] Sync with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 22:39:28 2017 New Revision: 74846 URL: http://svn.reactos.org/svn/reactos?rev=74846&view=rev Log: [SCRRUN_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/scrrun/filesystem.c Modified: trunk/rostests/winetests/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/filesyst… ============================================================================== --- trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] Sat Jun 3 22:39:28 2017 @@ -624,6 +624,7 @@ HRESULT hr; HANDLE hf; BOOL ret; + DATE date; get_temp_path(NULL, pathW); @@ -648,6 +649,14 @@ hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + + hr = IFile_get_DateLastModified(file, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + date = 0.0; + hr = IFile_get_DateLastModified(file, &date); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(date > 0.0, "got %f\n", date); hr = IFile_get_Path(file, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -1396,6 +1405,17 @@ hr = IDrive_get_IsReady(drive, &ready); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ready == VARIANT_TRUE, "got %x\n", ready); + + if (ready != VARIANT_TRUE) { + hr = IDrive_get_DriveLetter(drive, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + + skip("Drive %s is not ready, skipping some tests\n", wine_dbgstr_w(str)); + + VariantClear(&var); + SysFreeString(str); + continue; + } V_VT(&size) = VT_EMPTY; hr = IDrive_get_TotalSize(drive, &size);

7 years, 3 months

[akhaldi] 74845: [SCRRUN] Sync with Wine Staging 2.9. CORE-13362 f601660 scrrun: Added DateLastModified property for IFile.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 22:38:57 2017 New Revision: 74845 URL: http://svn.reactos.org/svn/reactos?rev=74845&view=rev Log: [SCRRUN] Sync with Wine Staging 2.9. CORE-13362 f601660 scrrun: Added DateLastModified property for IFile. Modified: trunk/reactos/dll/win32/scrrun/filesystem.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… ============================================================================== --- trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] Sat Jun 3 22:38:57 2017 @@ -2699,6 +2699,21 @@ return SetFileAttributesW(This->path, pfa) ? S_OK : create_error(GetLastError()); } +static HRESULT get_date_from_filetime(const FILETIME *ft, DATE *date) +{ + FILETIME ftlocal; + SYSTEMTIME st; + + if (!date) + return E_POINTER; + + FileTimeToLocalFileTime(ft, &ftlocal); + FileTimeToSystemTime(&ftlocal, &st); + SystemTimeToVariantTime(&st, date); + + return S_OK; +} + static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *pdate) { struct file *This = impl_from_IFile(iface); @@ -2706,11 +2721,17 @@ return E_NOTIMPL; } -static HRESULT WINAPI file_get_DateLastModified(IFile *iface, DATE *pdate) +static HRESULT WINAPI file_get_DateLastModified(IFile *iface, DATE *date) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pdate); - return E_NOTIMPL; + WIN32_FILE_ATTRIBUTE_DATA attrs; + + TRACE("(%p)->(%p)\n", This, date); + + if (GetFileAttributesExW(This->path, GetFileExInfoStandard, &attrs)) + return get_date_from_filetime(&attrs.ftLastWriteTime, date); + + return E_FAIL; } static HRESULT WINAPI file_get_DateLastAccessed(IFile *iface, DATE *pdate) 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] Sat Jun 3 22:38:57 2017 @@ -165,7 +165,7 @@ reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11 reactos/dll/win32/schannel # Synced to WineStaging-1.9.11 -reactos/dll/win32/scrrun # Synced to WineStaging-2.2 +reactos/dll/win32/scrrun # Synced to WineStaging-2.9 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-1.9.11

7 years, 3 months

[akhaldi] 74844: [RSAENH_WINETEST] Sync with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 22:38:34 2017 New Revision: 74844 URL: http://svn.reactos.org/svn/reactos?rev=74844&view=rev Log: [RSAENH_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/rsaenh/rsaenh.c Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Sat Jun 3 22:38:34 2017 @@ -110,23 +110,21 @@ static BOOL (WINAPI *pCryptDuplicateHash) (HCRYPTHASH, DWORD*, DWORD, HCRYPTHASH*); -/* static void trace_hex(BYTE *pbData, DWORD dwLen) { char szTemp[256]; DWORD i, j; for (i = 0; i < dwLen-7; i+=8) { - sprintf(szTemp, "0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", - pbData[i], pbData[i+1], pbData[i+2], pbData[i+3], pbData[i+4], pbData[i+5], - pbData[i+6], pbData[i+7]); - trace(szTemp); + trace("0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", + pbData[i], pbData[i+1], pbData[i+2], pbData[i+3], pbData[i+4], pbData[i+5], + pbData[i+6], pbData[i+7]); } for (j=0; i<dwLen; j++,i++) { - sprintf(szTemp+6*j, "0x%02x,\n", pbData[i]); - } - trace(szTemp); + sprintf(szTemp+6*j, "0x%02x, ", pbData[i]); + } + if (j) + trace("%s\n", szTemp); } -*/ static BOOL init_base_environment(const char *provider, DWORD dwKeyFlags) { @@ -2377,7 +2375,7 @@ HCRYPTKEY hPublicKey, hPrivKey; BOOL result; ALG_ID algID; - BYTE emptyKey[2048], *exported_key; + BYTE emptyKey[2048], *exported_key, *exported_key2; static BYTE abPlainPublicKey[84] = { 0x06, 0x02, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x52, 0x53, 0x41, 0x31, 0x00, 0x02, 0x00, 0x00, @@ -2571,6 +2569,7 @@ CryptDestroyKey(hPublicKey); + /* imports into AT_SIGNATURE key container */ result = CryptImportKey(hProv, priv_key_with_high_bit, sizeof(priv_key_with_high_bit), 0, CRYPT_EXPORTABLE, &hPrivKey); ok(result, "CryptImportKey failed: %08x\n", GetLastError()); @@ -2590,6 +2589,69 @@ HeapFree(GetProcessHeap(), 0, exported_key); CryptDestroyKey(hPrivKey); + + /* imports into AT_KEYEXCHANGE key container */ + result = CryptImportKey(hProv, abPlainPrivateKey, + sizeof(abPlainPrivateKey), 0, 0, &hPrivKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); + + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + /* getting the public key from AT_KEYEXCHANGE, and compare it */ + result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hPrivKey); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key2 = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key2, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + result = !memcmp(exported_key, exported_key2, dwDataLen); + ok(result, "unexpected value\n"); + if (!result && winetest_debug > 1) { + trace("Expected public key (%u):\n", dwDataLen); + trace_hex(exported_key, dwDataLen); + trace("AT_KEYEXCHANGE public key (%u):\n", dwDataLen); + trace_hex(exported_key2, dwDataLen); + } + HeapFree(GetProcessHeap(), 0, exported_key2); + + /* importing a public key doesn't update key container at all */ + result = CryptImportKey(hProv, abPlainPublicKey, + sizeof(abPlainPublicKey), 0, 0, &hPublicKey); + ok(result, "failed to import the public key\n"); + CryptDestroyKey(hPublicKey); + + /* getting the public key again, and compare it */ + result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hPrivKey); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key2 = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key2, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + result = !memcmp(exported_key, exported_key2, dwDataLen); + ok(result, "unexpected value\n"); + if (!result && winetest_debug > 1) { + trace("Expected public key (%u):\n", dwDataLen); + trace_hex(exported_key, dwDataLen); + trace("AT_KEYEXCHANGE public key (%u):\n", dwDataLen); + trace_hex(exported_key2, dwDataLen); + } + + HeapFree(GetProcessHeap(), 0, exported_key); + HeapFree(GetProcessHeap(), 0, exported_key2); } static void test_import_hmac(void)

7 years, 3 months

[akhaldi] 74843: [RSAENH] Sync with Wine Staging 2.9. CORE-13362 e705dfc rsaenh: Don't import a public key to a key container.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 22:38:03 2017 New Revision: 74843 URL: http://svn.reactos.org/svn/reactos?rev=74843&view=rev Log: [RSAENH] Sync with Wine Staging 2.9. CORE-13362 e705dfc rsaenh: Don't import a public key to a key container. Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] Sat Jun 3 22:38:03 2017 @@ -2826,15 +2826,14 @@ /****************************************************************************** * import_public_key [Internal] * - * Import a BLOB'ed public key into a key container. - * - * PARAMS - * hProv [I] Key container into which the public key is to be imported. + * Import a BLOB'ed public key. + * + * PARAMS + * hProv [I] A CSP. * pbData [I] Pointer to a buffer which holds the public key BLOB. * dwDataLen [I] Length of data in buffer at pbData. * dwFlags [I] One of: * CRYPT_EXPORTABLE: the imported key is marked exportable - * fStoreKey [I] If TRUE, the imported key is stored to the registry. * phKey [O] Handle to the imported key. * * @@ -2847,9 +2846,8 @@ * Failure: FALSE. */ static BOOL import_public_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, - DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey) -{ - KEYCONTAINER *pKeyContainer; + DWORD dwFlags, HCRYPTKEY *phKey) +{ CRYPTKEY *pCryptKey; const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData; const RSAPUBKEY *pRSAPubKey = (const RSAPUBKEY*)(pBlobHeader+1); @@ -2862,8 +2860,6 @@ SetLastError(NTE_BAD_FLAGS); return FALSE; } - if (!(pKeyContainer = get_key_container(hProv))) - return FALSE; if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY)) || (pRSAPubKey->magic != RSAENH_MAGIC_RSA1) || @@ -2885,15 +2881,6 @@ if (ret) { if (dwFlags & CRYPT_EXPORTABLE) pCryptKey->dwPermissions |= CRYPT_EXPORT; - switch (pBlobHeader->aiKeyAlg) - { - case AT_KEYEXCHANGE: - case CALG_RSA_KEYX: - TRACE("installing public key\n"); - release_and_install_key(hProv, *phKey, &pKeyContainer->hKeyExchangeKeyPair, - fStoreKey); - break; - } } return ret; } @@ -3107,7 +3094,7 @@ case PUBLICKEYBLOB: return import_public_key(hProv, pbData, dwDataLen, dwFlags, - fStoreKey, phKey); + phKey); case SIMPLEBLOB: return import_symmetric_key(hProv, pbData, dwDataLen, hPubKey, 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] Sat Jun 3 22:38:03 2017 @@ -162,7 +162,7 @@ reactos/dll/win32/riched32 # Synced to WineStaging-1.9.11 reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.2 reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11 -reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.11 +reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11 reactos/dll/win32/schannel # Synced to WineStaging-1.9.11 reactos/dll/win32/scrrun # Synced to WineStaging-2.2

7 years, 3 months

[akhaldi] 74842: [RICHED20_WINETEST] Sync with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 22:37:05 2017 New Revision: 74842 URL: http://svn.reactos.org/svn/reactos?rev=74842&view=rev Log: [RICHED20_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/riched20/editor.c Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… ============================================================================== --- trunk/rostests/winetests/riched20/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/editor.c [iso-8859-1] Sat Jun 3 22:37:05 2017 @@ -3936,6 +3936,25 @@ DestroyWindow(hwndRichEdit); } +static void test_EM_STREAMOUT_empty_para(void) +{ + HWND hwnd = new_richedit(NULL); + char buf[1024], *p = buf; + EDITSTREAM es; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + + memset(buf, 0, sizeof(buf)); + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_WM_SETTEXT_esCallback; + + SendMessageA(hwnd, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok((p = strstr(buf, "\\pard")) != NULL, "missing \\pard\n"); + ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n"); + + DestroyWindow(hwnd); +} static void test_EM_SETTEXTEX(void) { @@ -8753,6 +8772,7 @@ test_EM_STREAMIN(); test_EM_STREAMOUT(); test_EM_STREAMOUT_FONTTBL(); + test_EM_STREAMOUT_empty_para(); test_EM_StreamIn_Undo(); test_EM_FORMATRANGE(); test_unicode_conversions();

7 years, 3 months

← Newer
1
...
38
39
40
41
42
43
44
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017