December 2018 - Wine-Commits

Alexandre Julliard : ntdll/tests: Fix a test crash on latest Windows 10.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: b3167770e7a7eb5be5aac59ee045d5f63b086668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3167770e7a7eb5be5aac59e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 15:55:34 2018 +0100 ntdll/tests: Fix a test crash on latest Windows 10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 2c6170b..a69b31b 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -563,13 +563,17 @@ static void test_NtQueryDirectoryFile(void) ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", U(io).Status ); ok( U(io).Information == data_size || broken( U(io).Information == 0), "wrong info %lx\n", U(io).Information ); - ok( fbdi->NextEntryOffset == 0, "wrong offset %x\n", fbdi->NextEntryOffset ); - ok( fbdi->FileNameLength == lstrlenW(testfiles[0].name) * sizeof(WCHAR), - "wrong length %x\n", fbdi->FileNameLength ); - ok( filename[0] == testfiles[0].name[0], "incorrect long file name: %s\n", - wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); - ok( filename[1] == 0x5555, "incorrect long file name: %s\n", - wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); + ok( fbdi->NextEntryOffset == 0 || fbdi->NextEntryOffset == 0x55555555, /* win10 >= 1709 */ + "wrong offset %x\n", fbdi->NextEntryOffset ); + if (!fbdi->NextEntryOffset) + { + ok( fbdi->FileNameLength == lstrlenW(testfiles[0].name) * sizeof(WCHAR), + "wrong length %x\n", fbdi->FileNameLength ); + ok( filename[0] == testfiles[0].name[0], "incorrect long file name: %s\n", + wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); + ok( filename[1] == 0x5555, "incorrect long file name: %s\n", + wine_dbgstr_wn(fbdi->FileName, fbdi->FileNameLength/sizeof(WCHAR))); + } test_NtQueryDirectoryFile_classes( dirh, &mask );

1 0

