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

Waritnan Sookbuntherng : comctl32/status: Hide size grip when the parent window is maximized.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 1bb95af322543a644fb82004ae8a9450dd41d7ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb95af322543a644fb82004… Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Date: Mon Dec 10 09:52:10 2018 +0000 comctl32/status: Hide size grip when the parent window is maximized. Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 6 ++++-- dlls/comctl32/tests/status.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cb27ee8..3bf72fa 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 00db9f6..b7b5fb2 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -682,7 +682,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); /* maximized with right-to-left */ SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); @@ -705,7 +705,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); SetWindowLongA(g_hMainWnd, GWL_STYLE, style); DestroyWindow(hwndStatus);

1 0

Waritnan Sookbuntherng : comctl32/tests: Test status bar size grip behavior and bounds.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: d8428406c629672387bad5a00e8f779fc86bf7b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8428406c629672387bad5a0… Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Date: Mon Dec 10 09:52:09 2018 +0000 comctl32/tests: Test status bar size grip behavior and bounds. Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/status.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20..00db9f6 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -586,6 +586,131 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + LONG style; + RECT rc, rcClient; + POINT pt; + int width, r; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + style = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + width = GetSystemMetrics(SM_CXVSCROLL); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + /* check bounds when not maximized */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + expect(HTBOTTOMRIGHT, r); + + /* not maximized and right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + expect(HTBOTTOMLEFT, r); + + /* maximize with left-to-right */ + SetWindowLongA(g_hMainWnd, GWL_STYLE, style|WS_MAXIMIZE); + SetWindowLongA(hwndStatus, GWL_EXSTYLE, 0); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + /* maximized with right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + SetWindowLongA(g_hMainWnd, GWL_STYLE, style); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +745,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); }

1 0

Alexandre Julliard : dinput/tests: Try harder to avoid spurious keyboard input.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: d62ac319d2850acd81b14627476660340a32abd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d62ac319d2850acd81b14627… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 14:58:57 2018 +0100 dinput/tests: Try harder to avoid spurious keyboard input. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 8ee22fa..e8dfb4f 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -411,6 +411,8 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) if (!PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE)) { + U(in).ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &in, sizeof(in)); win_skip("failed to queue keyboard event\n"); break; } @@ -471,6 +473,7 @@ static void keyboard_tests(DWORD version) hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); + SetForegroundWindow( hwnd ); if (hwnd) {

1 0

Francois Gouget : shell32: Avoid an unneeded strlenW() call.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 76bc23d8c6c1b2857cb7a4d14c5931094a12a82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=76bc23d8c6c1b2857cb7a4d1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:48:14 2018 +0100 shell32: Avoid an unneeded strlenW() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index aca02d7..28f2e36 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -736,7 +736,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, extension++; if (GetProfileStringW(wExtensions, extension, wszEmpty, command, ARRAY_SIZE(command)) > 0) { - if (strlenW(command) != 0) + if (*command) { strcpyW(lpResult, command); tok = strchrW(lpResult, '^'); /* should be ^.extension? */

1 0

Francois Gouget : dbghelp: Make symt_get_best_at() static.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: edcff4046c5aa70c047c1a523a93a5cc5782fb44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edcff4046c5aa70c047c1a52… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:41:20 2018 +0100 dbghelp: Make symt_get_best_at() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c9585c5..96a1f87 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -851,7 +851,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* neede by symt_find_nearest */ -int symt_get_best_at(struct module* module, int idx_sorttab) +static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; int idx_sorttab_orig = idx_sorttab;

1 0

Alex Henrie : wineps.drv: Make constant 'glyph_def' static.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 2bd84420a09094b0b04d67f3130563bbbc1b07a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd84420a09094b0b04d67f3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:43:02 2018 -0700 wineps.drv: Make constant 'glyph_def' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/type42.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index c808ddb..451cceb 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -291,7 +291,7 @@ BOOL T42_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, char *buf; TYPE42 *t42; - const char glyph_def[] = + static const char glyph_def[] = "/%s findfont exch 1 index\n" "havetype42gdir\n" "{/GlyphDirectory get begin %d exch def end}\n"

1 0

