November 2019 - wine-commits

Alexandre Julliard : Wine release 4.21
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: website Branch: master Commit: e8ab73647257569043a611efde9b23829aad288f URL: https://source.winehq.org/git/website.git/?a=commit;h=e8ab73647257569043a61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 20:17:45 2019 +0100 Wine release 4.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019112901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019112901.xml b/news/en/2019112901.xml new file mode 100644 index 00000000..1658f33b --- /dev/null +++ b/news/en/2019112901.xml @@ -0,0 +1,15 @@ +<news> +<date>November 29, 2019</date> +<title>Wine 4.21 Released</title> +<body> + The Wine development release 4.21 is now available. + <a href="{$root}/announce/4.21">What's new</a> in this release: +<ul> + <li>HTTP proxy configuration through DHCP.</li> + <li>Parameter block support in D3DX9.</li> + <li>A few more dlls converted to PE.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.21 : Alexandre Julliard : Release 4.21
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: refs/tags/wine-4.21 Tag: 11c6388e0519ed723f0dd39a205bf84d192c6e14 URL: https://source.winehq.org/git/wine.git/?a=tag;h=11c6388e0519ed723f0dd39a205… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 20:15:57 2019 +0100 Release 4.21

1 0

Alexandre Julliard : Release 4.21.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 2935bab96569dcd734a8e855ec9a20ae27c18973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2935bab96569dcd734a8e855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 20:15:57 2019 +0100 Release 4.21. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 908 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 475 insertions(+), 456 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2935bab96569dcd734a8…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 14e7064e870c2c3fdcc0f12913af0a47ebacfb45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e7064e870c2c3fdcc0f129… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 29 22:31:33 2019 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/ja.po b/po/ja.po index 05be4a948f..5aa4b0b42d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-10-27 21:38+0900\n" +"PO-Revision-Date: 2019-11-29 22:03+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -615,7 +615,7 @@ msgstr "文字セット(&I):" #: comdlg32.rc:283 comdlg32.rc:288 msgid "Color" -msgstr "色の設定" +msgstr "色" #: comdlg32.rc:286 msgid "&Basic Colors:" @@ -627,7 +627,7 @@ msgstr "作成した色(&C):" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|純色(&O)" #: comdlg32.rc:290 msgid "&Red:" @@ -664,11 +664,9 @@ msgid "&Define Custom Colors >>" msgstr "色の作成(&D) >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "いいえ(&N)" +msgstr "&o" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find"

1 0

Nikolay Sivov : dwrite: Add support for IDWriteTextFormat3 for text layout object.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: a49f56ef9b9f281bfe55f24caea0c8595f402a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49f56ef9b9f281bfe55f24c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 29 12:54:27 2019 +0300 dwrite: Add support for IDWriteTextFormat3 for text layout object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 456 ++++++++++++++++++++++++++------------------- dlls/dwrite/tests/layout.c | 16 +- 2 files changed, 282 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a49f56ef9b9f281bfe55…

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextLayout4.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 33a57f8d1dbb34994556f9250c6975eae55e179d URL: https://source.winehq.org/git/wine.git/?a=commit;h=33a57f8d1dbb34994556f925… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 29 12:54:26 2019 +0300 dwrite: Update to IDWriteTextLayout4. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 914 ++++++++++++++++++++++++++++----------------------- 1 file changed, 507 insertions(+), 407 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33a57f8d1dbb34994556…

1 0

Nikolay Sivov : dwrite: Update to IDWriteColorGlyphRunEnumerator1.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 1b23a522afbef2a27a4d1648db8860771ffc13b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b23a522afbef2a27a4d1648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 29 12:54:25 2019 +0300 dwrite: Update to IDWriteColorGlyphRunEnumerator1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 138 ++++++++++++++++++++++++++++------------------- dlls/dwrite/tests/font.c | 28 ++++++++++ 2 files changed, 110 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b23a522afbef2a27a4d…

1 0

Alexandre Julliard : ntdll: Remove trailing \n in fatal_perror() calls.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: dd732232890f176a9ae618b63fe63a2b62dbf93e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd732232890f176a9ae618b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 17:14:14 2019 +0100 ntdll: Remove trailing \n in fatal_perror() calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 204370a1b7..089eb3b89a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1139,7 +1139,7 @@ static int setup_config_dir(void) if (chdir( config_dir ) == -1) { - if (errno != ENOENT) fatal_perror( "chdir to %s\n", config_dir ); + if (errno != ENOENT) fatal_perror( "chdir to %s", config_dir ); if ((p = strrchr( config_dir, '/' )) && p != config_dir) { @@ -1156,7 +1156,7 @@ static int setup_config_dir(void) } mkdir( config_dir, 0777 ); - if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); + if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } @@ -1164,7 +1164,7 @@ static int setup_config_dir(void) if (mkdir( "dosdevices", 0777 ) == -1) { if (errno == EEXIST) goto done; - fatal_perror( "cannot create %s/dosdevices\n", config_dir ); + fatal_perror( "cannot create %s/dosdevices", config_dir ); } /* create the drive symlinks */

1 0

Alexandre Julliard : include: Remove winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 4dc4bab93fd97a73567df595bdbb75be27b48964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dc4bab93fd97a73567df595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:58:05 2019 +0100 include: Remove winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bfd893e8cd..aeb9a55dee 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -83,14 +83,6 @@ extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } extern const char *wine_dbgstr_longlong( ULONGLONG ll ); -/* strcmpW is available for tests compiled under Wine, but not in standalone - * builds under Windows, so we reimplement it under a different name. */ -static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - #ifdef STANDALONE #define START_TEST(name) \ static void func_##name(void); \

1 0

Alexandre Julliard : winhttp/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 88c05d90619fd2b2449b2dcec31e5b6873f1b295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c05d90619fd2b2449b2dce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:58:00 2019 +0100 winhttp/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2cf6f6a87d..6a8d496238 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3651,7 +3651,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); ok(ret, "failed to query proxy username %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %u\n", size); size = ARRAY_SIZE(buffer); @@ -3672,7 +3672,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); ok(ret, "failed to query proxy password %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %u\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); @@ -3681,7 +3681,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); ok(ret, "failed to query username %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %u\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); @@ -3690,7 +3690,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); ok(ret, "failed to query password %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %u\n", size); WinHttpCloseHandle(req);

1 0

Alexandre Julliard : shell32/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 8310d7c4172ccae3233a843f3b8c37255dfef1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=8310d7c4172ccae3233a843f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:56 2019 +0100 shell32/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 3bfd9cbe38..db839200d5 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -496,9 +496,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) { IMalloc *pmalloc; - lok(!winetest_strcmpW(path, str), "Expected %s, got %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(str)); - + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); SHGetMalloc(&pmalloc); IMalloc_Free(pmalloc, str); } @@ -554,9 +552,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) { IMalloc *pmalloc; - lok(!winetest_strcmpW(path, str), "Expected %s, got %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(str)); - + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); SHGetMalloc(&pmalloc); IMalloc_Free(pmalloc, str); }

1 0

Alexandre Julliard : msxml3/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: f077f8b08dae39046485725682a140f54c3b9327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f077f8b08dae390464857256… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:51 2019 +0100 msxml3/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index f1f3e4206b..0fcaf757b2 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -983,7 +983,7 @@ static void test_collection_content(void) content[i] = bstr; for (j = 0; j < i; ++j) - ok(winetest_strcmpW(content[j], bstr), "got duplicate entry\n"); + ok(wcscmp(content[j], bstr), "got duplicate entry\n"); } for (i = 0; i < 3; ++i) @@ -1001,7 +1001,7 @@ static void test_collection_content(void) ok(bstr != NULL && *bstr, "expected non-empty string\n"); for (j = 0; j < i; ++j) - ok(winetest_strcmpW(content[j], bstr), "got duplicate entry\n"); + ok(wcscmp(content[j], bstr), "got duplicate entry\n"); content[i] = bstr; }

1 0

