February 2020 - Wine-Commits

Alexandre Julliard : libport: Move Unicode normalization implementation to ntdll.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: cc300a20b3847d510f0b8aa54b08fb15ac9e6cb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc300a20b3847d510f0b8aa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 13:15:07 2020 +0100 libport: Move Unicode normalization implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++-- include/wine/unicode.h | 2 - libs/port/Makefile.in | 1 - libs/port/normalize.c | 141 ------------------------------------------------- 4 files changed, 134 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc300a20b3847d510f0b…

1 0

Francois Gouget : tests: Don't initialize static variables to 0.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: f818bbf61a6a8a39b8d34a6eafa13b075abe41cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f818bbf61a6a8a39b8d34a6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 3 02:04:05 2020 +0100 tests: Don't initialize static variables to 0. Static variables are initialized to 0 by default anyway. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index a919ce81d6..5c3b432a9a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -498,7 +498,6 @@ static int run_test( const char *name ) printf( "Fatal: test '%s' does not exist.\n", name ); exit_process(1); } - successes = failures = todo_successes = todo_failures = 0; tls_index=TlsAlloc(); current_test = test; test->func();

1 0

Nikolay Sivov : dwrite: Fix potential strings object leak (Coverity).
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 9f1dd9fc3ef11e6343ef96512ed1632a705164d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1dd9fc3ef11e6343ef9651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:32:14 2020 +0300 dwrite: Fix potential strings object leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0aa1b10460..9813676ab0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2166,10 +2166,6 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc *ret = NULL; - hr = create_localizedstrings(&strings); - if (FAILED(hr)) - return hr; - switch (id) { case DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG: @@ -2183,6 +2179,9 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc return S_OK; } + if (FAILED(hr = create_localizedstrings(&strings))) + return hr; + opentype_get_font_table(stream_desc, MS_META_TAG, &meta); if (meta.data)

1 0