Dmitry Timoshkov : gdi32: Trace full contents of DOCINFO in StartDoc.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 7933f7beefed39fb6fb15358ee64f804938e0fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7933f7beefed39fb6fb15358… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 15:16:21 2018 +0300 gdi32: Trace full contents of DOCINFO in StartDoc. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/printdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 3cfdc47..d2f4076 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -72,9 +72,9 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) INT ret; DC *dc = get_dc_ptr( hdc ); - TRACE("DocName = %s Output = %s Datatype = %s\n", + TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n", debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), - debugstr_w(doc->lpszDatatype)); + debugstr_w(doc->lpszDatatype), doc->fwType); if(!dc) return SP_ERROR;

1 0

Ken Thomases : configure: Fix building of the preloader on the Mac using Xcode 10 or later.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 0185ee5d99e8dca2c69d61ba0c0e00256beaf1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0185ee5d99e8dca2c69d61ba… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Dec 7 15:11:07 2018 -0600 configure: Fix building of the preloader on the Mac using Xcode 10 or later. The linker that comes with Xcode 10 requires that libSystem be linked for dynamic executables (those using dyld) unless -mmacosx-version-min=10.7 (or earlier) is used. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 30 ++++++++------ 2 files changed, 135 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0185ee5d99e8dca2c69d…

1 0

Francois Gouget : rpcrt4/tests: Make create_server_process() static.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 83d1f1a3be53de861c5bad331759b85591f7bc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83d1f1a3be53de861c5bad33… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:42:03 2018 +0100 rpcrt4/tests: Make create_server_process() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 587dc45..89cf514 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1973,7 +1973,7 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcStringFree\n"); } -HANDLE create_server_process(void) +static HANDLE create_server_process(void) { SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; HANDLE ready_event;

1 0

Dmitry Timoshkov : gdi32/tests: Add a simple test for printing to a PostScript device.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 9ad2d036aae7c5cd2663a02f1dff10709a827ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ad2d036aae7c5cd2663a02f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 15:16:17 2018 +0300 gdi32/tests: Add a simple test for printing to a PostScript device. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5eec74a..3179c97 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -2,7 +2,7 @@ * Unit tests for dc functions * * Copyright (c) 2005 Huw Davies - * Copyright (c) 2005 Dmitry Timoshkov + * Copyright (c) 2005,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1375,6 +1375,127 @@ static void test_printer_dc(void) DeleteObject( bmp ); } +static void print_something(HDC hdc) +{ + static const char psadobe[10] = "%!PS-Adobe"; + char buf[1024], *p; + char temp_path[MAX_PATH], file_name[MAX_PATH]; + DOCINFOA di; + DWORD ret; + HANDLE hfile; + + GetTempPathA(sizeof(temp_path), temp_path); + GetTempFileNameA(temp_path, "ps", 0, file_name); + + di.cbSize = sizeof(di); + di.lpszDocName = "Let's dance"; + di.lpszOutput = file_name; + di.lpszDatatype = NULL; + di.fwType = 0; + ret = StartDocA(hdc, &di); + ok(ret > 0, "StartDoc failed: %d\n", ret); + + strcpy(buf + 2, "\n% ===> before DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + strcpy(buf, "deadbeef"); + ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); +todo_wine + ok(ret == 1, "DOWNLOADHEADER failed\n"); +todo_wine + ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); + + strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + ret = EndDoc(hdc); + ok(ret == 1, "EndDoc failed\n"); + + hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + memset(buf, 0, sizeof(buf)); + ret = ReadFile(hfile, buf, sizeof(buf), &ret, NULL); + ok(ret, "ReadFile failed\n"); + CloseHandle(hfile); + + /* skip the HP PCL language selector */ + buf[sizeof(buf) - 1] = 0; + p = buf; + while (*p) + { + if (!(p[0] == 0x1b && p[1] == '%') && memcmp(p, "@PJL", 4) != 0) + break; + + p = strchr(p, '\n'); + if (!p) break; + + while (*p == '\r' || *p == '\n') p++; + } +todo_wine + ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); + + DeleteFileA(file_name); +} + +static void test_pscript_printer_dc(void) +{ + HDC hdc; + char buf[256]; + DWORD query, ret; + + hdc = create_printer_dc(100, FALSE); + + if (!hdc) return; + + if (!is_postscript_printer(hdc)) + { + skip("Default printer is not a PostScript device\n"); + DeleteDC( hdc ); + return; + } + + query = GETFACENAME; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(!ret, "GETFACENAME is supported\n"); + + query = DOWNLOADFACE; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADFACE is not supported\n"); + + query = OPENCHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "OPENCHANNEL is not supported\n"); + + query = DOWNLOADHEADER; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADHEADER is not supported\n"); + + query = CLOSECHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "CLOSECHANNEL is not supported\n"); + + query = POSTSCRIPT_PASSTHROUGH; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); + + ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); +todo_wine + ok(ret == 1, "GETFACENAME failed\n"); + trace("face name: %s\n", buf); + + print_something(hdc); + + DeleteDC(hdc); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1389,4 +1510,5 @@ START_TEST(dc) test_desktop_colorres(); test_gamma(); test_printer_dc(); + test_pscript_printer_dc(); }

1 0

Waritnan Sookbuntherng : comctl32/status: Checking size grip bounds in x-axis only.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 0f12fa1e432360431392ece417ae9ad02cb00647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f12fa1e432360431392ece4… Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Date: Mon Dec 10 09:52:10 2018 +0000 comctl32/status: Checking size grip bounds in x-axis only. Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 5 +---- dlls/comctl32/tests/status.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3bf72fa..6ea7d9e 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1009,10 +1009,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index b7b5fb2..c7d9989 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -615,17 +615,17 @@ static void test_sizegrip(void) /* check bounds when not maximized */ r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); expect(HTBOTTOMRIGHT, r); @@ -638,17 +638,17 @@ static void test_sizegrip(void) rc.right = pt.x; r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); expect(HTBOTTOMLEFT, r);

1 0