Alexandre Julliard : msvcrt/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 65049191ab7f9404147ae00f3596347ee186c270 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65049191ab7f9404147ae00f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:46 2019 +0100 msvcrt/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/environ.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index b8e0ae6251..43115d86da 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -228,7 +228,7 @@ static void test__wenviron(void) if ((*p_wenviron)[i]) { ok( wenvp[i] != NULL, "Expected environment block pointer element to be non-NULL\n" ); - ok( !winetest_strcmpW((*p_wenviron)[i], wenvp[i]), + ok( !wcscmp((*p_wenviron)[i], wenvp[i]), "Expected _wenviron and environment block pointer strings (%s vs. %s) to match\n", wine_dbgstr_w((*p_wenviron)[i]), wine_dbgstr_w(wenvp[i]) ); }

1 0

Alexandre Julliard : mscoree/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 9c3457215551b312dd11da7236f657d50f3bd066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3457215551b312dd11da72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:41 2019 +0100 mscoree/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 3ec5f09511..26c06246a9 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -252,17 +252,17 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); /* With NULL-pointer for bufferlength, the buffer itself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); + ok(!wcscmp(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ memset(version, 0, sizeof(version)); @@ -271,7 +271,7 @@ static void test_versioninfo(void) if(hr == S_OK) { /* .NET 1.1 may not be installed. */ - ok(!winetest_strcmpW(version, v1_1) || !winetest_strcmpW(version, v2_0), + ok(!wcscmp(version, v1_1) || !wcscmp(version, v2_0), "version is %s , expected %s or %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v1_1), wine_dbgstr_w(v2_0)); } @@ -287,7 +287,7 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); @@ -296,7 +296,7 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); hr = pCorIsLatestSvc(NULL, NULL); ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr);

1 0

Alistair Leslie-Hughes : d3dx9: Implement D3DXCreateFragmentLinker[Ex]().
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: fd06827bca416dfec8835f109834ad0729c996a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd06827bca416dfec8835f10… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 29 11:57:30 2019 +0100 d3dx9: Implement D3DXCreateFragmentLinker[Ex](). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38086 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 209 +++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/shader.c | 49 ++++++++++ 2 files changed, 250 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c59fc791ea..d7adc18ff6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2069,27 +2069,220 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } -HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +struct d3dx9_fragment_linker +{ + ID3DXFragmentLinker ID3DXFragmentLinker_iface; + LONG ref; + + struct IDirect3DDevice9 *device; + DWORD flags; +}; + +static inline struct d3dx9_fragment_linker *impl_from_ID3DXFragmentLinker(ID3DXFragmentLinker *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_fragment_linker, ID3DXFragmentLinker_iface); +} + +static HRESULT WINAPI d3dx9_fragment_linker_QueryInterface(ID3DXFragmentLinker *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXFragmentLinker)) + { + iface->lpVtbl->AddRef(iface); + *out = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_fragment_linker_AddRef(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedIncrement(&linker->ref); + + TRACE("%p increasing refcount to %u.\n", linker, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_fragment_linker_Release(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedDecrement(&linker->ref); + + TRACE("%p decreasing refcount to %u.\n", linker, refcount); + + if (!refcount) + { + IDirect3DDevice9_Release(linker->device); + heap_free(linker); + } + + return refcount; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetDevice(ID3DXFragmentLinker *iface, struct IDirect3DDevice9 **device) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + + TRACE("iface %p, device %p.\n", linker, device); + + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(linker->device); + *device = linker->device; + TRACE("Returning device %p.\n", *device); + + return S_OK; +} + +static UINT WINAPI d3dx9_fragment_linker_GetNumberOfFragments(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); + + return E_NOTIMPL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByIndex(ID3DXFragmentLinker *iface, UINT index) +{ + FIXME("iface %p, index %u: stub.\n", iface, index); + + return NULL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByName(ID3DXFragmentLinker *iface, + const char *name) +{ + FIXME("iface %p, name %s: stub.\n", iface, debugstr_a(name)); + + return NULL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragmentDesc(ID3DXFragmentLinker *iface, D3DXHANDLE name, + D3DXFRAGMENT_DESC *desc) +{ + FIXME("iface %p, name %p, desc %p: stub.\n", iface, name, desc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_AddFragments(ID3DXFragmentLinker *iface, const DWORD *fragments) +{ + FIXME("iface %p, fragments %p: stub.\n", iface, fragments); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetAllFragments(ID3DXFragmentLinker *iface, ID3DXBuffer **buffer) +{ + FIXME("iface %p, buffer %p: stub.\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragment(ID3DXFragmentLinker *iface, D3DXHANDLE name, + ID3DXBuffer **buffer) +{ + FIXME("iface %p, name %p, buffer %p: stub.\n", iface, name, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, ID3DXBuffer **buffer, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, buffer %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, buffer, errors); - if (linker) - *linker = NULL; + return E_NOTIMPL; +} +static HRESULT WINAPI d3dx9_fragment_linker_LinkVertexShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DVertexShader9 **shader, + ID3DXBuffer **errors) +{ + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); return E_NOTIMPL; } -HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +static HRESULT WINAPI d3dx9_fragment_linker_LinkPixelShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DPixelShader9 **shader, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); + + return E_NOTIMPL; +} - if (linker) - *linker = NULL; +static HRESULT WINAPI d3dx9_fragment_linker_ClearCache(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); return E_NOTIMPL; } +static const struct ID3DXFragmentLinkerVtbl d3dx9_fragment_linker_vtbl = +{ + d3dx9_fragment_linker_QueryInterface, + d3dx9_fragment_linker_AddRef, + d3dx9_fragment_linker_Release, + d3dx9_fragment_linker_GetDevice, + d3dx9_fragment_linker_GetNumberOfFragments, + d3dx9_fragment_linker_GetFragmentHandleByIndex, + d3dx9_fragment_linker_GetFragmentHandleByName, + d3dx9_fragment_linker_GetFragmentDesc, + d3dx9_fragment_linker_AddFragments, + d3dx9_fragment_linker_GetAllFragments, + d3dx9_fragment_linker_GetFragment, + d3dx9_fragment_linker_LinkShader, + d3dx9_fragment_linker_LinkVertexShader, + d3dx9_fragment_linker_LinkPixelShader, + d3dx9_fragment_linker_ClearCache +}; + +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, + ID3DXFragmentLinker **linker) +{ + struct d3dx9_fragment_linker *object; + + TRACE("device %p, size %u, flags %#x, linker %p.\n", device, size, flags, linker); + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFragmentLinker_iface.lpVtbl = &d3dx9_fragment_linker_vtbl; + object->ref = 1; + + IDirect3DDevice9_AddRef(device); + object->device = device; + object->flags = flags; + + *linker = &object->ID3DXFragmentLinker_iface; + + return S_OK; +} + +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +{ + TRACE("device %p, size %u, linker %p.\n", device, size, linker); + + return D3DXCreateFragmentLinkerEx(device, size, 0, linker); +} + HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { UINT i, sampler_count = 0; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index e6326bc411..e2925faad6 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6575,6 +6575,54 @@ static void test_shader_semantics(void) } } +static void test_fragment_linker(void) +{ + ID3DXFragmentLinker *linker; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create a D3D object.\n"); + DestroyWindow(window); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create a D3D device, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = D3DXCreateFragmentLinker(device, 1024, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + hr = D3DXCreateFragmentLinkerEx(device, 1024, 0, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3D9_Release(d3d); + ok(!refcount, "The D3D object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6637,5 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_fragment_linker(); }

1 0

Zebediah Figura : ddraw: Track some more render states in the primary stateblock.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: b29c7da5f06f9650c316106abc71cd59e2b83026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29c7da5f06f9650c316106a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 23:53:37 2019 -0600 ddraw: Track some more render states in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 51576c81e2..def3e7c2a4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3555,6 +3555,7 @@ static void setup_lighting(const struct d3d_device *device, DWORD fvf, DWORD fla if (!device->material || !(fvf & D3DFVF_NORMAL) || (flags & D3DDP_DONOTLIGHT)) enable = FALSE; + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_LIGHTING, enable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, enable); } @@ -7033,11 +7034,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ + { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_COLORKEYENABLE, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); + } else if (version == 2) + { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_SPECULARENABLE, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); + } if (version < 7) { + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_NORMALIZENORMALS, TRUE); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE);

1 0

Francois Gouget : d3d9/tests: Fix a typo in a field name of the visual test.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: cb6f488215c7f589a6297c5ebdd8936ae6760343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6f488215c7f589a6297c5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:22:42 2019 +0100 d3d9/tests: Fix a typo in a field name of the visual test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f063d21fb..cbfb98bec6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26311,7 +26311,7 @@ static void test_sample_attached_rendertarget(void) static const struct { - struct vec3 posistion; + struct vec3 position; struct vec2 texcoord; } quad[] =

1 0

Zebediah Figura : ntoskrnl.exe: Remove a superfluous condition.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 993c833cf414d250bf380496f3aaf30f4a5e1e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=993c833cf414d250bf380496… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 19:29:46 2019 -0600 ntoskrnl.exe: Remove a superfluous condition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 365ddc069f..647d427ee5 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1251,7 +1251,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG lock->Common.Removed = TRUE; - if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed) + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); else if (count < 0) ERR("Lock %p is not acquired!\n", lock);

1 0

Zebediah Figura : kernelbase: Implement GetOverlappedResultEx().
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 216530f230d270c6bc86f9254f37ed58b843e44d URL: https://source.winehq.org/git/wine.git/?a=commit;h=216530f230d270c6bc86f925… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 18:19:21 2019 -0600 kernelbase: Implement GetOverlappedResultEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38830 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-io-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/pipe.c | 54 ++++++++++++++++++++++ dlls/kernelbase/file.c | 23 +++++++-- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec index 907c0b4a97..87039aef0c 100644 --- a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec +++ b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec @@ -4,7 +4,7 @@ @ stdcall CreateIoCompletionPort(long long long long) kernel32.CreateIoCompletionPort @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult -@ stub GetOverlappedResultEx +@ stdcall GetOverlappedResultEx(long ptr ptr long long) kernel32.GetOverlappedResultEx @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus @ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 82e10850a8..172be2a6e2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -760,6 +760,7 @@ @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall -import GetOEMCP() @ stdcall -import GetOverlappedResult(long ptr ptr long) +@ stdcall -import GetOverlappedResultEx(long ptr ptr long long) @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFullName(long ptr ptr) @ stdcall -import GetPhysicallyInstalledSystemMemory(ptr) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index d8d5726f1a..20f3450c6d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -42,6 +42,7 @@ static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerSessionId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetOverlappedResultEx)(HANDLE,OVERLAPPED *,DWORD *,DWORD,BOOL); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -4065,6 +4066,57 @@ static void test_nowait(DWORD pipe_type) ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); } +static void test_GetOverlappedResultEx(void) +{ + HANDLE client, server; + OVERLAPPED ovl; + char buffer[8000]; + DWORD ret_size; + BOOL ret; + + if (!pGetOverlappedResultEx) + { + win_skip("GetOverlappedResultEx() is not available\n"); + return; + } + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + overlapped_write_async(client, buffer, sizeof(buffer), &ovl); + + user_apc_ran = FALSE; + QueueUserAPC(user_apc, GetCurrentThread(), 0); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 0, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, FALSE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "wrong error %u\n", GetLastError()); + ok(!user_apc_ran, "APC should not have run\n"); + + SetLastError(0xdeadbeef); + ret = pGetOverlappedResultEx(client, &ovl, &ret_size, 10, TRUE); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_IO_COMPLETION, "wrong error %u\n", GetLastError()); + ok(user_apc_ran, "APC should have run\n"); + + CloseHandle(ovl.hEvent); + + CloseHandle(client); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -4080,6 +4132,7 @@ START_TEST(pipe) pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); pGetNamedPipeServerSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeServerSessionId"); + pGetOverlappedResultEx = (void *)GetProcAddress(hmod, "GetOverlappedResultEx"); argc = winetest_get_mainargs(&argv); @@ -4134,4 +4187,5 @@ START_TEST(pipe) test_wait_pipe(); test_nowait(PIPE_TYPE_BYTE); test_nowait(PIPE_TYPE_MESSAGE); + test_GetOverlappedResultEx(); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index aa2ebfcc69..77a7398580 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2002,21 +2002,38 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFileType( HANDLE file ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResult( HANDLE file, LPOVERLAPPED overlapped, LPDWORD result, BOOL wait ) +{ + return GetOverlappedResultEx( file, overlapped, result, wait ? INFINITE : 0, FALSE ); +} + + +/*********************************************************************** + * GetOverlappedResultEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *overlapped, + DWORD *result, DWORD timeout, BOOL alertable ) { NTSTATUS status; + DWORD ret; - TRACE( "(%p %p %p %x)\n", file, overlapped, result, wait ); + TRACE( "(%p %p %p %u %d)\n", file, overlapped, result, timeout, alertable ); status = overlapped->Internal; if (status == STATUS_PENDING) { - if (!wait) + if (!timeout) { SetLastError( ERROR_IO_INCOMPLETE ); return FALSE; } - if (WaitForSingleObject( overlapped->hEvent ? overlapped->hEvent : file, INFINITE ) == WAIT_FAILED) + ret = WaitForSingleObjectEx( overlapped->hEvent ? overlapped->hEvent : file, timeout, alertable ); + if (ret == WAIT_FAILED) return FALSE; + else if (ret) + { + SetLastError( ret ); + return FALSE; + } status = overlapped->Internal; if (status == STATUS_PENDING) status = STATUS_SUCCESS; diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 14ee402089..ed5d1f73f8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -584,7 +584,7 @@ # @ stub GetOsManufacturingMode # @ stub GetOsSafeBootMode @ stdcall GetOverlappedResult(long ptr ptr long) -# @ stub GetOverlappedResultEx +@ stdcall GetOverlappedResultEx(long ptr ptr long long) # @ stub GetPackageApplicationContext # @ stub GetPackageApplicationIds # @ stub GetPackageApplicationProperty diff --git a/include/winbase.h b/include/winbase.h index 8b30c5a69a..2d01dcb606 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2215,6 +2215,7 @@ WINBASEAPI BOOL WINAPI GetNumaProximityNodeEx(ULONG,PUSHORT); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL); +WINBASEAPI BOOL WINAPI GetOverlappedResultEx(HANDLE,OVERLAPPED*,DWORD*,DWORD,BOOL); WINBASEAPI DWORD WINAPI GetPriorityClass(HANDLE); WINADVAPI BOOL WINAPI GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD); WINBASEAPI UINT WINAPI GetPrivateProfileIntA(LPCSTR,LPCSTR,INT,LPCSTR);

1 0

Zebediah Figura : strmbase: Swap the lock order in IPin::EndFlush().
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: a4131ca625cf7b1c76ba8f230dda7c6b9d682bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4131ca625cf7b1c76ba8f23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 17:35:41 2019 -0600 strmbase: Swap the lock order in IPin::EndFlush(). This more closely resembles the threading model prescribed by the DirectX SDK documentation. In particular, the page "Flushing Data" recommends that IPin::BeginFlush() do the following steps in order: 1. take the filter lock 2. signal the streaming thread to complete 3. take the streaming lock, if necessary Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0ef9c5b225..cacbb90e59 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -133,8 +133,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) TRACE("iface %p.\n", iface); - EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); + EnterCriticalSection(&pFilter->csRenderLock); pFilter->eos = FALSE; hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) @@ -146,8 +146,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) if (pFilter->pFuncsTable->pfnEndFlush) hr = pFilter->pFuncsTable->pfnEndFlush(pFilter); } - LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); + LeaveCriticalSection(&pFilter->filter.csFilter); return hr; }