Francois Gouget : winetest: Tweak the wording of an error message.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: 7f37fc1360dbd9994a50daf292102b2280b67081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f37fc1360dbd9994a50daf2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 11 04:57:06 2018 +0100 winetest: Tweak the wording of an error message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 5604409..3d6cc66 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1437,7 +1437,7 @@ int main( int argc, char *argv[] ) } if (failures > FAILURES_LIMIT) report( R_WARNING, - "%d tests failed, there's probably something broken with your setup.\n" + "%d tests failed. There is probably something broken with your setup.\n" "You need to address this before submitting results.", failures ); if (build_id[0] && nr_of_skips <= SKIP_LIMIT && failures <= FAILURES_LIMIT &&

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: a51a68207dbdda80a07ac14bb2482eb48d9c2189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51a68207dbdda80a07ac14b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 11 16:04:01 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/po/ru.po b/po/ru.po index e7c7360..b704dc7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-20 09:26+0300\n" +"PO-Revision-Date: 2018-12-11 15:59+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.2\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -312,25 +312,23 @@ msgstr "Отмена..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "Осталось %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "Осталось %1!u! %2 и %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Секунды" +msgstr "сек." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "мин." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "ч." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -2453,16 +2451,12 @@ msgstr "" "выполнения экспорта." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Выбор хранилища сертификатов" +msgstr "Выбор сертификата" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Выберите хранилище для импорта сертификата:" +msgstr "Выберите сертификат, который хотите использовать" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2992,20 +2986,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Примечание: закрытый ключ этого сертификата не экспортируемый." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Назначения:" +msgstr "Предназначение" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Размещение" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Выбор хранилища сертификатов" +msgstr "Выберите сертификат" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -11106,10 +11096,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Ошибка: неверная опция «%c».\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Ошибка: не удалось найти Процесс «%1».\n" +msgstr "Ошибка: не удалось получить имя хоста: %u.\n" #: hostname.rc:33 msgid "" @@ -14262,11 +14250,11 @@ msgstr "Цвет:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типы MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Управлять &ассоциациями файлов" #: winecfg.rc:308 msgid "Folders"

1 0

Nikolay Sivov : comctl32/tests: Use actual text width for ideal button size tests.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: cb7a426ceb42f053ca9d43d0d2b9f7013af2f9f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb7a426ceb42f053ca9d43d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 11 15:24:24 2018 +0300 comctl32/tests: Use actual text width for ideal button size tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 112 ++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb7a426ceb42f053ca9d…

1 0

Alexandre Julliard : setupapi/tests: Fix a test failure on latest Windows 10.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: bcab6625abadfb5b727bc3a19cae3806d61d23bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcab6625abadfb5b727bc3a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 15:53:50 2018 +0100 setupapi/tests: Fix a test failure on latest Windows 10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/parser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index f8d2c5d..07dcaaf 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -59,7 +59,8 @@ static const char tmpfilename[] = ".\\tmp.inf"; "aaaaaaaaaaaaaaaa" A256 #define A1200 A400 A400 A400 #define A511 A255 A256 -#define A4097 "a" A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 +#define A4096 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 +#define A4097 "a" A4096 #define STD_HEADER "[Version]\r\nSignature=\"$CHICAGO$\"\r\n" @@ -452,6 +453,11 @@ static void test_key_names(void) !strcmp( field, A1200), /* Vista, W2K8 */ "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); + else if (i == 52) + ok( !strcmp( field, key_names[i].fields[index] ) || + !strcmp( field, A4096), /* Win10 >= 1709 */ + "line %u: bad field %s/%s\n", + i, field, key_names[i].fields[index] ); else /* don't compare drive letter of paths */ if (field[0] && field[1] == ':' && field[2] == '\\') ok( !strcmp( field + 1, key_names[i].fields[index] + 1 ),

1 0

Francois Gouget : cryptui: Avoid an unneeded strlen() call.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: 804eb5c4354d47fa887b17788647ed67480a37b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=804eb5c4354d47fa887b1778… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 11 05:11:01 2018 +0100 cryptui: Avoid an unneeded strlen() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a100419..41938f5 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3497,7 +3497,7 @@ static void set_general_cert_properties(HWND hwnd, struct edit_cert_data *data) static void set_cert_string_property(PCCERT_CONTEXT cert, DWORD prop, LPWSTR str) { - if (str && strlenW(str)) + if (str && *str) { CRYPT_DATA_BLOB blob;

1 0

Alexandre Julliard : cmd/tests: Fix test failures on latest Windows 10.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: 0e33105abb981ec4231292af1772dc75bd487efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e33105abb981ec4231292af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 16:29:14 2018 +0100 cmd/tests: Fix test failures on latest Windows 10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/batch.c | 14 +++++++++++--- programs/cmd/tests/test_builtins.cmd.exp | 18 +++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 0c94d7e..162e9cf 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -165,6 +165,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char path_cmd[] = {'@','p','a','t','h','@'}; static const char shortpath_cmd[] = {'@','s','h','o','r','t','p','a','t','h','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; + static const char spaces_cmd[] = {'@','s','p','a','c','e','s','@'}; static const char tab_cmd[] = {'@','t','a','b','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; @@ -223,6 +224,15 @@ static const char *compare_line(const char *out_line, const char *out_end, const } else { err = out_end; } + }else if(exp_ptr+sizeof(spaces_cmd) <= exp_end + && !memcmp(exp_ptr, spaces_cmd, sizeof(spaces_cmd))) { + exp_ptr += sizeof(spaces_cmd); + if(out_ptr < out_end && *out_ptr == ' ') { + while (out_ptr < out_end && *out_ptr == ' ') out_ptr++; + continue; + } else { + err = out_end; + } }else if(exp_ptr+sizeof(tab_cmd) <= exp_end && !memcmp(exp_ptr, tab_cmd, sizeof(tab_cmd))) { exp_ptr += sizeof(tab_cmd); @@ -250,10 +260,8 @@ static const char *compare_line(const char *out_line, const char *out_end, const while(exp_ptr+sizeof(or_broken_cmd) <= exp_end && memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) exp_ptr++; - if(!exp_ptr) - return err; - exp_ptr += sizeof(or_broken_cmd); + if (exp_ptr > exp_end) return err; out_ptr = out_line; err = NULL; continue; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index bb27c6d..01ddc4d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1392,22 +1392,22 @@ bar\baz removed @drive@@path(a)foobar @pwd@ ------------ Testing attrib ------------ -A @drive@@path(a)foobar\foo(a)or_broken@A @drive@@path(a)foobar\foo(a)or_broken@A I @drive@@path(a)foobar\foo +A(a)spaces@@drive@@path(a)foobar\foo(a)or_broken@A I(a)spaces@@drive@@path(a)foobar\foo --- read-only attribute -A R @drive@@path(a)foobar\foo(a)or_broken@A R @drive@@path(a)foobar\foo(a)or_broken@A R I @drive@@path(a)foobar\foo +A R(a)spaces@@drive@@path(a)foobar\foo(a)or_broken@A R I(a)spaces@@drive@@path(a)foobar\foo foo foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -A @drive@@path(a)foobar\baz\level2(a)or_broken@A @drive@@path(a)foobar\baz\level2(a)or_broken@A I @drive@@path(a)foobar\baz\level2 -A R @drive@@path(a)foobar\level1(a)or_broken@A R @drive@@path(a)foobar\level1(a)or_broken@A R I @drive@@path(a)foobar\level1 -A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R I @drive@@path(a)foobar\baz\level2 -A @drive@@path(a)foobar\bar(a)or_broken@A @drive@@path(a)foobar\bar(a)or_broken@A I @drive@@path(a)foobar\bar +A(a)spaces@@drive@@path(a)foobar\baz\level2(a)or_broken@A I(a)spaces@@drive@@path(a)foobar\baz\level2 +A R(a)spaces@@drive@@path(a)foobar\level1(a)or_broken@A R I(a)spaces@@drive@@path(a)foobar\level1 +A R(a)spaces@@drive@@path(a)foobar\baz\level2(a)or_broken@A R I(a)spaces@@drive@@path(a)foobar\baz\level2 +A(a)spaces@@drive@@path(a)foobar\bar(a)or_broken@A I(a)spaces@@drive@@path(a)foobar\bar --- folders processing - @drive@@path(a)foobar@or_broken@ @drive@@path(a)foobar@or_broken@ I @drive@@path(a)foobar -(a)todo_wine@ R @drive@@path(a)foobar\baz(a)or_broken@ R @drive@@path(a)foobar\baz(a)or_broken@ @drive@@path(a)foobar\baz(a)or_broken@ R I @drive@@path(a)foobar\baz -A @drive@@path(a)foobar\baz\toto(a)or_broken@A @drive@@path(a)foobar\baz\toto(a)or_broken@A I @drive@@path(a)foobar\baz\toto +(a)spaces@@drive@@path(a)foobar@or_broken@ I(a)spaces@@drive@@path(a)foobar +(a)todo_wine@ R(a)spaces@@drive@@path(a)foobar\baz(a)or_broken@@spaces@@drive@@path(a)foobar\baz(a)or_broken@ R I(a)spaces@@drive@@path(a)foobar\baz +A(a)spaces@@drive@@path(a)foobar\baz\toto(a)or_broken@A I(a)spaces@@drive@@path(a)foobar\baz\toto toto lulu file created in read-only dir

1 0

Alexandre Julliard : user32/tests: Fix some test failures on latest Windows 10.
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: wine Branch: master Commit: ec94d0d58de8996c453da0ee6eff601776f5d54d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec94d0d58de8996c453da0ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 15:36:27 2018 +0100 user32/tests: Fix some test failures on latest Windows 10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 55 +++++++++++++++++++++++++++---------------- include/windef.h | 1 + 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 8f9defc..c50acbe 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3537,14 +3537,16 @@ static void test_dpi_context(void) { DPI_AWARENESS awareness; DPI_AWARENESS_CONTEXT context; - ULONG_PTR i; + ULONG_PTR i, flags; BOOL ret; UINT dpi; HDC hdc = GetDC( 0 ); context = pGetThreadDpiAwarenessContext(); + /* Windows 10 >= 1709 adds extra 0x6000 flags */ + flags = (ULONG_PTR)context & 0x6000; todo_wine - ok( context == (DPI_AWARENESS_CONTEXT)0x10, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x10 | flags), "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); todo_wine ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); @@ -3561,7 +3563,7 @@ static void test_dpi_context(void) ok( !ret, "got %d\n", ret ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)-5 ); + ret = pSetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)-6 ); ok( !ret, "got %d\n", ret ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); ret = pSetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); @@ -3596,7 +3598,7 @@ static void test_dpi_context(void) ret = pIsProcessDPIAware(); ok(ret, "got %d\n", ret); context = pGetThreadDpiAwarenessContext(); - ok( context == (DPI_AWARENESS_CONTEXT)0x11, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); SetLastError( 0xdeadbeef ); @@ -3604,11 +3606,11 @@ static void test_dpi_context(void) ok( !context, "got %p\n", context ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)-5 ); + context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)-6 ); ok( !context, "got %p\n", context ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); - ok( context == (DPI_AWARENESS_CONTEXT)0x80000011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x80000011 | flags), "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); dpi = pGetDpiForSystem(); @@ -3617,11 +3619,11 @@ static void test_dpi_context(void) ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); ok( !pIsProcessDPIAware(), "still aware\n" ); context = pGetThreadDpiAwarenessContext(); - ok( context == (DPI_AWARENESS_CONTEXT)0x10, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x10 | flags), "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - ok( context == (DPI_AWARENESS_CONTEXT)0x10, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x10 | flags), "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); dpi = pGetDpiForSystem(); @@ -3642,21 +3644,21 @@ static void test_dpi_context(void) ok( dpi == real_dpi, "wrong dpi %u\n", dpi ); ok( pIsProcessDPIAware(), "not aware\n" ); context = pGetThreadDpiAwarenessContext(); - ok( context == (DPI_AWARENESS_CONTEXT)0x11, "wrong context %p\n", context ); - context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80000010 ); - ok( context == (DPI_AWARENESS_CONTEXT)0x11, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); + context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(0x80000010 | flags) ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); - ok( context == (DPI_AWARENESS_CONTEXT)0x11, "wrong context %p\n", context ); - context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80000011 ); - ok( context == (DPI_AWARENESS_CONTEXT)0x80000011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); + context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(0x80000011 | flags) ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x80000011 | flags), "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); - ok( context == (DPI_AWARENESS_CONTEXT)0x11, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); - ok( context == (DPI_AWARENESS_CONTEXT)0x80000011, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x80000011 | flags), "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( context ); - ok( context == (DPI_AWARENESS_CONTEXT)0x12, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x12), "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); - ok( context == (DPI_AWARENESS_CONTEXT)0x11, "wrong context %p\n", context ); + ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); for (i = 0; i < 0x100; i++) { awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ); @@ -3698,6 +3700,18 @@ static void test_dpi_context(void) ok( awareness == i, "%lx: wrong value %u\n", ~i, awareness ); ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%lx: not valid\n", ~i ); break; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: + if (pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i )) + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "%lx: wrong value %u\n", ~i, awareness ); + else + ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", ~i, awareness ); + break; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: + if (pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i )) + ok( awareness == DPI_AWARENESS_UNAWARE, "%lx: wrong value %u\n", ~i, awareness ); + else + ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", ~i, awareness ); + break; default: ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", ~i, awareness ); ok( !pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%lx: valid\n", ~i ); @@ -3805,10 +3819,11 @@ static void test_dpi_window(void) ok( dpi == (j == DPI_AWARENESS_UNAWARE ? USER_DEFAULT_SCREEN_DPI : real_dpi), "%lu/%lu: got %u / %u\n", i, j, dpi, real_dpi ); ret = SetParent( child, hwnd ); - ok( ret != 0, "SetParent failed err %u\n", GetLastError() ); + ok( ret != 0 || GetLastError() == ERROR_INVALID_STATE, + "SetParent failed err %u\n", GetLastError() ); context = pGetWindowDpiAwarenessContext( child ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); - ok( awareness == i, "%lu/%lu: wrong awareness %u\n", i, j, awareness ); + ok( awareness == (ret ? i : j), "%lu/%lu: wrong awareness %u\n", i, j, awareness ); dpi = pGetDpiForWindow( child ); ok( dpi == (i == DPI_AWARENESS_UNAWARE ? USER_DEFAULT_SCREEN_DPI : real_dpi), "%lu/%lu: got %u / %u\n", i, j, dpi, real_dpi ); diff --git a/include/windef.h b/include/windef.h index 8e8a08a..f9a570d 100644 --- a/include/windef.h +++ b/include/windef.h @@ -450,6 +450,7 @@ typedef enum DPI_AWARENESS #define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ((DPI_AWARENESS_CONTEXT)-2) #define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ((DPI_AWARENESS_CONTEXT)-3) #define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT)-4) +#define DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED ((DPI_AWARENESS_CONTEXT)-5) #ifdef __cplusplus }