Francois Gouget : user32/tests: Make test_LoadImage_working_directory_run( ) static.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 1d52a6e1b6bdd7988754a27d2e25a6362db93e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d52a6e1b6bdd7988754a27d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:41:57 2018 +0100 user32/tests: Make test_LoadImage_working_directory_run() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 405856c..323db82 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,7 +1203,7 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } -void test_LoadImage_working_directory_run(char *path) +static void test_LoadImage_working_directory_run(char *path) { DWORD bytes_written; HANDLE handle;

1 0

Francois Gouget : testbot/web: Fix showing the local job / task completion time.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: tools Branch: master Commit: 8229ab69bd59a30083b03f89ef3c0b58f20b6233 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8229ab69bd59a30083b03f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:12 2018 +0100 testbot/web: Fix showing the local job / task completion time. The ShowDateTime() JavaScript call must be on its own line otherwise it's ignored. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 5 +++-- testbot/web/index.pl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 92f9d19..84b9e37 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -598,8 +598,9 @@ sub GenerateDataCell($$$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else diff --git a/testbot/web/index.pl b/testbot/web/index.pl index e06f515..b20c7bf 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -161,8 +161,9 @@ sub GenerateDataCell($$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else

1 0

Francois Gouget : testbot: The Job priority is really a niceness field.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: tools Branch: master Commit: 015ecebb427851e1d55e3cff1dcdeb4e86a72dae URL: https://source.winehq.org/git/tools.git/?a=commit;h=015ecebb427851e1d55e3cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:20 2018 +0100 testbot: The Job priority is really a niceness field. Change the display name so it is shown as a niceness to make it clearer that higher values indicate a lower priority. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b20c7bf..39fea3e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -73,7 +73,11 @@ sub GenerateHeaderCell($$$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "Priority") + { + print "<th><a class='title' title='Higher values indicate a lower priority'>Nice</a></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Ended'>Time</a></th>\n"; }

1 0

Francois Gouget : testbot/web: Show the mission in the arguments column for Wine VMs.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: tools Branch: master Commit: a4ac0056c300d74993071af9f7af1e3958f4bb3c URL: https://source.winehq.org/git/tools.git/?a=commit;h=a4ac0056c300d74993071af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:25 2018 +0100 testbot/web: Show the mission in the arguments column for Wine VMs. When handling a patch Wine VMs don't take arguments except for the mission which specifies what they should do. Also a Wine VM may run multiple tasks only differing in their mission. So this helps identify what each task does. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 25 ++++++++++++++++++++++++- testbot/web/WineTestBot.css | 12 ++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 84b9e37..3e4f94d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -32,6 +32,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::StepsTasks; use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -92,7 +93,11 @@ sub GenerateHeaderCell($$$) my ($self, $CollectionBlock, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "CmdLineArg") + { + print "<th>Arguments / <span class='MissionHeader'>Missions</span></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Execution ended'>Time</a></th>\n"; } @@ -589,6 +594,24 @@ sub GenerateDataCell($$$$$) $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } } + elsif ($PropertyName eq "CmdLineArg") + { + my $Args = $self->escapeHTML($StepTask->CmdLineArg); + if ($Args eq "" or $StepTask->VM->Type eq "wine") + { + $Args .= "<br>" if ($Args ne ""); + my ($ErrMessage, $Missions) = ParseMissionStatement($StepTask->Missions); + if (defined $ErrMessage) + { + $Args .= "<span class='Mission'>$ErrMessage</span>"; + } + else + { + $Args .= "<span class='Mission'>". $self->escapeHTML(GetTaskMissionDescription($Missions->[0], $StepTask->VM->Type)) ."</span>"; + } + } + print "<td>$Args</td>\n"; + } elsif ($PropertyName eq "Ended") { if (defined $StepTask->Ended) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index df683f8..1456036 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -290,6 +290,18 @@ h2 font-style: italic; } +.MissionHeader +{ + font-size: small; + font-style: italic; +} + +.Mission +{ + font-size: small; + font-style: italic; + color: navy; +} .Screenshot {

1 0

Francois Gouget : testbot: Sort VMs by name if they have the same role and sort order.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: tools Branch: master Commit: 1432ff9bcf7fa16032ad0b936064870cb8e6409a URL: https://source.winehq.org/git/tools.git/?a=commit;h=1432ff9bcf7fa16032ad0b9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:16 2018 +0100 testbot: Sort VMs by name if they have the same role and sort order. This makes it possible to add all locale VMs with the same SortOrder value and still have them displayed in a meaningful order. This also allows them to retain a meaningful order even as locales are added or removed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6a08bc1..6770547 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -748,12 +748,14 @@ sub SortKeysBySortOrder($$) foreach my $Key (@$Keys) { my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder]; + $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder, $Item->Name]; } my @SortedKeys = sort { my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - return @$soa[0] <=> @$sob[0] || @$soa[1] <=> @$sob[1]; + return @$soa[0] <=> @$sob[0] || + @$soa[1] <=> @$sob[1] || + @$soa[2] cmp @$sob[2]; } @$Keys; return \@SortedKeys; }

1 0

Francois Gouget : testbot/WineRunReconfig: Don' t fail if the idle snapshot does not exist.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: tools Branch: master Commit: fb463416b2296dac488af9aa5c8b9867dbb03493 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb463416b2296dac488af9a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:47:46 2018 +0100 testbot/WineRunReconfig: Don't fail if the idle snapshot does not exist. This simplifies recovery if an error occurred in a previous run that resulted in the snapshot being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c903ae3..11f92c8 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -458,23 +458,28 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq 'completed') { - Debug(Elapsed($Start), " Deleting the old ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) + my $Domain = $VM->GetDomain(); + my $IdleSnapshot = $VM->IdleSnapshot; + if ($Domain->HasSnapshot($IdleSnapshot)) { - # It's not clear if the snapshot is still usable. Rather than try to figure - # it out now, let the next task deal with it. - FatalError("Could not remove the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n", "retry"); + Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->RemoveSnapshot(); + if (defined $ErrMessage) + { + # It's not clear if the snapshot is still usable. Rather than try to + # figure it out now, let the next task deal with it. + FatalError("Could not remove the $IdleSnapshot snapshot: $ErrMessage\n", "retry"); + } } - Debug(Elapsed($Start), " Recreating the ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->CreateSnapshot(); + Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->CreateSnapshot(); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. - FatalError("Could not recreate the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); + FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } }

1 0

Alexandre Julliard : Wine release 4.0-rc1
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: website Branch: master Commit: 49cd06b06ffcad00eb6254f99c96f216aa735389 URL: https://source.winehq.org/git/website.git/?a=commit;h=49cd06b06ffcad00eb625… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 19:13:29 2018 +0100 Wine release 4.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018120701.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/news/en/2018120701.xml b/news/en/2018120701.xml new file mode 100644 index 0000000..3d89d3a --- /dev/null +++ b/news/en/2018120701.xml @@ -0,0 +1,20 @@ +<news> +<date>December 7, 2018</date> +<title>Wine 4.0-rc1 Released</title> +<body> +<p> The Wine development release 4.0-rc1 is now available.</p> +<p> This is the first release candidate for the upcoming Wine 4.0. It marks the beginning of the code freeze period. There have been many last minute changes, so please give this release a good testing to help us make 4.0 as good as possible.</p> +<p> <a href="{$root}/announce/4.0-rc1">What's new</a> in this release: +<ul> + <li>Preloader implemented on mac OS.</li> + <li>Mouse cursor support on Android.</li> + <li>Updates to the timezone database.</li> + <li>Vulkan support updated to the latest spec.</li> + <li>Stream I/O support in WebServices.</li> + <li>Better palette support in WindowsCodecs.</li> + <li>Synchronization objects support for kernel drivers.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc1.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>. +</p></body></news>

1 0

Jacek Caban : secur32: Check for supported protocols when loading gnutls.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 9dd0f8f4b7ee49c5ed6793efea7f60d920e112e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd0f8f4b7ee49c5ed6793ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 15:29:51 2018 +0100 secur32: Check for supported protocols when loading gnutls. We mostly need to know if TLS1.3 is supported before attempting to handle it. It's just in gnutls backend now, so it will not be actually enabled yet. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0a49421..a962c67 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <stdio.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> #include <gnutls/crypto.h> @@ -150,6 +151,7 @@ static const struct { DWORD enable_flag; const char *gnutls_flag; } protocol_priority_flags[] = { + {SP_PROT_TLS1_3_CLIENT, "VERS-TLS1.3"}, {SP_PROT_TLS1_2_CLIENT, "VERS-TLS1.2"}, {SP_PROT_TLS1_1_CLIENT, "VERS-TLS1.1"}, {SP_PROT_TLS1_0_CLIENT, "VERS-TLS1.0"}, @@ -157,10 +159,41 @@ static const struct { /* {SP_PROT_SSL2_CLIENT} is not supported by GnuTLS */ }; +static DWORD supported_protocols; + +static void check_supported_protocols(void) +{ + gnutls_session_t session; + char priority[64]; + unsigned i; + int err; + + err = pgnutls_init(&session, GNUTLS_CLIENT); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + return; + } + + for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) + { + sprintf(priority, "NORMAL:-%s", protocol_priority_flags[i].gnutls_flag); + err = pgnutls_priority_set_direct(session, priority, NULL); + if (err == GNUTLS_E_SUCCESS) + { + TRACE("%s is supported\n", protocol_priority_flags[i].gnutls_flag); + supported_protocols |= protocol_priority_flags[i].enable_flag; + } + else + TRACE("%s is not supported\n", protocol_priority_flags[i].gnutls_flag); + } + + pgnutls_deinit(session); +} + DWORD schan_imp_enabled_protocols(void) { - /* NOTE: No support for SSL 2.0 */ - return SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT; + return supported_protocols; } BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) @@ -593,6 +626,7 @@ BOOL schan_imp_init(void) pgnutls_global_set_log_function(schan_gnutls_log); } + check_supported_protocols(); return TRUE; fail:

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the PNG decoder.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: b4c3a9c089fa55e50fde7ba6700075c8eb1f9479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c3a9c089fa55e50fde7ba6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:06:14 2018 +0300 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the PNG decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 786d836..7050c95 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -842,10 +842,14 @@ static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface,

1 0

Akihiro Sagawa : tzres: Add time zone name resource DLL.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 1da7eebf84af26933404314e49d75f2f536b81a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1da7eebf84af26933404314e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 7 20:42:44 2018 +0900 tzres: Add time zone name resource DLL. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 221 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + 5 files changed, 227 insertions(+) diff --git a/configure b/configure index 9a9a5e6..03fe309 100755 --- a/configure +++ b/configure @@ -1545,6 +1545,7 @@ enable_tdh enable_tdi_sys enable_traffic enable_twain_32 +enable_tzres enable_ucrtbase enable_uiautomationcore enable_uiribbon @@ -19872,6 +19873,7 @@ wine_fn_config_makefile dlls/twain.dll16 enable_win16 wine_fn_config_makefile dlls/twain_32 enable_twain_32 wine_fn_config_makefile dlls/twain_32/tests enable_tests wine_fn_config_makefile dlls/typelib.dll16 enable_win16 +wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase wine_fn_config_makefile dlls/ucrtbase/tests enable_tests wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore diff --git a/configure.ac b/configure.ac index aa1291d..08fbc3c 100644 --- a/configure.ac +++ b/configure.ac @@ -3711,6 +3711,7 @@ WINE_CONFIG_MAKEFILE(dlls/twain.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/twain_32) WINE_CONFIG_MAKEFILE(dlls/twain_32/tests) WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore) diff --git a/dlls/tzres/Makefile.in b/dlls/tzres/Makefile.in new file mode 100644 index 0000000..86e5bcd --- /dev/null +++ b/dlls/tzres/Makefile.in @@ -0,0 +1,2 @@ +MODULE = tzres.dll +RC_SRCS = tzres.rc diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc new file mode 100644 index 0000000..c2f208f --- /dev/null +++ b/dlls/tzres/tzres.rc @@ -0,0 +1,221 @@ +/* + * Time zone resources + * + * Copyright 2018 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +STRINGTABLE +{ + 39616 "Afghanistan Standard Time" + 39617 "Afghanistan Daylight Time" + 50192 "Alaskan Standard Time" + 50193 "Alaskan Daylight Time" + 41968 "Arab Standard Time" + 41969 "Arab Daylight Time" + 42704 "Arabian Standard Time" + 42705 "Arabian Daylight Time" + 8768 "Arabic Standard Time" + 8769 "Arabic Daylight Time" + 19584 "Argentina Standard Time" + 19585 "Argentina Daylight Time" + 34224 "Atlantic Standard Time" + 34225 "Atlantic Daylight Time" + 47024 "AUS Central Standard Time" + 47025 "AUS Central Daylight Time" + 30368 "AUS Eastern Standard Time" + 30369 "AUS Eastern Daylight Time" + 11312 "Azerbaijan Standard Time" + 11313 "Azerbaijan Daylight Time" + 18832 "Azores Standard Time" + 18833 "Azores Daylight Time" + 50896 "Bahia Standard Time" + 50897 "Bahia Daylight Time" + 48720 "Bangladesh Standard Time" + 48721 "Bangladesh Daylight Time" + 56576 "Belarus Standard Time" + 56577 "Belarus Daylight Time" + 25712 "Canada Central Standard Time" + 25713 "Canada Central Daylight Time" + 2000 "Cape Verde Standard Time" + 2001 "Cape Verde Daylight Time" + 29872 "Caucasus Standard Time" + 29873 "Caucasus Daylight Time" + 38928 "Cen. Australia Standard Time" + 38929 "Cen. Australia Daylight Time" + 36656 "Central America Standard Time" + 36657 "Central America Daylight Time" + 8176 "Central Asia Standard Time" + 8177 "Central Asia Daylight Time" + 56336 "Central Brazilian Standard Time" + 56337 "Central Brazilian Daylight Time" + 4896 "Central Europe Standard Time" + 4897 "Central Europe Daylight Time" + 2976 "Central European Standard Time" + 2977 "Central European Daylight Time" + 64416 "Central Pacific Standard Time" + 64417 "Central Pacific Daylight Time" + 17456 "Central Standard Time" + 17457 "Central Daylight Time" + 32800 "Central Standard Time (Mexico)" + 32801 "Central Daylight Time (Mexico)" + 160 "China Standard Time" + 161 "China Daylight Time" + 50384 "Dateline Standard Time" + 50385 "Dateline Daylight Time" + 62720 "E. Africa Standard Time" + 62721 "E. Africa Daylight Time" + 65264 "E. Australia Standard Time" + 65265 "E. Australia Daylight Time" + 64096 "E. South America Standard Time" + 64097 "E. South America Daylight Time" + 58592 "Easter Island Standard Time" + 58593 "Easter Island Daylight Time" + 30800 "Eastern Standard Time" + 30801 "Eastern Daylight Time" + 59424 "Egypt Standard Time" + 59425 "Egypt Daylight Time" + 45952 "Ekaterinburg Standard Time" + 45953 "Ekaterinburg Daylight Time" + 25680 "Fiji Standard Time" + 25681 "Fiji Daylight Time" + 63264 "FLE Standard Time" + 63265 "FLE Daylight Time" + 416 "Georgian Standard Time" + 417 "Georgian Daylight Time" + 7408 "GMT Standard Time" + 7409 "GMT Daylight Time" + 58096 "Greenland Standard Time" + 58097 "Greenland Daylight Time" + 47168 "Greenwich Standard Time" + 47169 "Greenwich Daylight Time" + 24192 "GTB Standard Time" + 24193 "GTB Daylight Time" + 53376 "Hawaiian Standard Time" + 53377 "Hawaiian Daylight Time" + 22400 "India Standard Time" + 22401 "India Daylight Time" + 5568 "Iran Standard Time" + 5569 "Iran Daylight Time" + 47968 "Israel Standard Time" + 47969 "Israel Daylight Time" + 17232 "Jordan Standard Time" + 17233 "Jordan Daylight Time" + 14720 "Kaliningrad Standard Time" + 14721 "Kaliningrad Daylight Time" + 62048 "Korea Standard Time" + 62049 "Korea Daylight Time" + 50768 "Libya Standard Time" + 50769 "Libya Daylight Time" + 16768 "Line Islands Standard Time" + 16769 "Line Islands Daylight Time" + 8832 "Magadan Standard Time" + 8833 "Magadan Daylight Time" + 60896 "Mauritius Standard Time" + 60897 "Mauritius Daylight Time" + 15968 "Middle East Standard Time" + 15969 "Middle East Daylight Time" + 27968 "Montevideo Standard Time" + 27969 "Montevideo Daylight Time" + 2992 "Morocco Standard Time" + 2993 "Morocco Daylight Time" + 34352 "Mountain Standard Time" + 34353 "Mountain Daylight Time" + 7248 "Mountain Standard Time (Mexico)" + 7249 "Mountain Daylight Time (Mexico)" + 21104 "Myanmar Standard Time" + 21105 "Myanmar Daylight Time" + 30704 "N. Central Asia Standard Time" + 30705 "N. Central Asia Daylight Time" + 6208 "Namibia Standard Time" + 6209 "Namibia Daylight Time" + 1216 "Nepal Standard Time" + 1217 "Nepal Daylight Time" + 54896 "New Zealand Standard Time" + 54897 "New Zealand Daylight Time" + 9504 "Newfoundland Standard Time" + 9505 "Newfoundland Daylight Time" + 19056 "North Asia East Standard Time" + 19057 "North Asia East Daylight Time" + 304 "North Asia Standard Time" + 305 "North Asia Daylight Time" + 65008 "Pacific SA Standard Time" + 65009 "Pacific SA Daylight Time" + 11232 "Pacific Standard Time" + 11233 "Pacific Daylight Time" + 15584 "Pacific Standard Time (Mexico)" + 15585 "Pacific Daylight Time (Mexico)" + 28752 "Pakistan Standard Time" + 28753 "Pakistan Daylight Time" + 50224 "Paraguay Standard Time" + 50225 "Paraguay Daylight Time" + 45104 "Romance Standard Time" + 45105 "Romance Daylight Time" + 44560 "Russian Standard Time" + 44561 "Russian Daylight Time" + 40656 "SA Eastern Standard Time" + 40657 "SA Eastern Daylight Time" + 49424 "SA Pacific Standard Time" + 49425 "SA Pacific Daylight Time" + 57120 "SA Western Standard Time" + 57121 "SA Western Daylight Time" + 14592 "Samoa Standard Time" + 14593 "Samoa Daylight Time" + 53728 "SE Asia Standard Time" + 53729 "SE Asia Daylight Time" + 61840 "Singapore Standard Time" + 61841 "Singapore Daylight Time" + 38896 "South Africa Standard Time" + 38897 "South Africa Daylight Time" + 39408 "Sri Lanka Standard Time" + 39409 "Sri Lanka Daylight Time" + 46576 "Syria Standard Time" + 46577 "Syria Daylight Time" + 26432 "Taipei Standard Time" + 26433 "Taipei Daylight Time" + 36016 "Tasmania Standard Time" + 36017 "Tasmania Daylight Time" + 16240 "Tokyo Standard Time" + 16241 "Tokyo Daylight Time" + 7216 "Tonga Standard Time" + 7217 "Tonga Daylight Time" + 24848 "Turkey Standard Time" + 24849 "Turkey Daylight Time" + 47200 "Ulaanbaatar Standard Time" + 47201 "Ulaanbaatar Daylight Time" + 34928 "US Eastern Standard Time" + 34929 "US Eastern Daylight Time" + 37472 "US Mountain Standard Time" + 37473 "US Mountain Daylight Time" + 22000 "Coordinated Universal Time" + 22001 "Coordinated Universal Time" + 51472 "Venezuela Standard Time" + 51473 "Venezuela Daylight Time" + 61376 "Vladivostok Standard Time" + 61377 "Vladivostok Daylight Time" + 65376 "W. Australia Standard Time" + 65377 "W. Australia Daylight Time" + 64976 "W. Central Africa Standard Time" + 64977 "W. Central Africa Daylight Time" + 27696 "W. Europe Standard Time" + 27697 "W. Europe Daylight Time" + 49664 "West Asia Standard Time" + 49665 "West Asia Daylight Time" + 10224 "West Pacific Standard Time" + 10225 "West Pacific Daylight Time" + 40576 "Yakutsk Standard Time" + 40577 "Yakutsk Daylight Time" +} diff --git a/dlls/tzres/tzres.spec b/dlls/tzres/tzres.spec new file mode 100644 index 0000000..1126204 --- /dev/null +++ b/dlls/tzres/tzres.spec @@ -0,0 +1 @@ +# nothing exported

1 0

Akihiro Sagawa : wine.inf: Add MUI time zone name settings.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 67574e4440ac4d9786e52a669b40197d2a4cb505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67574e4440ac4d9786e52a66… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 7 20:42:46 2018 +0900 wine.inf: Add MUI time zone name settings. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 8 +- loader/wine.inf.in | 198 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67574e4440ac4d9786e5…

1 0

Michael Stefaniuc : d3dx9/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 90a391135570d4d2b20e6a84483e4573b3c97549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a391135570d4d2b20e6a84… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 5 18:57:41 2018 +0100 d3dx9/tests: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 91e458b..fa874a5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -621,7 +621,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); } - SetRect(&rect, 0, 0, 0, 0); + SetRectEmpty(&rect); height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_LEFT | DT_CALCRECT, 0xffffffff); todo_wine ok(height == tests[i].font_height, "Got unexpected height %u.\n", height);

1 0

Dmitry Timoshkov : windowscodecs/tests: Add some tests for IWICPalette:: InitializeFromBitmap.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 2407a7477fde300f9b9a6cb3f05366515e7a705d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2407a7477fde300f9b9a6cb3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:06:22 2018 +0300 windowscodecs/tests: Add some tests for IWICPalette::InitializeFromBitmap. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/palette.c | 158 +++++++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 27bf7c8..3b9f685 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -1,6 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,9 +27,10 @@ #include "wincodec.h" #include "wine/test.h" +static IWICImagingFactory *factory; + static void test_custom_palette(void) { - IWICImagingFactory *factory; IWICPalette *palette, *palette2; HRESULT hr; WICBitmapPaletteType type=0xffffffff; @@ -38,11 +39,6 @@ static void test_custom_palette(void) WICColor colors[4]; BOOL boolresult; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; - hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); if (SUCCEEDED(hr)) @@ -207,8 +203,6 @@ static void test_custom_palette(void) IWICPalette_Release(palette2); IWICPalette_Release(palette); } - - IWICImagingFactory_Release(factory); } static void generate_gray16_palette(DWORD *entries, UINT count) @@ -451,7 +445,6 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 }, 1 } }; - IWICImagingFactory *factory; IWICPalette *palette; HRESULT hr; WICBitmapPaletteType type; @@ -459,10 +452,6 @@ static void test_predefined_palette(void) BOOL bret; WICColor color[256]; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); - ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); - hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeCustom, FALSE); @@ -538,16 +527,155 @@ static void test_predefined_palette(void) IWICPalette_Release(palette); } +} - IWICImagingFactory_Release(factory); +static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) +{ + BYTE *src; + UINT i, j, scale; + + *width = 256; + *height = 256; + *stride = (*width * 3 + 3) & ~3; + trace("width %d, height %d, stride %d\n", *width, *height, *stride); + + src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + + scale = 256 / *width; + if (!scale) scale = 1; + + for (i = 0; i < *height; i++) + { + for (j = 0; j < *width; j++) + { + src[i * *stride + j*3 + 0] = scale * i; + src[i * *stride + j*3 + 1] = scale * (255 - (i+j)/2); + src[i * *stride + j*3 + 2] = scale * j; + } + } + + return src; +} + +static void test_palette_from_bitmap(void) +{ + HRESULT hr; + BYTE *data; + IWICBitmap *bitmap; + IWICPalette *palette; + WICBitmapPaletteType type; + UINT width, height, stride, count, ret; + WICColor color[257]; + + data = init_bitmap(&width, &height, &stride); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, width, height, &GUID_WICPixelFormat24bppRGB, + stride, stride * height, data, &bitmap); + ok(hr == S_OK, "CreateBitmapFromMemory error %#x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 0, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 1, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 257, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, NULL, 16, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, FALSE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); +} + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, TRUE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); +} + + /* without trasparent color */ + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, FALSE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + memset(color, 0, sizeof(color)); + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[count - 1] != 0, "expected !0, got %08x\n", color[count - 1]); +} + + /* with trasparent color */ + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, TRUE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + memset(color, 0xff, sizeof(color)); + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[count - 1] == 0, "expected 0, got %08x\n", color[count - 1]); +} + + IWICPalette_Release(palette); + IWICBitmap_Release(bitmap); + + HeapFree(GetProcessHeap(), 0, data); } START_TEST(palette) { + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + test_custom_palette(); test_predefined_palette(); + test_palette_from_bitmap(); + + IWICImagingFactory_Release(factory); CoUninitialize(); }