1 0

Zebediah Figura : quartz/dsoundrender: Delegate IReferenceClock to the system clock.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 63a6b308e91232dd55dd107595a6181c70180dd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63a6b308e91232dd55dd1075… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 17:35:40 2019 -0600 quartz/dsoundrender: Delegate IReferenceClock to the system clock. For several reasons. Firstly, the reference clock should still function when the filter is not running. Secondly, IDirectSoundBuffer::GetPositions() in practice returns very coarse positions, both on Windows and on Wine. On my hardware, the resolution is about 10ms, which, while suitable for the DirectSound renderer and probably also any video renderers, is nevertheless actually coarser than GetTickCount(). Thirdly, testing supports that the native DirectSound renderer returns a timestamp from IReferenceClock::GetTime() that is more accurate than IDirectSoundBuffer::GetPositions(). In fact, after dumping a large number of different clock sources, I came to the conclusion that it is probably using timeGetTime() as a source. On Wine that's identical to GetTickCount(), so we may as well just delegate directly to the system clock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 301 +++------------------------------------------ 1 file changed, 14 insertions(+), 287 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63a6b308e91232dd55dd…

1 0

Zebediah Figura : quartz/dsoundrender: Move DSoundRender_create() to avoid forward declarations.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 3f2b813da6bc5f810abdc90bee1c6000c03872e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2b813da6bc5f810abdc90b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 17:35:39 2019 -0600 quartz/dsoundrender: Move DSoundRender_create() to avoid forward declarations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 115 +++++++++++++++++++++---------------------- dlls/quartz/main.c | 4 +- dlls/quartz/quartz_private.h | 2 +- 3 files changed, 58 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index b6757fa76a..3171f99f7e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -39,10 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); */ static const REFERENCE_TIME DSoundRenderer_Max_Fill = 150 * 10000; -static const IBasicAudioVtbl IBasicAudio_Vtbl; -static const IReferenceClockVtbl IReferenceClock_Vtbl; -static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; - typedef struct DSoundRenderImpl { struct strmbase_renderer renderer; @@ -577,62 +573,6 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_query_interface = dsound_render_query_interface, }; -HRESULT DSoundRender_create(IUnknown *outer, void **out) -{ - static const WCHAR sink_name[] = {'A','u','d','i','o',' ','I','n','p','u','t',' ','p','i','n',' ','(','r','e','n','d','e','r','e','d',')',0}; - - HRESULT hr; - DSoundRenderImpl * pDSoundRender; - - *out = NULL; - - pDSoundRender = CoTaskMemAlloc(sizeof(DSoundRenderImpl)); - if (!pDSoundRender) - return E_OUTOFMEMORY; - ZeroMemory(pDSoundRender, sizeof(DSoundRenderImpl)); - - hr = strmbase_renderer_init(&pDSoundRender->renderer, - outer, &CLSID_DSoundRender, sink_name, &renderer_ops); - - pDSoundRender->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl; - pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; - pDSoundRender->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; - - if (SUCCEEDED(hr)) - { - hr = DirectSoundCreate8(NULL, &pDSoundRender->dsound, NULL); - if (FAILED(hr)) - ERR("Cannot create Direct Sound object (%x)\n", hr); - else - hr = IDirectSound8_SetCooperativeLevel(pDSoundRender->dsound, GetDesktopWindow(), DSSCL_PRIORITY); - if (SUCCEEDED(hr)) { - IDirectSoundBuffer *buf; - DSBUFFERDESC buf_desc; - memset(&buf_desc,0,sizeof(DSBUFFERDESC)); - buf_desc.dwSize = sizeof(DSBUFFERDESC); - buf_desc.dwFlags = DSBCAPS_PRIMARYBUFFER; - hr = IDirectSound8_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); - if (SUCCEEDED(hr)) { - IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); - IDirectSoundBuffer_Release(buf); - } - hr = S_OK; - } - } - - if (SUCCEEDED(hr)) - { - *out = &pDSoundRender->renderer.filter.IUnknown_inner; - } - else - { - strmbase_renderer_cleanup(&pDSoundRender->renderer); - CoTaskMemFree(pDSoundRender); - } - - return hr; -} - /*** IUnknown methods ***/ static HRESULT WINAPI Basicaudio_QueryInterface(IBasicAudio *iface, REFIID riid, @@ -1158,3 +1098,58 @@ static const IAMDirectSoundVtbl IAMDirectSound_Vtbl = AMDirectSound_SetFocusWindow, AMDirectSound_GetFocusWindow }; + +HRESULT dsound_render_create(IUnknown *outer, void **out) +{ + static const DSBUFFERDESC buffer_desc = { + .dwSize = sizeof(DSBUFFERDESC), + .dwFlags = DSBCAPS_PRIMARYBUFFER, + }; + + IDirectSoundBuffer *buffer; + DSoundRenderImpl *object; + HRESULT hr; + + if (!(object = CoTaskMemAlloc(sizeof(*object)))) + return E_OUTOFMEMORY; + memset(object, 0, sizeof(*object)); + + if (FAILED(hr = strmbase_renderer_init(&object->renderer, outer, + &CLSID_DSoundRender, L"Audio Input pin (rendered)", &renderer_ops))) + { + CoTaskMemFree(object); + return hr; + } + + object->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl; + object->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; + object->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; + + if (FAILED(hr = DirectSoundCreate8(NULL, &object->dsound, NULL))) + { + strmbase_renderer_cleanup(&object->renderer); + CoTaskMemFree(object); + return hr; + } + + if (FAILED(hr = IDirectSound8_SetCooperativeLevel(object->dsound, + GetDesktopWindow(), DSSCL_PRIORITY))) + { + IDirectSound8_Release(object->dsound); + strmbase_renderer_cleanup(&object->renderer); + CoTaskMemFree(object); + return hr; + } + + if (SUCCEEDED(hr = IDirectSound8_CreateSoundBuffer(object->dsound, + &buffer_desc, &buffer, NULL))) + { + IDirectSoundBuffer_Play(buffer, 0, 0, DSBPLAY_LOOPING); + IDirectSoundBuffer_Release(buffer); + } + + TRACE("Created DirectSound renderer %p.\n", object); + *out = &object->renderer.filter.IUnknown_inner; + + return S_OK; +} diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 9540fa9293..33c70d7592 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -73,8 +73,8 @@ static const struct object_creation_info object_creation[] = { &CLSID_VideoMixingRenderer, VMR7Impl_create }, { &CLSID_VideoMixingRenderer9, VMR9Impl_create }, { &CLSID_VideoRendererDefault, VideoRendererDefault_create }, - { &CLSID_DSoundRender, DSoundRender_create }, - { &CLSID_AudioRender, DSoundRender_create }, + { &CLSID_DSoundRender, dsound_render_create }, + { &CLSID_AudioRender, dsound_render_create }, { &CLSID_AVIDec, AVIDec_create }, { &CLSID_SystemClock, QUARTZ_CreateSystemClock }, { &CLSID_ACMWrapper, ACMWrapper_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index f3ba39fba9..791bec7db6 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -40,6 +40,7 @@ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) +HRESULT dsound_render_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT filter_graph_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT filter_graph_no_thread_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; @@ -47,7 +48,6 @@ HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT StdMemAllocator_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; -HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : quartz/systemclock: Support COM aggregation.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: d21dbf960b840f2af33f7e43df799817ded5097f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d21dbf960b840f2af33f7e43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 28 17:35:38 2019 -0600 quartz/systemclock: Support COM aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 121 +++++++++++++++++++++++++++------------- dlls/quartz/tests/systemclock.c | 108 ++++++++++++++++++++++++++++++++++- 2 files changed, 186 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d21dbf960b840f2af33f…