1 0

Francois Gouget : testbot: Add LibvirtDomain::HasSnapshot().
by Alexandre Julliard Dec. 11, 2018

Dec. 11, 2018

Module: tools Branch: master Commit: 99ec8b34977592ecd86b7e0b97d3118cafefe18e URL: https://source.winehq.org/git/tools.git/?a=commit;h=99ec8b34977592ecd86b7e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 01:39:20 2018 +0100 testbot: Add LibvirtDomain::HasSnapshot(). It is needed by WineRunReconfig.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index bab5d7e..89b31e5 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -174,6 +174,14 @@ sub _GetSnapshot($$) return (_eval_err() || "Snapshot '$SnapshotName' not found", undef, undef); } +sub HasSnapshot($$) +{ + my ($self, $SnapshotName) = @_; + + my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); + return $ErrMessage ? 0 : 1; +} + sub GetSnapshotName($) { my ($self) = @_;

1 0

Michael Stefaniuc : shell32: Use SetRect() instead of open coding it.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: db850cd75817d1a7e41a6ad044d6866488e267ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=db850cd75817d1a7e41a6ad0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 7 21:57:15 2018 +0100 shell32: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 2d5a30a..637104c 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -314,9 +314,7 @@ static void update_layout(ExplorerBrowserImpl *This) if(navpane_width_actual) { - This->navpane.rc.left = This->navpane.rc.top = 0; - This->navpane.rc.right = navpane_width_actual; - This->navpane.rc.bottom = rc.bottom; + SetRect(&This->navpane.rc, 0, 0, navpane_width_actual, rc.bottom); if(!This->navpane.hwnd_splitter) initialize_navpane(This, This->hwnd_main, &This->navpane.rc); @@ -324,10 +322,8 @@ static void update_layout(ExplorerBrowserImpl *This) else ZeroMemory(&This->navpane.rc, sizeof(RECT)); - This->sv_rc.left = navpane_width_actual; - This->sv_rc.top = 0; - This->sv_rc.right = This->sv_rc.left + shellview_width_actual; - This->sv_rc.bottom = rc.bottom; + SetRect(&This->sv_rc, navpane_width_actual, 0, navpane_width_actual + shellview_width_actual, + rc.bottom); } static void size_panes(ExplorerBrowserImpl *This)

1 0