1 0

Jacek Caban : secur32: Use VERS-ALL priority string only on recent gnutls versions.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 179ee89e654a22eb4c49b238b3a7a209a10e921d URL: https://source.winehq.org/git/wine.git/?a=commit;h=179ee89e654a22eb4c49b238… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 15:30:16 2018 +0100 secur32: Use VERS-ALL priority string only on recent gnutls versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index a962c67..cb90d1c 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -199,7 +199,8 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[128] = "NORMAL:%LATEST_RECORD_VERSION:-VERS-ALL", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; + BOOL using_vers_all = FALSE, disabled; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -210,10 +211,26 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre } p = priority + strlen(priority); - for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { - if (!(cred->enabled_protocols & protocol_priority_flags[i].enable_flag)) continue; + + /* VERS-ALL is nice to use for forward compatibility. It was introduced before support for TLS1.3, + * so if TLS1.3 is supported, we may safely use it. Otherwise explicitly disable all known + * disabled protocols. */ + if (supported_protocols & SP_PROT_TLS1_3_CLIENT) + { + strcpy(p, ":-VERS-ALL"); + p += strlen(p); + using_vers_all = TRUE; + } + + for (i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) + { + if (!(supported_protocols & protocol_priority_flags[i].enable_flag)) continue; + + disabled = !(cred->enabled_protocols & protocol_priority_flags[i].enable_flag); + if (using_vers_all && disabled) continue; + *p++ = ':'; - *p++ = '+'; + *p++ = disabled ? '-' : '+'; strcpy(p, protocol_priority_flags[i].gnutls_flag); p += strlen(p); }