1 0

Alistair Leslie-Hughes : dmime: Trace pbMemData/llMemLength on the same line.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 292d62e3bb808ae3c9e4c57c7a560af323e74a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=292d62e3bb808ae3c9e4c57c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 28 20:55:34 2019 +0100 dmime: Trace pbMemData/llMemLength on the same line. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmutils.c | 4 ++-- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmime/dmutils.c | 2 +- dlls/dmloader/debug.c | 2 +- dlls/dmscript/dmscript_main.c | 2 +- dlls/dmstyle/dmutils.c | 2 +- dlls/dmusic/dmusic_main.c | 2 +- dlls/dswave/dswave_main.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c76bde1146..a1dc7e28a5 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -137,7 +137,7 @@ static const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); @@ -525,7 +525,7 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", pDesc->pStream); } else { diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 21e896cc3e..3428a58b91 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -468,7 +468,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 7b3bcec079..cd955fd8a5 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -455,7 +455,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30b23c2ade..10ba0bce93 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -491,7 +491,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7a96679302..55bc11b29a 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -498,7 +498,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index fd3abe5209..70b810a8df 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -509,7 +509,7 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); if (pDesc->dwValidData & DMUS_OBJ_MEMORY) - TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + TRACE_(dmime)(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 295cd84b82..0951cb9e95 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -468,7 +468,7 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); - if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index bb554deaa4..4f3a73d9e9 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -437,7 +437,7 @@ const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream);

1 0

Alistair Leslie-Hughes : dmloader: Support DMUS_OBJ_MEMORY cache lookups.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 4df9039f75c93f558a10a6ee6ac29c1aa4681aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df9039f75c93f558a10a6ee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 28 10:08:18 2019 +0000 dmloader: Support DMUS_OBJ_MEMORY cache lookups. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 42209def94..9048c02dfc 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -191,8 +191,18 @@ static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_ if (desc->dwValidData & DMUS_OBJ_STREAM) FIXME("Finding DMUS_OBJ_STREAM cached objects currently not supported.\n"); - if (desc->dwValidData & DMUS_OBJ_MEMORY) - FIXME("Finding DMUS_OBJ_MEMORY cached objects currently not supported.\n"); + if (desc->dwValidData & DMUS_OBJ_MEMORY) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (existing->Desc.dwValidData & DMUS_OBJ_MEMORY && + desc->llMemLength == existing->Desc.llMemLength && + (desc->pbMemData == existing->Desc.pbMemData || + !memcmp(desc->pbMemData, existing->Desc.pbMemData, desc->llMemLength)) ) { + TRACE("Found by DMUS_OBJ_MEMORY (%d)\n", + desc->pbMemData == existing->Desc.pbMemData); + return existing; + } + } + } if ((desc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) {

1 0

Vijay Kiran Kamuju : shell32: Update the LINKHEADER based on binary file format.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: ec9eddf86b144cc0fcf975a9cc864cf08ba84eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9eddf86b144cc0fcf975a9… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 27 20:09:21 2019 +0100 shell32: Update the LINKHEADER based on binary file format. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 9a61ea100d..0dfb81c6e7 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -73,15 +73,16 @@ typedef struct _LINK_HEADER GUID MagicGuid; /* 0x04 is CLSID_ShellLink */ DWORD dwFlags; /* 0x14 describes elements following */ DWORD dwFileAttr; /* 0x18 attributes of the target file */ - FILETIME Time1; /* 0x1c */ - FILETIME Time2; /* 0x24 */ - FILETIME Time3; /* 0x2c */ - DWORD dwFileLength; /* 0x34 File length */ - DWORD nIcon; /* 0x38 icon number */ - DWORD fStartup; /* 0x3c startup type */ - DWORD wHotKey; /* 0x40 hotkey */ - DWORD Unknown5; /* 0x44 */ - DWORD Unknown6; /* 0x48 */ + FILETIME CreationTime; /* 0x1c creation time of target file */ + FILETIME AccessTime; /* 0x24 access time of target file */ + FILETIME WriteTime; /* 0x2c write time of target file */ + DWORD dwFileSize; /* 0x34 File size of target file */ + DWORD nIcon; /* 0x38 icon number or index */ + DWORD fStartup; /* 0x3c startup type or window state of application */ + WORD wHotKey; /* 0x40 hotkey */ + WORD Reserved1; /* 0x42 reserved = 0 */ + DWORD Reserved2; /* 0x44 reserved = 0 */ + DWORD Reserved3; /* 0x48 reserved = 0 */ } LINK_HEADER, * PLINK_HEADER; #define SHLINK_LOCAL 0 @@ -134,9 +135,9 @@ typedef struct /* data structures according to the information in the link */ LPITEMIDLIST pPidl; WORD wHotKey; - SYSTEMTIME time1; - SYSTEMTIME time2; - SYSTEMTIME time3; + SYSTEMTIME CreationTime; + SYSTEMTIME AccessTime; + SYSTEMTIME WriteTime; DWORD iShowCmd; LPWSTR sIcoPath; @@ -774,20 +775,20 @@ static HRESULT WINAPI IPersistStream_fnLoad( heap_free(This->sComponent); This->sComponent = NULL; - This->wHotKey = (WORD)hdr.wHotKey; + This->wHotKey = hdr.wHotKey; This->iIcoNdx = hdr.nIcon; - FileTimeToSystemTime (&hdr.Time1, &This->time1); - FileTimeToSystemTime (&hdr.Time2, &This->time2); - FileTimeToSystemTime (&hdr.Time3, &This->time3); + FileTimeToSystemTime (&hdr.CreationTime, &This->CreationTime); + FileTimeToSystemTime (&hdr.AccessTime, &This->AccessTime); + FileTimeToSystemTime (&hdr.WriteTime, &This->WriteTime); if (TRACE_ON(shell)) { WCHAR sTemp[MAX_PATH]; - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time1, NULL, sTemp, ARRAY_SIZE(sTemp)); - TRACE("-- time1: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time2, NULL, sTemp, ARRAY_SIZE(sTemp)); - TRACE("-- time2: %s\n", debugstr_w(sTemp) ); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->time3, NULL, sTemp, ARRAY_SIZE(sTemp)); - TRACE("-- time3: %s\n", debugstr_w(sTemp) ); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->CreationTime, NULL, sTemp, ARRAY_SIZE(sTemp)); + TRACE("-- CreationTime: %s\n", debugstr_w(sTemp) ); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->AccessTime, NULL, sTemp, ARRAY_SIZE(sTemp)); + TRACE("-- AccessTime: %s\n", debugstr_w(sTemp) ); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &This->WriteTime, NULL, sTemp, ARRAY_SIZE(sTemp)); + TRACE("-- WriteTime: %s\n", debugstr_w(sTemp) ); } /* load all the new stuff */ @@ -1041,9 +1042,9 @@ static HRESULT WINAPI IPersistStream_fnSave( if( This->sComponent ) header.dwFlags |= SLDF_HAS_DARWINID; - SystemTimeToFileTime ( &This->time1, &header.Time1 ); - SystemTimeToFileTime ( &This->time2, &header.Time2 ); - SystemTimeToFileTime ( &This->time3, &header.Time3 ); + SystemTimeToFileTime ( &This->CreationTime, &header.CreationTime ); + SystemTimeToFileTime ( &This->AccessTime, &header.AccessTime ); + SystemTimeToFileTime ( &This->WriteTime, &header.WriteTime ); /* write the Shortcut header */ r = IStream_Write( stm, &header, sizeof(header), &count );

1 0

Vijay Kiran Kamuju : include: Add definitions for ShellLinkDataBlocks in shlobj.h.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 0af4323e41b020d81a2aaf944bb87b31603ed45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af4323e41b020d81a2aaf94… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 27 20:09:20 2019 +0100 include: Add definitions for ShellLinkDataBlocks in shlobj.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index e963578d6c..9a7741a193 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1397,7 +1397,13 @@ typedef enum { SLDF_FORCE_NO_LINKTRACK = 0x00040000, SLDF_ENABLE_TARGET_METADATA = 0x00080000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SLDF_VALID = 0x003ff7ff, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; @@ -1407,6 +1413,35 @@ typedef struct tagDATABLOCKHEADER DWORD dwSignature; } DATABLOCK_HEADER, *LPDATABLOCK_HEADER, *LPDBLIST; +typedef struct { + DATABLOCK_HEADER dbh; + WORD wFillAttribute; + WORD wPopupFillAttribute; + COORD dwScreenBufferSize; + COORD dwWindowSize; + COORD dwWindowOrigin; + DWORD nFont; + DWORD nInputBufferSize; + COORD dwFontSize; + UINT uFontFamily; + UINT uFontWeight; + WCHAR FaceName[LF_FACESIZE]; + UINT uCursorSize; + BOOL bFullScreen; + BOOL bQuickEdit; + BOOL bInsertMode; + BOOL bAutoPosition; + UINT uHistoryBufferSize; + UINT uNumberOfHistoryBuffers; + BOOL bHistoryNoDup; + COLORREF ColorTable[16]; +} NT_CONSOLE_PROPS, *LPNT_CONSOLE_PROPS; + +typedef struct { + DATABLOCK_HEADER dbh; + UINT uCodePage; +} NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS; + typedef struct { DATABLOCK_HEADER dbh; CHAR szDarwinID[MAX_PATH];

1 0

Sven Baars : schannel/tests: Use a more reliable method for detecting a wrong SECPKG_INTERFACE_VERSION.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: b6424ca5a4f788a817b3aacb9faedbf42b60375e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6424ca5a4f788a817b3aacb… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Nov 28 00:07:55 2019 +0100 schannel/tests: Use a more reliable method for detecting a wrong SECPKG_INTERFACE_VERSION. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/main.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 81a723c799..4b4b7b4f38 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -141,7 +141,7 @@ static void testInitialize(void) static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, ULONG Version) { - size_t size; + int detectedVersion = 0, size; PSECPKG_FUNCTION_TABLE pNextTable; if (Version == SECPKG_INTERFACE_VERSION) @@ -166,15 +166,41 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, } pNextTable = (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); - /* Win7 function tables appear to be SECPKG_INTERFACE_VERSION_6 format, - but unfortunately SpLsaModeInitialize returns SECPKG_INTERFACE_VERSION_3. - We detect that by comparing the "Initialize" pointer from the old table - to the "FreeCredentialsHandle" pointer of the new table. These functions - have different numbers of arguments, so they can't possibly point to the - same implementation */ - if (broken((void *) pTable->Initialize == (void *) pNextTable->FreeCredentialsHandle && - pNextTable->FreeCredentialsHandle != NULL)) + + /* For any version of Windows beyond Vista SpLsaModeInitialize returns + SECPKG_INTERFACE_VERSION_3, so try detecting the actual version here + by iterating until we find the Intitalize function */ + if (broken((void *) pTable->Initialize != (void *) pNextTable->Initialize && + pTable->Initialize != NULL)) { + for (size = 1; size <= SECPKG_FUNCTION_TABLE_SIZE_8; size++) + { + pNextTable = (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); + if ((void *) pTable->Initialize == (void *) pNextTable->Initialize) + { + if (size == SECPKG_FUNCTION_TABLE_SIZE_1) + detectedVersion = 1; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_2) + detectedVersion = 2; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_3) + detectedVersion = 3; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_4) + detectedVersion = 4; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_5) + detectedVersion = 5; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_6) + detectedVersion = 6; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_7) + detectedVersion = 7; + else if (size == SECPKG_FUNCTION_TABLE_SIZE_8) + detectedVersion = 8; + else + trace("Unknown package version with size %u\n", size); + if (detectedVersion > 0) + trace("Detected SECPKG_INTERFACE_VERSION_%d\n", detectedVersion); + return pNextTable; + } + } win_skip("Invalid function pointers for next package\n"); return NULL; }