Francois Gouget : configure: Fix a typo in a comment.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 32785e0ce07a4b7bf33e0e9fda26d7deca82b105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32785e0ce07a4b7bf33e0e9f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 3 04:07:13 2020 +0100 configure: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 36f65378a4..f9ca95ce49 100644 --- a/configure.ac +++ b/configure.ac @@ -1686,7 +1686,7 @@ fi WINE_NOTICE_WITH(udev,[test "x$UDEV_LIBS" = "x"], [libudev ${notice_platform}development files not found, plug and play won't be supported.]) -dnl **** Check for libuwind **** +dnl **** Check for libunwind **** if test "x$with_unwind" != xno then WINE_PACKAGE_FLAGS(UNWIND,[libunwind],[-lunwind],,,

1 0

Nikolay Sivov : shlwapi: Fix SHGetViewStatePropertyBag() prototype.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 8363316f620f00693fedea8a168276b53d9e86f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8363316f620f00693fedea8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:09 2020 +0300 shlwapi: Fix SHGetViewStatePropertyBag() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 27 --------------------------- dlls/shlwapi/shlwapi_main.c | 10 ++++++++++ include/shlwapi.h | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index dd39366c80..8767d0b579 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4284,33 +4284,6 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, return E_NOTIMPL; } -/*********************************************************************** - * SHGetViewStatePropertyBag [SHLWAPI.515] - * - * Retrieves a property bag in which the view state information of a folder - * can be stored. - * - * PARAMS - * pidl [I] PIDL of the folder requested - * bag_name [I] Name of the property bag requested - * flags [I] Optional flags - * riid [I] IID of requested property bag interface - * ppv [O] Address to receive pointer to the new interface - * - * RETURNS - * success: S_OK - * failure: error code - * - */ -HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, - DWORD flags, REFIID riid, void **ppv) -{ - FIXME("%p %s %d %s %p STUB\n", pidl, debugstr_w(bag_name), flags, - debugstr_guid(riid), ppv); - - return E_NOTIMPL; -} - /*********************************************************************** * SHFormatDateTimeW [SHLWAPI.354] * diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index af79c33cb6..3717dfa712 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -156,3 +156,13 @@ UINT WINAPI WhichPlatform(void) return state; } + +/*********************************************************************** + * SHGetViewStatePropertyBag [SHLWAPI.515] + */ +HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name, DWORD flags, REFIID riid, void **ppv) +{ + FIXME("%p, %s, %#x, %s, %p stub.\n", pidl, debugstr_w(bag_name), flags, debugstr_guid(riid), ppv); + + return E_NOTIMPL; +} diff --git a/include/shlwapi.h b/include/shlwapi.h index 2bfca0bc90..4fd47d249f 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1150,6 +1150,20 @@ HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); UINT WINAPI WhichPlatform(void); +#define SHGVSPB_PERUSER 0x00000001 +#define SHGVSPB_ALLUSERS 0x00000002 +#define SHGVSPB_PERFOLDER 0x00000004 +#define SHGVSPB_ALLFOLDERS 0x00000008 +#define SHGVSPB_INHERIT 0x00000010 +#define SHGVSPB_ROAM 0x00000020 +#define SHGVSPB_NOAUTODEFAULTS 0x80000000 +#define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) +#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) +#define SHGVSPB_USERDEFAULTS (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS) +#define SHGVSPB_GLOBALDEFAULTS (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS) + +HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname, DWORD flags, REFIID riid, void **ppv); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : shlwapi: Fix spec entries for SHFormatDateTime().
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 1d1aa186547da3a7805f6b805bbf9fcee7d0ae27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1aa186547da3a7805f6b80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:10 2020 +0300 shlwapi: Fix spec entries for SHFormatDateTime(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 4 ++-- include/shlwapi.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9b4b6357c6..f47f41aea4 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -350,8 +350,8 @@ 350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) 351 stdcall -noname GetFileVersionInfoWrapW(wstr long long ptr) 352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) -353 stdcall -ordinal SHFormatDateTimeA(ptr ptr str long) -354 stdcall -ordinal SHFormatDateTimeW(ptr ptr wstr long) +353 stdcall -ordinal SHFormatDateTimeA(ptr ptr ptr long) +354 stdcall -ordinal SHFormatDateTimeW(ptr ptr ptr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) 356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) 357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) diff --git a/include/shlwapi.h b/include/shlwapi.h index 4fd47d249f..02517a944a 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1135,6 +1135,9 @@ BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 +int WINAPI SHFormatDateTimeA(const FILETIME UNALIGNED *filetime, DWORD *flags, LPSTR buffer, UINT size); +int WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *filetime, DWORD *flags, LPWSTR buffer, UINT size); + typedef struct { const IID *piid;

1 0

Nikolay Sivov : ole32/tests: Add some tests for MonikerCommonPrefixWith().
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: f117d938a7eb5ab2a49358ef6658bc9b0de0948d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f117d938a7eb5ab2a49358ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:20:29 2020 +0300 ole32/tests: Add some tests for MonikerCommonPrefixWith(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d485360215..4c8d013e42 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -92,6 +92,24 @@ todo_wine_if(todo) ok_(__FILE__, line)(type2 == type, "Unexpected moniker type %d.\n", type2); } +#define TEST_DISPLAY_NAME(m,name) _test_moniker_name(m, name, __LINE__) +static void _test_moniker_name(IMoniker *moniker, const WCHAR *name, int line) +{ + WCHAR *display_name; + IBindCtx *pbc; + HRESULT hr; + + hr = CreateBindCtx(0, &pbc); + ok_(__FILE__, line)(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, pbc, NULL, &display_name); + ok_(__FILE__, line)(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); + ok_(__FILE__, line)(!lstrcmpW(display_name, name), "Unexpected display name %s.\n", wine_dbgstr_w(display_name)); + + CoTaskMemFree(display_name); + IBindCtx_Release(pbc); +} + static IMoniker *create_antimoniker(DWORD level) { LARGE_INTEGER pos; @@ -3221,6 +3239,104 @@ static void test_save_load_filemoniker(void) IStream_Release(pStm); } +static void test_MonikerCommonPrefixWith(void) +{ + IMoniker *moniker, *item, *file1, *file2, *composite, *composite2; + HRESULT hr; + + moniker = (void *)0xdeadbeef; + hr = MonikerCommonPrefixWith(NULL, NULL, &moniker); +todo_wine { + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer.\n"); +} + if (hr == E_NOTIMPL) + return; + + hr = CreateItemMoniker(L"!", L"Item", &item); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\test.txt", &file1); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(file1, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + /* F x F */ + hr = MonikerCommonPrefixWith(file1, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\a\\test.txt", &file2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F1 x F2 */ + hr = MonikerCommonPrefixWith(file1, file2, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateGenericComposite(file1, item, &composite); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = CreateGenericComposite(file2, item, &composite2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F x (F,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite, &moniker); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* F1 x (F2,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F2,I) x F1 -> F */ + hr = MonikerCommonPrefixWith(composite2, file1, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F,I) x (F) -> F */ + hr = MonikerCommonPrefixWith(composite, file1, &moniker); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F,I) x (F,I) -> (F,I) */ + hr = MonikerCommonPrefixWith(composite, composite, &moniker); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); + TEST_DISPLAY_NAME(moniker, L"C:\\test.txt!Item"); + ok(moniker != composite, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F1,I) x (F2,I) -> () */ + hr = MonikerCommonPrefixWith(composite, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer %p.\n", moniker); + + IMoniker_Release(composite2); + IMoniker_Release(composite); + IMoniker_Release(file2); + IMoniker_Release(file1); + IMoniker_Release(item); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -3235,6 +3351,7 @@ START_TEST(moniker) test_generic_composite_moniker(); test_pointer_moniker(); test_save_load_filemoniker(); + test_MonikerCommonPrefixWith(); /* FIXME: test moniker creation funcs and parsing other moniker formats */

1 0

Nikolay Sivov : ole32/tests: Use helper to test display names.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: e0cad34031acdec76e2d70badc679ad621814265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0cad34031acdec76e2d70ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:20:30 2020 +0300 ole32/tests: Use helper to test display names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 56 +++++++++------------------------------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 4c8d013e42..6be75f75c2 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1605,24 +1605,12 @@ static void test_moniker( BOOL same; BYTE buffer[128]; IMoniker * moniker_proxy; - LPOLESTR display_name; - IBindCtx *bindctx; hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "%s: IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", testname, hr); /* Display Name */ - - hr = CreateBindCtx(0, &bindctx); - ok_ole_success(hr, CreateBindCtx); - - hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); - ok_ole_success(hr, IMoniker_GetDisplayName); - ok(!lstrcmpW(display_name, expected_display_name), "%s: unexpected display name %s, %s.\n", testname, - wine_dbgstr_w(display_name), wine_dbgstr_w(expected_display_name)); - - CoTaskMemFree(display_name); - IBindCtx_Release(bindctx); + TEST_DISPLAY_NAME(moniker, expected_display_name); hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "%s: IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", testname, hr); @@ -2096,7 +2084,6 @@ static void test_item_moniker(void) WCHAR displayname[16] = L"display name"; IEnumMoniker *enummoniker; IRunningObjectTable *rot; - WCHAR *display_name; BIND_OPTS bind_opts; LARGE_INTEGER pos; IStream *stream; @@ -2174,12 +2161,7 @@ static void test_item_moniker(void) hr = IMoniker_Load(moniker2, stream); ok(hr == S_OK, "Failed to load moniker, hr %#x.\n", hr); - hr = IMoniker_GetDisplayName(moniker2, bindctx, NULL, &display_name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(display_name, item_moniker_data[i].display_name), "%d: unexpected display name %s.\n", - i, wine_dbgstr_w(display_name)); - - CoTaskMemFree(display_name); + TEST_DISPLAY_NAME(moniker2, item_moniker_data[i].display_name); } IStream_Release(stream); @@ -2454,7 +2436,6 @@ static void test_anti_moniker(void) static const WCHAR expected_display_name[] = { '\\','.','.',0 }; IEnumMoniker *enummoniker; IStream *stream; - WCHAR *name; hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); @@ -2545,10 +2526,7 @@ static void test_anti_moniker(void) ok(hash == 0x80000002, "Unexpected hash value %#x.\n", hash); /* Display name reflects anti combination. */ - hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(name, L"\\..\\.."), "Unexpected display name %s.\n", wine_dbgstr_w(name)); - CoTaskMemFree(name); + TEST_DISPLAY_NAME(moniker, L"\\..\\.."); /* Limit is at 0xfffff. */ stream_write_dword(stream, 0xfffff); @@ -2585,10 +2563,7 @@ static void test_anti_moniker(void) ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); ok(hash == 0x80000000, "Unexpected hash value %#x.\n", hash); - hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); - CoTaskMemFree(name); + TEST_DISPLAY_NAME(moniker, L""); /* Back to initial value. */ stream_write_dword(stream, 1); @@ -2704,22 +2679,16 @@ static void test_generic_composite_moniker(void) IBindCtx *bindctx; FILETIME filetime; IUnknown *unknown; - static const WCHAR wszDelimiter1[] = {'!',0}; - static const WCHAR wszObjectName1[] = {'T','e','s','t',0}; - static const WCHAR wszDelimiter2[] = {'#',0}; - static const WCHAR wszObjectName2[] = {'W','i','n','e',0}; - static const WCHAR expected_display_name[] = { '!','T','e','s','t','#','W','i','n','e',0 }; - WCHAR *name; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); - hr = CreateItemMoniker(wszDelimiter1, wszObjectName1, &moniker1); - ok_ole_success(hr, CreateItemMoniker); - hr = CreateItemMoniker(wszDelimiter2, wszObjectName2, &moniker2); - ok_ole_success(hr, CreateItemMoniker); + hr = CreateItemMoniker(L"!", L"Test", &moniker1); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + hr = CreateItemMoniker(L"#", L"Wine", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); hr = CreateGenericComposite(moniker1, moniker2, &moniker); - ok_ole_success(hr, CreateGenericComposite); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); /* Compose with itself. */ EXPECT_REF(moniker1, 2); @@ -2786,10 +2755,7 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); TEST_MONIKER_TYPE(moniker4, MKSYS_GENERICCOMPOSITE); - hr = IMoniker_GetDisplayName(moniker4, bindctx, NULL, &name); - ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); - ok(!lstrcmpW(name, L"!Test#Wine"), "Unexpected name %s.\n", wine_dbgstr_w(name)); - CoTaskMemFree(name); + TEST_DISPLAY_NAME(moniker4, L"!Test#Wine"); IMoniker_Release(moniker4); IMoniker_Release(moniker3); @@ -2807,7 +2773,7 @@ todo_wine expected_gc_moniker_marshal_data, sizeof(expected_gc_moniker_marshal_data), expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data), - 160, expected_display_name); + 160, L"!Test#Wine"); /* Hashing */