1 0

Tag wine-4.0-rc1 : Alexandre Julliard : Release 4.0-rc1
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: refs/tags/wine-4.0-rc1 Tag: bce54601df0255743bca217b4872aec7c0a83d68 URL: https://source.winehq.org/git/wine.git/?a=tag;h=bce54601df0255743bca217b487… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 19:11:43 2018 +0100 Release 4.0-rc1

1 0

Alexandre Julliard : Release 4.0-rc1.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: ae5e029d2227b3a8024f597591f76fe0f37d52e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5e029d2227b3a8024f5975… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 19:11:43 2018 +0100 Release 4.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 934 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 491 insertions(+), 465 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae5e029d2227b3a8024f…

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the JPEG encoder.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: b9bb512018a6147741839076182b887b4494db40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9bb512018a6147741839076… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:06:16 2018 +0300 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the JPEG encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index a060d56..54f77a7 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -412,10 +412,14 @@ static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI JpegDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI JpegDecoder_GetPreview(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the TIFF decoder.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 849807c973b4b381b9fdbd5844180e1ad6aa7186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849807c973b4b381b9fdbd58… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:06:07 2018 +0300 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 95a39cd..93af559 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -694,8 +694,12 @@ static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, static HRESULT WINAPI TiffDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + *ppIMetadataQueryReader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetPreview(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: a4a5c38089afad9b3f53c7cd06d034c87e53a16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a5c38089afad9b3f53c7cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:02:58 2018 +0300 windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 7b0fbf8..9a580c6 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1736,6 +1736,8 @@ static BYTE const channel_mask_16bit2[] = { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, static BYTE const channel_mask_16bit3[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 }; static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; +static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 }; static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 }; static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c }; @@ -1752,6 +1754,8 @@ static BYTE const * const channel_masks_8bit[] = { channel_mask_8bit, static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; +static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; + static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 }; @@ -1946,6 +1950,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 1 }, + { &GUID_WICPixelFormat32bppGrayFloat, + "The Wine Project", + "32bpp GrayFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 1, /* channel count */ + channel_masks_32bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project", "48bpp RGB",

1 0

Dmitry Timoshkov : crypt32: If there is no optional parameters set rgProvParam to NULL in CRYPT_KEY_PROV_INFO.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: ea77ba04f398fdd943d583180d0cb0496b9f8ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea77ba04f398fdd943d58318… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 16:01:11 2018 +0300 crypt32: If there is no optional parameters set rgProvParam to NULL in CRYPT_KEY_PROV_INFO. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e591c4d..2d4ce8c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -533,14 +533,19 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); data += provNameLen; - info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; - data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); - - for (i = 0; i < info->cProvParam; i++) + if (info->cProvParam) { - info->rgProvParam[i].pbData = data; - data += info->rgProvParam[i].cbData; + info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; + data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); + + for (i = 0; i < info->cProvParam; i++) + { + info->rgProvParam[i].pbData = data; + data += info->rgProvParam[i].cbData; + } } + else + info->rgProvParam = NULL; } BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,