1 0

Sven Baars : schannel: Update SECPKG_FUNCTION_TABLE to SECPKG_INTERFACE_VERSION_8.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 01de4d33999eb1bcebbcac5ff4cfde42307b2455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01de4d33999eb1bcebbcac5f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Nov 28 00:07:54 2019 +0100 schannel: Update SECPKG_FUNCTION_TABLE to SECPKG_INTERFACE_VERSION_8. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/lsamode.c | 6 +++++- dlls/schannel/tests/main.c | 6 +++++- include/ntsecpkg.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index 96ca240c08..372c5800b3 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -116,6 +116,8 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ NULL, /* PostLogonUser */ + NULL, /* GetRemoteCredGuardLogonBuffer */ + NULL, /* GetRemoteCredGuardSupplementalCreds */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -153,6 +155,8 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ NULL, /* PostLogonUser */ + NULL, /* GetRemoteCredGuardLogonBuffer */ + NULL, /* GetRemoteCredGuardSupplementalCreds */ } }; @@ -164,7 +168,7 @@ NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_7; + *PackageVersion = SECPKG_INTERFACE_VERSION_8; *pcTables = 2; *ppTables = secPkgFunctionTable; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index fc913c14a9..81a723c799 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -45,7 +45,9 @@ ValidateTargetInfo) #define SECPKG_FUNCTION_TABLE_SIZE_6 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ PostLogonUser) -#define SECPKG_FUNCTION_TABLE_SIZE_7 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_7 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + GetRemoteCredGuardLogonBuffer) +#define SECPKG_FUNCTION_TABLE_SIZE_8 sizeof(SECPKG_FUNCTION_TABLE) #define LSA_BASE_CAPS ( \ SECPKG_FLAG_INTEGRITY | \ @@ -156,6 +158,8 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, size = SECPKG_FUNCTION_TABLE_SIZE_6; else if (Version == SECPKG_INTERFACE_VERSION_7) size = SECPKG_FUNCTION_TABLE_SIZE_7; + else if (Version == SECPKG_INTERFACE_VERSION_8) + size = SECPKG_FUNCTION_TABLE_SIZE_8; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL; diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 08373a2635..99b9ec7d40 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -38,6 +38,7 @@ extern "C" { #define SECPKG_INTERFACE_VERSION_5 0x100000 #define SECPKG_INTERFACE_VERSION_6 0x200000 #define SECPKG_INTERFACE_VERSION_7 0x400000 +#define SECPKG_INTERFACE_VERSION_8 0x800000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -305,6 +306,28 @@ typedef struct _LSA_SECPKG_FUNCTION_TABLE { } LSA_SECPKG_FUNCTION_TABLE, *PLSA_SECPKG_FUNCTION_TABLE; +/* Functions for redirected credentials */ +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_INIT)(HANDLE, + const UNICODE_STRING *, ULONG, const LUID *); +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_CALLBACK)(HANDLE, PVOID, ULONG, + PVOID *, ULONG *); +typedef VOID (NTAPI *PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK)(HANDLE); +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_GET_LOGON_CREDS)(HANDLE, PBYTE *, + PULONG); +typedef NTSTATUS (NTAPI *PLSA_REDIRECTED_LOGON_GET_SUPP_CREDS)(HANDLE, + PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); + +typedef struct _SECPKG_REDIRECTED_LOGON_BUFFER { + GUID RedirectedLogonGuid; + HANDLE RedirectedLogonHandle; + PLSA_REDIRECTED_LOGON_INIT Init; + PLSA_REDIRECTED_LOGON_CALLBACK Callback; + PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK CleanupCallback; + PLSA_REDIRECTED_LOGON_GET_LOGON_CREDS GetLogonCreds; + PLSA_REDIRECTED_LOGON_GET_SUPP_CREDS GetSupplementalCreds; +} SECPKG_REDIRECTED_LOGON_BUFFER, + *PSECPKG_REDIRECTED_LOGON_BUFFER; + /* LSA-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); @@ -374,6 +397,12 @@ typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PSECPKG_TARGETINFO); typedef NTSTATUS (NTAPI LSA_AP_POST_LOGON_USER)(PSECPKG_POST_LOGON_USER_INFO); +typedef NTSTATUS (NTAPI SpGetRemoteCredGuardLogonBufferFn)(LSA_SEC_HANDLE, + const UNICODE_STRING *, PHANDLE, PLSA_REDIRECTED_LOGON_CALLBACK *, + PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK *, PULONG, PVOID *); +typedef NTSTATUS (NTAPI SpGetRemoteCredGuardSupplementalCredsFn)(LSA_SEC_HANDLE, + const UNICODE_STRING *, PHANDLE, PLSA_REDIRECTED_LOGON_CALLBACK *, + PLSA_REDIRECTED_LOGON_CLEANUP_CALLBACK *, PULONG, PVOID *); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -446,6 +475,9 @@ typedef struct SECPKG_FUNCTION_TABLE { /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ LSA_AP_POST_LOGON_USER* PostLogonUser; /* Packages with version SECPKG_INTERFACE_VERSION_7 end here */ + SpGetRemoteCredGuardLogonBufferFn* GetRemoteCredGuardLogonBuffer; + SpGetRemoteCredGuardSupplementalCredsFn* GetRemoteCredGuardSupplementalCreds; + /* Packages with version SECPKG_INTERFACE_VERSION_8 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

