wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Michael Stefaniuc : d3dx9/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

Akihiro Sagawa : wine.inf: Add MUI time zone name settings.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

Akihiro Sagawa : tzres: Add time zone name resource DLL.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

Jacek Caban : secur32: Use VERS-ALL priority string only on recent gnutls versions.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

Jacek Caban : secur32: Check for supported protocols when loading gnutls.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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 : crypt32: If there is no optional parameters set rgProvParam to NULL in CRYPT_KEY_PROV_INFO.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

Dmitry Timoshkov : windowscodecs/tests: Add some tests for IWICPalette:: InitializeFromBitmap.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the JPEG encoder.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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 PNG decoder.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the TIFF decoder.
by Alexandre Julliard 07 Dec '18

07 Dec '18

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

← Newer
1
...
16
17
18
19
20
21
22
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2018