1 0

Akihiro Sagawa : ntdll: Use an MUI time zone name if available.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 434bc1baf5da24b744753d1b230dba14e4739731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=434bc1baf5da24b744753d1b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 7 00:33:24 2018 +0900 ntdll: Use an MUI time zone name if available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index b0eefb8..a4762fa 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -681,6 +681,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* { static const WCHAR stdW[] = { 'S','t','d',0 }; static const WCHAR dltW[] = { 'D','l','t',0 }; + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; + static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; static const WCHAR tziW[] = { 'T','Z','I',0 }; RTL_DYNAMIC_TIME_ZONE_INFORMATION reg_tzi; HANDLE hSubkey, hSubkeyDynamicDST; @@ -715,8 +717,10 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* continue; \ } - get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)); - get_value(hSubkey, dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName)); + if (!reg_query_value(hSubkey, mui_stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName))) + get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)); + if (!reg_query_value(hSubkey, mui_dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName))) + get_value(hSubkey, dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName)); memcpy(reg_tzi.TimeZoneKeyName, nameW.Buffer, nameW.Length); reg_tzi.TimeZoneKeyName[nameW.Length/sizeof(WCHAR)] = 0;

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in PNG encoder.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 38b222c6620d01c134ac62fb3018863ae0cb0c35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38b222c6620d01c134ac62fb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:06:15 2018 +0300 windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in PNG encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e5a59..786d836 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1979,11 +1979,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GU return S_OK; } -static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICPngEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in BMP encoder.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: e246dd46eccf68ef74ef14c95cb4430d5f288bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e246dd46eccf68ef74ef14c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:06:03 2018 +0300 windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in BMP encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 8e2bbe8..3b77517 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -510,11 +510,22 @@ static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICBmpEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI BmpEncoder_SetColorContexts(IWICBitmapEncoder *iface,

1 0

Jacek Caban : include: Add DTLS defines.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 2d61c5f379181246d8a0aefdd164aed51b37b227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d61c5f379181246d8a0aefd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 17:38:17 2018 +0100 include: Add DTLS defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/schannel.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/schannel.h b/include/schannel.h index 6dac2e9..b48a719 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -107,6 +107,12 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_ALL 0xffffffff #define SP_PROT_UNI_CLIENT 0x80000000 #define SP_PROT_UNI_SERVER 0x40000000 +#define SP_PROT_DTLS1_2_SERVER 0x00040000 +#define SP_PROT_DTLS1_2_CLIENT 0x00080000 +#define SP_PROT_DTLS_SERVER 0x00010000 +#define SP_PROT_DTLS_CLIENT 0x00020000 +#define SP_PROT_DTLS1_0_SERVER SP_PROT_DTLS_SERVER +#define SP_PROT_DTLS1_0_CLIENT SP_PROT_DTLS_CLIENT #define SP_PROT_TLS1_3_SERVER 0x00001000 #define SP_PROT_TLS1_3_CLIENT 0x00002000 #define SP_PROT_TLS1_2_CLIENT 0x00000800 @@ -126,6 +132,9 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_NONE 0x00000000 #define SP_PROT_UNI (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER) +#define SP_PROT_DTLS (SP_PROT_DTLS_SERVER | SP_PROT_DTLS_CLIENT) +#define SP_PROT_DTLS1_0 (SP_PROT_DTLS1_0_SERVER | SP_PROT_DTLS1_0_CLIENT) +#define SP_PROT_DTLS1_2 (SP_PROT_DTLS1_2_SERVER | SP_PROT_DTLS1_2_CLIENT) #define SP_PROT_TLS1_3 (SP_PROT_TLS1_3_CLIENT | SP_PROT_TLS1_3_SERVER) #define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) #define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) @@ -153,12 +162,22 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_TLS1_1PLUS_SERVER ( SP_PROT_TLS1_1_SERVER \ | SP_PROT_TLS1_2_SERVER \ | SP_PROT_TLS1_3_SERVER ) +#define SP_PROT_DTLS1_X_SERVER ( SP_PROT_DTLS1_0_SERVER \ + | SP_PROT_DTLS1_2_SERVER ) +#define SP_PROT_DTLS1_X_CLIENT ( SP_PROT_DTLS1_0_CLIENT \ + | SP_PROT_DTLS1_2_CLIENT ) +#define SP_PROT_DTLS1_X ( SP_PROT_DTLS1_X_SERVER \ + | SP_PROT_DTLS1_X_CLIENT ) #define SP_PROT_CLIENTS (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \ | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT) #define SP_PROT_SERVERS (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \ | SP_PROT_TLS1_SERVER | SP_PROT_UNI_SERVER) -#define SP_PROT_X_CLIENTS (SP_PROT_CLIENTS | SP_PROT_TLS1_X_CLIENT) -#define SP_PROT_X_SERVERS (SP_PROT_SERVERS | SP_PROT_TLS1_X_SERVER) +#define SP_PROT_X_CLIENTS ( SP_PROT_CLIENTS \ + | SP_PROT_TLS1_X_CLIENT \ + | SP_PROT_DTLS1_X_CLIENT) +#define SP_PROT_X_SERVERS ( SP_PROT_SERVERS \ + | SP_PROT_TLS1_X_SERVER \ + | SP_PROT_DTLS1_X_SERVER) #define SP_PROT_SSL3TLS1 (SP_PROT_SSL3 | SP_PROT_TLS1) #define SP_PROT_SSL3TLS1_X (SP_PROT_SSL3 | SP_PROT_TLS1_X)

1 0

Denil Verghese : libwine: Fix missing semi-colon.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 86bab890dd2de7ab820cfd0aa0c9fe8c1b37aec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bab890dd2de7ab820cfd0a… Author: Denil Verghese <denilverghese(a)gmail.com> Date: Thu Dec 6 15:19:33 2018 +0530 libwine: Fix missing semi-colon. Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index d5ce07a..29e9091 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -126,7 +126,7 @@ __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void * __asm call [ecx]; __asm mov esp, esi; __asm pop esi; - __asm pop ebp + __asm pop ebp; __asm ret; } #elif defined(__x86_64__) && defined(__GNUC__)

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoderInfo:: GetFileExtensions.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 7533f251e32f6f6040d269cf7928af4dd6c11247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7533f251e32f6f6040d269cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:05:59 2018 +0300 windowscodecs: Implement IWICBitmapEncoderInfo::GetFileExtensions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 86707e1..d0c2c69 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -898,8 +898,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetMimeTypes(IWICBitmapEncoderInfo *ifac static HRESULT WINAPI BitmapEncoderInfo_GetFileExtensions(IWICBitmapEncoderInfo *iface, UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, fileextensions_valuename, + cchFileExtensions, wzFileExtensions, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_DoesSupportAnimation(IWICBitmapEncoderInfo *iface,

1 0

Jacek Caban : secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: 5cc5b102c1b0a66aa63b66f43f2da9a1a9d15ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc5b102c1b0a66aa63b66f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 18:09:18 2018 +0100 secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46161 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 05e922d..0a49421 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -166,7 +166,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION:-VERS-ALL", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -178,8 +178,9 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre p = priority + strlen(priority); for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { + if (!(cred->enabled_protocols & protocol_priority_flags[i].enable_flag)) continue; *p++ = ':'; - *p++ = (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) ? '+' : '-'; + *p++ = '+'; strcpy(p, protocol_priority_flags[i].gnutls_flag); p += strlen(p); }

1 0

Dmitry Timoshkov : windowscodecs: Add support for palette image formats to BMP encoder.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: ee6dd81e922145ca7b70cb1de01a8795119b824b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee6dd81e922145ca7b70cb1d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:05:55 2018 +0300 windowscodecs: Add support for palette image formats to BMP encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 47 +++++++++++++++++++++++++++++------- dlls/windowscodecs/info.c | 8 +++++- dlls/windowscodecs/regsvr.c | 4 +++ dlls/windowscodecs/tests/converter.c | 11 ++++++--- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index b8783a4..8e2bbe8 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct bmp_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; + UINT colors; /* palette size */ DWORD compression; DWORD redmask; DWORD greenmask; @@ -45,13 +47,18 @@ struct bmp_pixelformat { }; static const struct bmp_pixelformat formats[] = { - {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, - {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, + {&GUID_WICPixelFormat24bppBGR, 24, 0, BI_RGB}, + {&GUID_WICPixelFormatBlackWhite, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat1bppIndexed, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat2bppIndexed, 2, 4, BI_RGB}, + {&GUID_WICPixelFormat4bppIndexed, 4, 16, BI_RGB}, + {&GUID_WICPixelFormat8bppIndexed, 8, 256, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, 0, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, 0, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 0, BI_RGB}, #if 0 /* Windows doesn't seem to support this one. */ - {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, + {&GUID_WICPixelFormat32bppBGRA, 32, 0, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, #endif {NULL} }; @@ -182,9 +189,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; + if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormatBlackWhite)) + *pPixelFormat = GUID_WICPixelFormat1bppIndexed; + else if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) + *pPixelFormat = GUID_WICPixelFormat4bppIndexed; + for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } @@ -207,6 +219,7 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, IWICPalette *palette) { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; TRACE("(%p,%p)\n", iface, palette); @@ -215,7 +228,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; - return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + if (hr == S_OK) + { + UINT i; + for (i = 0; i < This->colors; i++) + This->palette[i] |= 0xff000000; /* BMP palette has no alpha */ + } + return hr; } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -330,8 +350,8 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5SizeImage = This->stride*This->height; bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; - bih.bV5ClrUsed = 0; - bih.bV5ClrImportant = 0; + bih.bV5ClrUsed = (This->format->bpp <= 8) ? This->colors : 0; + bih.bV5ClrImportant = bih.bV5ClrUsed; if (This->format->compression == BI_BITFIELDS) { @@ -348,6 +368,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; + bfh.bfOffBits += bih.bV5ClrUsed * sizeof(WICColor); pos.QuadPart = 0; hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); @@ -361,6 +382,14 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) if (FAILED(hr)) return hr; if (byteswritten != info_size) return E_FAIL; + /* write the palette */ + if (This->format->colors) + { + hr = IStream_Write(This->stream, This->palette, This->colors * sizeof(WICColor), &byteswritten); + if (FAILED(hr)) return hr; + if (byteswritten != This->colors * sizeof(WICColor)) return E_FAIL; + } + hr = IStream_Write(This->stream, This->bits, bih.bV5SizeImage, &byteswritten); if (FAILED(hr)) return hr; if (byteswritten != bih.bV5SizeImage) return E_FAIL; diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107..86707e1 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2461,6 +2461,12 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn return hr; } +static BOOL is_1bpp_format(const WICPixelFormatGUID *format) +{ + return IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite) || + IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed); +} + HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst) { HRESULT res; @@ -2476,7 +2482,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma res = IWICBitmapSource_GetPixelFormat(pISrc, &srcFormat); if (FAILED(res)) return res; - if (IsEqualGUID(&srcFormat, dstFormat)) + if (IsEqualGUID(&srcFormat, dstFormat) || (is_1bpp_format(&srcFormat) && is_1bpp_format(dstFormat))) { IWICBitmapSource_AddRef(pISrc); *ppIDst = pISrc; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index ca02ff9..7b0fbf8 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1347,6 +1347,10 @@ static GUID const * const bmp_encode_formats[] = { &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL }; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 44a2c08..8e0fb77 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -814,6 +816,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -824,6 +828,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -834,6 +840,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) { + ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -1492,8 +1500,6 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_BlackWhite, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, @@ -1504,7 +1510,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); -} test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR");

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapEncoder:: GetEncoderInfo in JPEG encoder.
by Alexandre Julliard Dec. 6, 2018

Dec. 6, 2018

Module: wine Branch: master Commit: c2451240dc273b0571173e7363acc5598a8c1c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2451240dc273b0571173e73… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:06:08 2018 +0300 windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 451d725..a060d56 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1392,11 +1392,22 @@ static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, G return S_OK; } -static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICJpegEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface,

1 0