Francois Gouget : dxerr8: Fix the spelling of some error messages.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 431a21d95e573eaf8cafdd041b7100b576143756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431a21d95e573eaf8cafdd04… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:40:53 2019 +0100 dxerr8: Fix the spelling of some error messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/errors.dat | 4 ++-- dlls/dxerr8/errors.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxerr8/errors.dat b/dlls/dxerr8/errors.dat index dd73561282..4ab288ccd4 100644 --- a/dlls/dxerr8/errors.dat +++ b/dlls/dxerr8/errors.dat @@ -202,7 +202,7 @@ DDERR_INVALIDPIXELFORMAT pixel format was invalid as specified DDERR_INVALIDRECT Rectangle provided was invalid. DDERR_LOCKEDSURFACES Operation could not be carried out because one or more surfaces are locked DDERR_NO3D There is no 3D present. -DDERR_NOALPHAHW Operation could not be carried out because there is no alpha accleration hardware present or available. +DDERR_NOALPHAHW Operation could not be carried out because there is no alpha acceleration hardware present or available. DDERR_NOSTEREOHARDWARE Operation could not be carried out because there is no stereo hardware present or available. DDERR_NOSURFACELEFT Operation could not be carried out because there is no hardware present which supports stereo surfaces DDERR_NOCLIPLIST no clip list available @@ -268,7 +268,7 @@ DDERR_NOBLTHW No blter. DDERR_NODDROPSHW No DirectDraw ROP hardware. DDERR_OVERLAYNOTVISIBLE returned when GetOverlayPosition is called on a hidden overlay DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination. -DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destionation. +DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destination. DDERR_NOTAOVERLAYSURFACE returned when an overlay member is called for a non-overlay surface DDERR_EXCLUSIVEMODEALREADYSET An attempt was made to set the cooperative level when it was already set to exclusive. DDERR_NOTFLIPPABLE An attempt has been made to flip a surface that is not flippable. diff --git a/dlls/dxerr8/errors.h b/dlls/dxerr8/errors.h index c46fda8b46..4f2711315f 100644 --- a/dlls/dxerr8/errors.h +++ b/dlls/dxerr8/errors.h @@ -613,8 +613,8 @@ static const WCHAR name204W[] = { 'D','D','E','R','R','_','N','O','3','D',0 }; static const CHAR description204A[] = "There is no 3D present."; static const WCHAR description204W[] = { 'T','h','e','r','e',' ','i','s',' ','n','o',' ','3','D',' ','p','r','e','s','e','n','t','.',0 }; static const WCHAR name205W[] = { 'D','D','E','R','R','_','N','O','A','L','P','H','A','H','W',0 }; -static const CHAR description205A[] = "Operation could not be carried out because there is no alpha accleration hardware present or available."; -static const WCHAR description205W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; +static const CHAR description205A[] = "Operation could not be carried out because there is no alpha acceleration hardware present or available."; +static const WCHAR description205W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','e','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; static const WCHAR name206W[] = { 'D','D','E','R','R','_','N','O','S','T','E','R','E','O','H','A','R','D','W','A','R','E',0 }; static const CHAR description206A[] = "Operation could not be carried out because there is no stereo hardware present or available."; static const WCHAR description206W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','s','t','e','r','e','o',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; @@ -809,10 +809,10 @@ static const CHAR description269A[] = "returned when GetOverlayPosition is calle static const WCHAR description269W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','h','i','d','d','e','n',' ','o','v','e','r','l','a','y',0 }; static const WCHAR name270W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R','L','A','Y','D','E','S','T',0 }; static const CHAR description270A[] = "returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination."; -static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 }; +static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name271W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 }; static const CHAR description271A[] = "returned when the position of the overlay on the destination is no longer legal for that destination."; -static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; +static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name272W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 }; static const CHAR description272A[] = "returned when an overlay member is called for a non-overlay surface"; static const WCHAR description272W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','m','e','m','b','e','r',' ','i','s',' ','c','a','l','l','e','d',' ','f','o','r',' ','a',' ','n','o','n','-','o','v','e','r','l','a','y',' ','s','u','r','f','a','c','e',0 };

1 0