1 0

Alexandre Julliard : kernelbase: Use RtlNormalizeString() directly in FoldStringW().
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: f0a82c3a2aa324d410d0d706aad80da430a0cb21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0a82c3a2aa324d410d0d706… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 16:31:08 2020 +0100 kernelbase: Use RtlNormalizeString() directly in FoldStringW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 163 +++++++++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 61 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 9953bf7e1a..c697da16eb 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -836,9 +836,10 @@ static const WCHAR *get_ligature( WCHAR wc ) } -static int expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +static NTSTATUS expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) { int i, len, pos = 0; + NTSTATUS ret = STATUS_SUCCESS; const WCHAR *expand; for (i = 0; i < srclen; i++) @@ -850,30 +851,93 @@ static int expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int dstle } else len = lstrlenW( expand ); - if (dstlen) + if (*dstlen && ret == STATUS_SUCCESS) { - if (pos + len > dstlen) break; - memcpy( dst + pos, expand, len * sizeof(WCHAR) ); + if (pos + len <= *dstlen) memcpy( dst + pos, expand, len * sizeof(WCHAR) ); + else ret = STATUS_BUFFER_TOO_SMALL; } pos += len; } - return pos; + *dstlen = pos; + return ret; } -static int fold_digits( const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +static NTSTATUS fold_digits( const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) { extern const WCHAR wine_digitmap[] DECLSPEC_HIDDEN; - int i; + int i, len = *dstlen; - if (!dstlen) return srclen; - if (srclen > dstlen) return 0; + *dstlen = srclen; + if (!len) return STATUS_SUCCESS; + if (srclen > len) return STATUS_BUFFER_TOO_SMALL; for (i = 0; i < srclen; i++) { WCHAR digit = get_table_entry( wine_digitmap, src[i] ); dst[i] = digit ? digit : src[i]; } - return srclen; + return STATUS_SUCCESS; +} + + +static NTSTATUS fold_string( DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) +{ + NTSTATUS ret; + WCHAR *tmp; + + switch (flags) + { + case MAP_PRECOMPOSED: + return RtlNormalizeString( NormalizationC, src, srclen, dst, dstlen ); + case MAP_FOLDCZONE: + case MAP_PRECOMPOSED | MAP_FOLDCZONE: + return RtlNormalizeString( NormalizationKC, src, srclen, dst, dstlen ); + case MAP_COMPOSITE: + return RtlNormalizeString( NormalizationD, src, srclen, dst, dstlen ); + case MAP_COMPOSITE | MAP_FOLDCZONE: + return RtlNormalizeString( NormalizationKD, src, srclen, dst, dstlen ); + case MAP_FOLDDIGITS: + return fold_digits( src, srclen, dst, dstlen ); + case MAP_EXPAND_LIGATURES: + case MAP_EXPAND_LIGATURES | MAP_FOLDCZONE: + return expand_ligatures( src, srclen, dst, dstlen ); + case MAP_FOLDDIGITS | MAP_PRECOMPOSED: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationC, tmp, srclen, dst, dstlen ); + break; + case MAP_FOLDDIGITS | MAP_FOLDCZONE: + case MAP_FOLDDIGITS | MAP_PRECOMPOSED | MAP_FOLDCZONE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationKC, tmp, srclen, dst, dstlen ); + break; + case MAP_FOLDDIGITS | MAP_COMPOSITE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationD, tmp, srclen, dst, dstlen ); + break; + case MAP_FOLDDIGITS | MAP_COMPOSITE | MAP_FOLDCZONE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationKD, tmp, srclen, dst, dstlen ); + break; + case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS: + case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS | MAP_FOLDCZONE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = expand_ligatures( tmp, srclen, dst, dstlen ); + break; + default: + return STATUS_INVALID_PARAMETER_1; + } + RtlFreeHeap( GetProcessHeap(), 0, tmp ); + return ret; } @@ -3280,8 +3344,9 @@ INT WINAPI DECLSPEC_HOTPATCH FindStringOrdinal( DWORD flag, const WCHAR *src, IN */ INT WINAPI DECLSPEC_HOTPATCH FoldStringW( DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst, INT dstlen ) { - WCHAR *tmp; - int ret; + NTSTATUS status; + WCHAR *buf = dst; + int len = dstlen; if (!src || !srclen || dstlen < 0 || (dstlen && !dst) || src == dst) { @@ -3290,60 +3355,36 @@ INT WINAPI DECLSPEC_HOTPATCH FoldStringW( DWORD flags, LPCWSTR src, INT srclen, } if (srclen == -1) srclen = lstrlenW(src) + 1; - switch (flags) + if (!dstlen && (flags & (MAP_PRECOMPOSED | MAP_FOLDCZONE | MAP_COMPOSITE))) { - case MAP_PRECOMPOSED: - return NormalizeString( NormalizationC, src, srclen, dst, dstlen ); - case MAP_FOLDCZONE: - case MAP_PRECOMPOSED | MAP_FOLDCZONE: - return NormalizeString( NormalizationKC, src, srclen, dst, dstlen ); - case MAP_COMPOSITE: - return NormalizeString( NormalizationD, src, srclen, dst, dstlen ); - case MAP_COMPOSITE | MAP_FOLDCZONE: - return NormalizeString( NormalizationKD, src, srclen, dst, dstlen ); - case MAP_FOLDDIGITS: - return fold_digits( src, srclen, dst, dstlen ); - case MAP_EXPAND_LIGATURES: - case MAP_EXPAND_LIGATURES | MAP_FOLDCZONE: - return expand_ligatures( src, srclen, dst, dstlen ); - case MAP_FOLDDIGITS | MAP_PRECOMPOSED: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationC, tmp, srclen, dst, dstlen ); - break; - case MAP_FOLDDIGITS | MAP_FOLDCZONE: - case MAP_FOLDDIGITS | MAP_PRECOMPOSED | MAP_FOLDCZONE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationKC, tmp, srclen, dst, dstlen ); - break; - case MAP_FOLDDIGITS | MAP_COMPOSITE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationD, tmp, srclen, dst, dstlen ); - break; - case MAP_FOLDDIGITS | MAP_COMPOSITE | MAP_FOLDCZONE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationKD, tmp, srclen, dst, dstlen ); - break; - case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS: - case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS | MAP_FOLDCZONE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = expand_ligatures( tmp, srclen, dst, dstlen ); - break; - default: - SetLastError( ERROR_INVALID_FLAGS ); - return 0; + len = srclen * 4; + if (!(buf = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } } - if (!tmp) + + for (;;) { - SetLastError( ERROR_OUTOFMEMORY ); + status = fold_string( flags, src, srclen, buf, &len ); + if (buf != dst) RtlFreeHeap( GetProcessHeap(), 0, buf ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + if (!(buf = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } + } + if (status == STATUS_INVALID_PARAMETER_1) + { + SetLastError( ERROR_INVALID_FLAGS ); return 0; } - RtlFreeHeap( GetProcessHeap(), 0, tmp ); - return ret; + if (!set_ntstatus( status )) return 0; + + if (dstlen && dstlen < len) SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return len; }

1 0

Francois Gouget : testbot/UpdateTaskLogs: Don't rebuild .err files in --delete mode.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: tools Branch: master Commit: 4eaa59e8e201f8f2eb9968281657b371ff4b2879 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4eaa59e8e201f8f2eb99682… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 31 13:15:14 2020 +0100 testbot/UpdateTaskLogs: Don't rebuild .err files in --delete mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 93b6504..d9369d8 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -271,7 +271,7 @@ sub ProcessTaskLogs($$$) if (-f $RefReportPath or -f "$RefReportPath.err") { - if (!-f "$RefReportPath.err") + if (!$OptDelete and !-f "$RefReportPath.err") { # (Re)Build the .err file before adding the reference report to # latest/.

1 0