Francois Gouget : ole32: Fix a spelling error in a function parameter name.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 5f35664974e2375aa368c8a9ba91996335414dae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f35664974e2375aa368c8a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:29:42 2019 +0100 ole32: Fix a spelling error in a function parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fa3872dad0..515880ec36 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9637,7 +9637,7 @@ typedef struct * * Memory allocated for pData must be freed by the caller */ -static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *pData, BOOL bStrem1) +static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *pData, BOOL bStream1) { DWORD dwSize; HRESULT hRes = S_OK; @@ -9698,7 +9698,7 @@ static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM } } } - if(bStrem1) + if(bStream1) { dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleObjFileNameLength), sizeof(pData->dwOleObjFileNameLength)); if(dwSize != sizeof(pData->dwOleObjFileNameLength)) @@ -9752,7 +9752,7 @@ static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM if(hRes == S_OK) /* I don't know what this 8 byte information is. We have to figure out */ { - if(!bStrem1) /* if it is a second OLE stream data */ + if(!bStream1) /* if it is a second OLE stream data */ { pData->dwDataLength -= 8; dwSize = pOleStream->lpstbl->Get(pOleStream, pData->strUnknown, sizeof(pData->strUnknown));

1 0

Francois Gouget : ole32: Fix the name of PropertyStorage_WriteWStringToStream().
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: e70de9dbbb34820d6503d0a8972266d724d464b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70de9dbbb34820d6503d0a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:29:19 2019 +0100 ole32: Fix the name of PropertyStorage_WriteWStringToStream(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 708147e51d..505467cad5 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1738,7 +1738,7 @@ static void PropertyStorage_MakePropertyIdOffset(DWORD propid, DWORD dwOffset, offsetof(PROPERTYIDOFFSET, dwOffset), dwOffset); } -static inline HRESULT PropertStorage_WriteWStringToStream(IStream *stm, +static inline HRESULT PropertyStorage_WriteWStringToStream(IStream *stm, LPCWSTR str, DWORD len, DWORD *written) { #ifdef WORDS_BIGENDIAN @@ -1788,7 +1788,7 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, if (FAILED(c->hr)) goto end; c->bytesWritten += sizeof(DWORD); - c->hr = PropertStorage_WriteWStringToStream(This->stm, key, keyLen, + c->hr = PropertyStorage_WriteWStringToStream(This->stm, key, keyLen, &count); if (FAILED(c->hr)) goto end;

1 0

Francois Gouget : msvcrt: Fix the spelling of a couple of TRACE() messages.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 529d09d3530cba17dd3ffba1c8fd0016cc5e250f URL: https://source.winehq.org/git/wine.git/?a=commit;h=529d09d3530cba17dd3ffba1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:59 2019 +0100 msvcrt: Fix the spelling of a couple of TRACE() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 73a0d6a2b6..e2515c7778 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -371,7 +371,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } @@ -590,7 +590,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", + TRACE("re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } }

1 0

Francois Gouget : msvcp120/tests: Tweak two ok() messages and fix their spelling.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 842aa6bae74f79d470cb89a8afb984c4bd95e32b URL: https://source.winehq.org/git/wine.git/?a=commit;h=842aa6bae74f79d470cb89a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:47 2019 +0100 msvcp120/tests: Tweak two ok() messages and fix their spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d484cdd7ed..9c3f22a367 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1444,7 +1444,7 @@ static void test_tr2_sys__Copy_file(void) ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), - "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); + "test_tr2_sys__Copy_file(): test %d failed, mismatched file sizes\n", i+1); } ret = p_tr2_sys__Copy_file_wchar(testW, testW2, TRUE); ok(ret == ERROR_SUCCESS, "test_tr2_sys__Copy_file_wchar() expect ERROR_SUCCESS, got %d\n", ret); @@ -1886,7 +1886,7 @@ static void test_tr2_sys__Link(void) ok(errno == 0xdeadbeef, "tr2_sys__Link(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].existing_path) == p_tr2_sys__File_size(tests[i].new_path), - "tr2_sys__Link(): test %d failed, two files' size are not equal\n", i+1); + "tr2_sys__Link(): test %d failed, mismatched file sizes\n", i+1); } ok(DeleteFileA("f1"), "expect f1 to exist\n");

1 0

Francois Gouget : input: Fix the spelling of a parameter name in a function prototype.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 6e73cf2c17a9ffc8c559e2658fb26c692978a5c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e73cf2c17a9ffc8c559e265… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:28 2019 +0100 input: Fix the spelling of a parameter name in a function prototype. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/interactioncontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/interactioncontext.h b/include/interactioncontext.h index a3a5f34598..c0892855fd 100644 --- a/include/interactioncontext.h +++ b/include/interactioncontext.h @@ -184,7 +184,7 @@ HRESULT WINAPI SetInteractionConfigurationInteractionContext(HINTERACTIONCONTEXT UINT32 count, const INTERACTION_CONTEXT_CONFIGURATION *configuration); HRESULT WINAPI GetPropertyInteractionContext(HINTERACTIONCONTEXT context, - INTERACTION_CONTEXT_PROPERTY proerty, UINT32 *value); + INTERACTION_CONTEXT_PROPERTY property, UINT32 *value); HRESULT WINAPI SetPropertyInteractionContext(HINTERACTIONCONTEXT context, INTERACTION_CONTEXT_PROPERTY property, UINT32 value);

1 0

Francois Gouget : wmp/tests: Fix the spelling of an unused parameter name.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: c5e4a5345e4df28c12c64a8b867c2a7d1bf16af7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5e4a5345e4df28c12c64a8b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:14 2019 +0100 wmp/tests: Fix the spelling of an unused parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index db466bf6d4..aaeb2aa82d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -124,7 +124,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL;

1 0

Francois Gouget : d3dx9_36: Fix the spelling of a TRACE() message.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 0611e27caf5105795cb94e60dec5ff0561e8ec44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0611e27caf5105795cb94e60… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:27:56 2019 +0100 d3dx9_36: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b0bf8e3c38..88168df1e1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4254,7 +4254,7 @@ static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHA struct d3dx_parameter_block *block = get_valid_parameter_block(parameter_block); struct d3dx_recorded_parameter *record; - TRACE("iface %p, paramater_block %p.\n", iface, parameter_block); + TRACE("iface %p, parameter_block %p.\n", iface, parameter_block); if (!block || !block->offset) return D3DERR_INVALIDCALL;

1 0

Francois Gouget : rsaenh: A spelling fix in a comment.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: ca61bbcc8854a9783f2e6677567b4abb81c7ac76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca61bbcc8854a9783f2e6677… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:28:05 2019 +0100 rsaenh: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/mpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 3fbca42a8c..77c3fcaf74 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1009,7 +1009,7 @@ mp_add_d (mp_int * a, mp_digit b, mp_int * c) /* trim unused digits * * This is used to ensure that leading zero digits are - * trimed and the leading "used" digit will be non-zero + * trimmed and the leading "used" digit will be non-zero * Typically very fast. Also fixes the sign if there * are no more leading digits */

1 0

Francois Gouget : wbemprox: Fix the spelling of the free_associations() function name.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 81df49fadc25ef476b6cd6027b960cdf89c64b81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81df49fadc25ef476b6cd602… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 28 13:21:09 2019 +0100 wbemprox: Fix the spelling of the free_associations() function name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53d4b169cd..1f8afb46fe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2600,7 +2600,7 @@ struct association WCHAR *ref2; }; -static void free_assocations( struct association *assoc, UINT count ) +static void free_associations( struct association *assoc, UINT count ) { UINT i; if (!assoc) return; @@ -2652,7 +2652,7 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2668,12 +2668,12 @@ static enum fill_status fill_diskdrivetodiskpartition( struct table *table, cons if (!(assoc = get_diskdrivetodiskpartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; } @@ -2953,7 +2953,7 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2969,12 +2969,12 @@ static enum fill_status fill_logicaldisktopartition( struct table *table, const if (!(assoc = get_logicaldisktopartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; }

1 0

Chip Davis : ntdll: Fix tick count calculation on Mac.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 289d456dd617c164047b6562b993a7c1a7955232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=289d456dd617c164047b6562… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Nov 27 09:54:09 2019 -0600 ntdll: Fix tick count calculation on Mac. Inspired by a patch by Andrew Eikum. macOS's mach_absolute_time() stops counting when the computer goes to sleep/suspend/hibernate/etc. However, Windows's GetTickCount() does not stop counting. mach_continuous_time() matches Windows's behavior. BSD's CLOCK_MONOTONIC already counts asleep time. Unfortunately, there is no clock source on Linux which does exactly what we want. CLOCK_MONOTONIC_RAW is unaffected by NTP adjustment, but like mach_absolute_time() doesn't keep ticking when the computer is asleep. CLOCK_BOOTTIME does keep ticking, but it is affected by NTP adjustments. CLOCK_MONOTONIC has both problems. What's needed is a CLOCK_BOOTTIME_RAW, which would not be slewed by adjtimex(2) and would count time spent asleep. To avoid issues with skew and performance, this patch falls back to mach_absolute_time() on macOS if mach_continuous_time() is unavailable. Note that mach_continuous_time() was introduced in macOS 10.12, meaning that if the minimum version required is less than that, it will be linked weakly. Therefore we must check that it is nonnull before attempting to call it. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/kernel32/time.c | 4 ++++ dlls/ntdll/time.c | 4 ++++ include/config.h.in | 3 +++ server/request.c | 4 ++++ 6 files changed, 17 insertions(+) diff --git a/configure b/configure index dc23826900..90ff22fc7e 100755 --- a/configure +++ b/configure @@ -17696,6 +17696,7 @@ for ac_func in \ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/configure.ac b/configure.ac index fe2816ca7b..7f2c3cda23 100644 --- a/configure.ac +++ b/configure.ac @@ -2171,6 +2171,7 @@ AC_CHECK_FUNCS(\ getopt_long_only \ kqueue \ lstat \ + mach_continuous_time \ pipe2 \ poll \ port_create \ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 817a830518..716230aa7a 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -78,6 +78,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 91e5887b87..4e3d5583c7 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -111,6 +111,10 @@ static inline ULONGLONG monotonic_counter(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 100; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; diff --git a/include/config.h.in b/include/config.h.in index 41a7cde553..63396e9250 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -554,6 +554,9 @@ /* Define to 1 if you have the <machine/sysarch.h> header file. */ #undef HAVE_MACHINE_SYSARCH_H +/* Define to 1 if you have the `mach_continuous_time' function. */ +#undef HAVE_MACH_CONTINUOUS_TIME + /* Define to 1 if you have the <mach/machine.h> header file. */ #undef HAVE_MACH_MACHINE_H diff --git a/server/request.c b/server/request.c index d2adb08a18..5610d392cf 100644 --- a/server/request.c +++ b/server/request.c @@ -529,6 +529,10 @@ unsigned int get_tick_count(void) static mach_timebase_info_data_t timebase; if (!timebase.denom) mach_timebase_info( &timebase ); +#ifdef HAVE_MACH_CONTINUOUS_TIME + if (&mach_continuous_time != NULL) + return mach_continuous_time() * timebase.numer / timebase.denom / 1000000; +#endif return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts;

1 0

Jeff Smith : ucrtbase: Add support for strftime format %r.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: c6bafaa6d92b78c82be5b955cae455f581750a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6bafaa6d92b78c82be5b955… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 28 01:57:42 2019 -0600 ucrtbase: Add support for strftime format %r. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 28 ++++++++++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4283566102..ef4f228554 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1386,6 +1386,34 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; #if _MSVCR_VER>=140 + case 'r': + if(time_data == MSVCRT_locale->locinfo->lc_time_curr) + { + if(!MSVCRT_CHECK_PMT(mstm->tm_hour>=0 && mstm->tm_hour<=23)) + goto einval_error; + if(!strftime_int(str, &ret, max, (mstm->tm_hour + 11) % 12 + 1, + alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS)) + return 0; + if(ret < max) + str[ret++] = ' '; + if(!strftime_str(str, &ret, max, mstm->tm_hour<12 ? + STRFTIME_TD(time_data, am) : STRFTIME_TD(time_data, pm))) + return 0; + } + else + { + if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) + return 0; + } + break; case 'R': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c1ab7f216a..083be42f42 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -974,8 +974,10 @@ static void test_strftime(void) {"%I", "11", { 0, 0, 23, 1, 0, 70, 4, 0, 0 }}, {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }}, {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, - {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE, TRUE}, + {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, + {"%#r", "12:0:0 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#r", "2:0:0 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, {"%t", "\t", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 3, 364, 0 }}, @@ -1077,6 +1079,7 @@ static void test_strftime(void) { "%#x", "y70", 0, L"yyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "1970", 0, L"yyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "y1970", 0, L"yyyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%r", "z", L"x", L"y", L"z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, }; const struct {

1 0

Francois Gouget : gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 40f5cffadde76fa1a6adc065f7d46b9411379180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f5cffadde76fa1a6adc065… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:08:46 2019 +0100 gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc. Windows 10 1507 still deleted it but 1607 no longer does. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ca433b33c0..231d6a4d35 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2082,7 +2082,9 @@ static void test_mf_Blank(void) ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hMetafile); ok(type == OBJ_METAFILE, "CloseMetaFile created object with type %d\n", type); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) @@ -2249,6 +2251,7 @@ static void test_mf_Graphics(void) HDC hdcMetafile; HMETAFILE hMetafile; POINT oldpoint; + INT type; BOOL ret; hdcMetafile = CreateMetaFileA(NULL); @@ -2275,7 +2278,9 @@ static void test_mf_Graphics(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2296,6 +2301,7 @@ static void test_mf_PatternBrush(void) LOGBRUSH *orig_lb; HBRUSH hBrush; BOOL ret; + INT type; orig_lb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGBRUSH)); @@ -2316,7 +2322,9 @@ static void test_mf_PatternBrush(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_PATTERN_BRUSH_BITS, sizeof(MF_PATTERN_BRUSH_BITS), "mf_Pattern_Brush") != 0)

1 0

Alexandre Julliard : ntdll: Keep a valid DOS name if the initial current directory is a Unix dir.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: f2060812418bc049105c2a30ceb039ee6d5f0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2060812418bc049105c2a30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 19:16:56 2019 +0100 ntdll: Keep a valid DOS name if the initial current directory is a Unix dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48114 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 79a1805618..ebeda01ff8 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -622,8 +622,17 @@ static void get_current_directory( UNICODE_STRING *dir ) if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { /* skip the \??\ prefix */ - dir->Length = nt_name.Length - 4 * sizeof(WCHAR); - memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + if (nt_name.Length > 6 * sizeof(WCHAR*) && nt_name.Buffer[5] == ':') + { + dir->Length = nt_name.Length - 4 * sizeof(WCHAR); + memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + } + else /* change \??\ to \\?\ */ + { + dir->Length = nt_name.Length; + memcpy( dir->Buffer, nt_name.Buffer, dir->Length ); + dir->Buffer[1] = '\\'; + } RtlFreeUnicodeString( &nt_name ); } }

1 0

Alexandre Julliard : ntdll: Don't fail to load data file when the registry key is missing.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 1902ab4d85049d39a439c49a16fc4a5c2bceba3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1902ab4d85049d39a439c49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:51:35 2019 +0100 ntdll: Don't fail to load data file when the registry key is missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48188 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 26b2f4203c..16287c83a1 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -160,17 +160,19 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) RtlInitUnicodeString( &nameW, buffer ); RtlInitUnicodeString( &valueW, value ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - if ((status = NtOpenKey( &handle, KEY_READ, &attr ))) return status; - info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - size = sizeof(buffer) - sizeof(WCHAR); - status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ); - NtClose( handle ); - if (!status) + if (!(status = NtOpenKey( &handle, KEY_READ, &attr ))) { - ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; - name = (WCHAR *)info->Data; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + size = sizeof(buffer) - sizeof(WCHAR); + if (!(status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ))) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + name = (WCHAR *)info->Data; + } + NtClose( handle ); } - else /* otherwise some hardcoded defaults */ + + if (!name) /* otherwise some hardcoded defaults */ { switch (type) {

1 0

Alexandre Julliard : kernel32: Move FoldStringW() function to kernelbase.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 7bb286ad9d04b456325f3ddedd893fbe8b9270b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb286ad9d04b456325f3dde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:05:13 2019 +0100 kernel32: Move FoldStringW() function to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 165 --------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/digitmap.c | 787 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 164 +++++++++ tools/make_unicode | 14 +- 7 files changed, 963 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bb286ad9d04b456325f…

1 0

Alexandre Julliard : kernel32: Reimplement FoldStringW() to support composition.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: e89bbd52444050b0b37b8efedc35c4d04355a8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89bbd52444050b0b37b8efe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:04:33 2019 +0100 kernel32: Reimplement FoldStringW() to support composition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 170 +++++++++++++++++++++++++++++++++++++------ dlls/kernel32/tests/locale.c | 38 +++------- 2 files changed, 159 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e89bbd52444050b0b37b…

1 0

Alexandre Julliard : wineboot: Keep config directory path in Unicode.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 95c9dee30aa34020079ff0a614d34761db504333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95c9dee30aa34020079ff0a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:51:17 2019 +0100 wineboot: Keep config directory path in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0a404c74a8..dd9a5bd8f6 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -160,21 +160,21 @@ done: } /* print the config directory in a more Unix-ish way */ -static const char *prettyprint_configdir(void) +static const WCHAR *prettyprint_configdir(void) { - static char buffer[MAX_PATH]; - WCHAR *path = _wgetenv( wineconfigdirW ); - char *p; + static WCHAR buffer[MAX_PATH]; + WCHAR *p, *path = _wgetenv( wineconfigdirW ); - if (!WideCharToMultiByte( CP_UNIXCP, 0, path, -1, buffer, ARRAY_SIZE(buffer), NULL, NULL )) - strcpy( buffer + ARRAY_SIZE(buffer) - 4, "..." ); + lstrcpynW( buffer, path, ARRAY_SIZE(buffer) ); + if (lstrlenW( wineconfigdirW ) >= ARRAY_SIZE(buffer) ) + lstrcpyW( buffer + ARRAY_SIZE(buffer) - 4, L"..." ); - if (!strncmp( buffer, "\\??\\unix\\", 9 )) + if (!wcsncmp( buffer, L"\\??\\unix\\", 9 )) { for (p = buffer + 9; *p; p++) if (*p == '\\') *p = '/'; return buffer + 9; } - else if (!strncmp( buffer, "\\??\\Z:\\", 7 )) + else if (!wcsncmp( buffer, L"\\??\\Z:\\", 7 )) { for (p = buffer + 6; *p; p++) if (*p == '\\') *p = '/'; return buffer + 6; @@ -1064,18 +1064,9 @@ static INT_PTR CALLBACK wait_dlgproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp static HWND show_wait_window(void) { - const char *config_dir = prettyprint_configdir(); - WCHAR *name; - HWND hwnd; - DWORD len; - - len = MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, NULL, 0 ); - name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, name, len ); - hwnd = CreateDialogParamW( GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_WAITDLG), 0, - wait_dlgproc, (LPARAM)name ); + HWND hwnd = CreateDialogParamW( GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_WAITDLG), 0, + wait_dlgproc, (LPARAM)prettyprint_configdir() ); ShowWindow( hwnd, SW_SHOWNORMAL ); - HeapFree( GetProcessHeap(), 0, name ); return hwnd; } @@ -1227,13 +1218,13 @@ static void update_wineprefix( BOOL force ) if (!inf_path) { - WINE_MESSAGE( "wine: failed to update %s, wine.inf not found\n", prettyprint_configdir() ); + WINE_MESSAGE( "wine: failed to update %s, wine.inf not found\n", debugstr_w( config_dir )); return; } if ((fd = _wopen( inf_path, O_RDONLY )) == -1) { WINE_MESSAGE( "wine: failed to update %s with %s: %s\n", - prettyprint_configdir(), debugstr_w(inf_path), strerror(errno) ); + debugstr_w(config_dir), debugstr_w(inf_path), strerror(errno) ); goto done; } fstat( fd, &st ); @@ -1263,7 +1254,7 @@ static void update_wineprefix( BOOL force ) install_root_pnp_devices(); update_user_profile(); - WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() ); + WINE_MESSAGE( "wine: configuration in %s has been updated.\n", debugstr_w(prettyprint_configdir()) ); } done:

1 0

Alexandre Julliard : cabarc: Avoid some conversion to Unix codepage.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: e87c84f56d505dba2e2ecc76a831458e9650c686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87c84f56d505dba2e2ecc76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:50:49 2019 +0100 cabarc: Avoid some conversion to Unix codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/cabarc.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 5337b1e009..d244d6ce27 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -335,21 +335,19 @@ static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf nameW = strdupAtoW( (pfdin->attribs & _A_NAME_IS_UTF) ? CP_UTF8 : CP_ACP, pfdin->psz1 ); if (match_files( nameW )) { - char *nameU = strdupWtoA( CP_UNIXCP, nameW ); if (opt_verbose) { - char attrs[] = "rxash"; + WCHAR attrs[] = L"rxash"; if (!(pfdin->attribs & _A_RDONLY)) attrs[0] = '-'; if (!(pfdin->attribs & _A_EXEC)) attrs[1] = '-'; if (!(pfdin->attribs & _A_ARCH)) attrs[2] = '-'; if (!(pfdin->attribs & _A_SYSTEM)) attrs[3] = '-'; if (!(pfdin->attribs & _A_HIDDEN)) attrs[4] = '-'; - printf( " %s %9u %04u/%02u/%02u %02u:%02u:%02u ", attrs, pfdin->cb, + wprintf( L" %s %9u %04u/%02u/%02u %02u:%02u:%02u ", attrs, pfdin->cb, (pfdin->date >> 9) + 1980, (pfdin->date >> 5) & 0x0f, pfdin->date & 0x1f, pfdin->time >> 11, (pfdin->time >> 5) & 0x3f, (pfdin->time & 0x1f) * 2 ); } - printf( "%s\n", nameU ); - cab_free( nameU ); + wprintf( L"%s\n", nameW ); } cab_free( nameW ); return 0; @@ -404,12 +402,7 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION if (match_files( file )) { - if (opt_verbose) - { - char *nameU = strdupWtoA( CP_UNIXCP, path ); - printf( "extracting %s\n", nameU ); - cab_free( nameU ); - } + if (opt_verbose) wprintf( L"extracting %s\n", path ); create_directories( path ); /* FIXME: check for existing file and overwrite mode */ ret = (INT_PTR)CreateFileW( path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -628,8 +621,7 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { - char *arg = strdupWtoA( CP_ACP, argv[1] ); - WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", arg); + WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1])); return 1; } break;

1 0

Alexandre Julliard : wininet: Handle http_proxy variable entirely in Unicode.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: cadad89d106186a9d0377607096a58677496ec50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cadad89d106186a9d0377607… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:49:07 2019 +0100 wininet: Handle http_proxy variable entirely in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c7e88c83ff..16dc200c13 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -541,7 +541,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { HKEY key; DWORD type, len; - LPCSTR envproxy; + const WCHAR *envproxy; LONG ret; memset( lpwpi, 0, sizeof(*lpwpi) ); @@ -573,7 +573,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } } - if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled) + if (!(envproxy = _wgetenv( L"http_proxy" )) || lpwpi->proxyEnabled) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -615,18 +615,8 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } else if (envproxy) { - WCHAR *envproxyW; - - len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); - if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) - { - RegCloseKey( key ); - return ERROR_OUTOFMEMORY; - } - MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); - FreeProxyInfo( lpwpi ); - if (parse_proxy_url( lpwpi, envproxyW )) + if (parse_proxy_url( lpwpi, envproxy )) { TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); lpwpi->proxyEnabled = 1; @@ -634,19 +624,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } else { - WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxyW)); + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); lpwpi->proxyEnabled = 0; lpwpi->proxy = NULL; lpwpi->proxyBypass = NULL; } - heap_free( envproxyW ); } if (lpwpi->proxyEnabled) { TRACE("Proxy is enabled.\n"); - if (!(envproxy = getenv( "no_proxy" ))) + if (!(envproxy = _wgetenv( L"no_proxy" ))) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyOverride, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -677,13 +666,12 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { WCHAR *envproxyW; - len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); - if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + if (!(envproxyW = heap_alloc(lstrlenW(envproxy) * sizeof(WCHAR)))) { RegCloseKey( key ); return ERROR_OUTOFMEMORY; } - MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + lstrcpyW( envproxyW, envproxy ); heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = envproxyW;

1 0

Alexandre Julliard : winhttp: Handle http_proxy variable entirely in Unicode.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 86f43b693a48f94f965ed088a82e20bd1ffde273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f43b693a48f94f965ed088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:48:32 2019 +0100 winhttp: Handle http_proxy variable entirely in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3f8acf0e02..22aa285a44 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1534,7 +1534,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) LONG l; HKEY key; BOOL got_from_reg = FALSE, direct = TRUE; - char *envproxy; + WCHAR *envproxy; TRACE("%p\n", info); @@ -1610,37 +1610,30 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } RegCloseKey( key ); } - if (!got_from_reg && (envproxy = getenv( "http_proxy" ))) + if (!got_from_reg && (envproxy = _wgetenv( L"http_proxy" ))) { - char *colon, *http_proxy = NULL; + WCHAR *colon, *http_proxy = NULL; - if (!(colon = strchr( envproxy, ':' ))) http_proxy = envproxy; + if (!(colon = wcschr( envproxy, ':' ))) http_proxy = envproxy; else { if (*(colon + 1) == '/' && *(colon + 2) == '/') { /* It's a scheme, check that it's http */ - if (!strncmp( envproxy, "http://", 7 )) http_proxy = envproxy + 7; - else WARN("unsupported scheme in $http_proxy: %s\n", envproxy); + if (!wcsncmp( envproxy, L"http://", 7 )) http_proxy = envproxy + 7; + else WARN("unsupported scheme in $http_proxy: %s\n", debugstr_w(envproxy)); } else http_proxy = envproxy; } if (http_proxy && http_proxy[0]) { - WCHAR *http_proxyW; - int len; - - len = MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, NULL, 0 ); - if ((http_proxyW = GlobalAlloc( 0, len * sizeof(WCHAR)))) - { - MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, http_proxyW, len ); - direct = FALSE; - info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - info->lpszProxy = http_proxyW; - info->lpszProxyBypass = NULL; - TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); - } + direct = FALSE; + info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + info->lpszProxy = GlobalAlloc( 0, (lstrlenW(http_proxy) + 1) * sizeof(WCHAR) ); + wcscpy( info->lpszProxy, http_proxy ); + info->lpszProxyBypass = NULL; + TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); } } if (direct)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019