February 2020 - Wine-commits

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetFVF().
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 95d74311e8cb4c02028ca0d735a8727a1ef0ceb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95d74311e8cb4c02028ca0d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:28 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetFVF(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c59d83b11a..2d5bc77ed7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3440,8 +3440,6 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) } wined3d_stateblock_set_vertex_declaration(device->update_state, decl); - if (!device->recording) - wined3d_device_set_vertex_declaration(device->wined3d_device, decl); device->has_vertex_declaration = TRUE; wined3d_mutex_unlock();

1 0

Zhiyi Zhang : d3d8/tests: Add multiple adapters tests.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: c70222bf39ca3087facfa8a51b4678f93dabb677 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70222bf39ca3087facfa8a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 7 16:20:00 2020 +0330 d3d8/tests: Add multiple adapters tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 80bf62e361..19351da091 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9760,6 +9760,48 @@ static void test_get_display_mode(void) DestroyWindow(window); } +static void test_multi_adapter(void) +{ + unsigned int i, adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D8 *d3d; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D8_GetAdapterMonitor(d3d, i); + ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + + if (!i) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, + "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + else + ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + } + + IDirect3D8_Release(d3d); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9876,6 +9918,7 @@ START_TEST(device) test_multiply_transform(); test_draw_primitive(); test_get_display_mode(); + test_multi_adapter(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Zhiyi Zhang : d3d9/tests: Add multiple adapters tests.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 63d98c7552efcec31f7a9b1d806451e174b68b9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d98c7552efcec31f7a9b1d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 7 16:20:01 2020 +0330 d3d9/tests: Add multiple adapters tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 03ebe242e9..156cb188f0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13405,6 +13405,48 @@ static void test_get_display_mode(void) DestroyWindow(window); } +static void test_multi_adapter(void) +{ + unsigned int i, adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D9 *d3d; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D9_GetAdapterMonitor(d3d, i); + ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + + if (!i) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, + "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + else + ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + } + + IDirect3D9_Release(d3d); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -13532,6 +13574,7 @@ START_TEST(device) test_multiply_transform(); test_vertex_buffer_read_write(); test_get_display_mode(); + test_multi_adapter(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Zhiyi Zhang : dxgi/tests: Add multiple adapters tests.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 9f676b71e9b65f572e4584eac9f2b979a385ab35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f676b71e9b65f572e4584ea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 7 16:20:02 2020 +0330 dxgi/tests: Add multiple adapters tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index aaef811364..f8e63ea25e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4899,6 +4899,128 @@ static void flush_events(void) } } +struct adapter_info +{ + const WCHAR *name; + HMONITOR monitor; +}; + +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC dc, RECT *rect, LPARAM lparam) +{ + struct adapter_info *adapter_info = (struct adapter_info *)lparam; + MONITORINFOEXW monitor_info; + + monitor_info.cbSize = sizeof(monitor_info); + if (GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info) + && !lstrcmpiW(adapter_info->name, monitor_info.szDevice)) + { + adapter_info->monitor = monitor; + return FALSE; + } + + return TRUE; +} + +static HMONITOR get_monitor(const WCHAR *adapter_name) +{ + struct adapter_info info = {adapter_name, NULL}; + + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)&info); + return info.monitor; +} + +static void test_multi_adapter(void) +{ + unsigned int output_count = 0, expected_output_count = 0; + unsigned int adapter_index, output_index, device_index; + DISPLAY_DEVICEW display_device; + DXGI_OUTPUT_DESC output_desc; + MONITORINFO monitor_info; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + HMONITOR monitor; + BOOL found; + HRESULT hr; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) + { + skip("Failed to create IDXGIFactory, hr %#x.\n", hr); + return; + } + + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Could not enumerate adapters.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr); + + for (adapter_index = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)); ++adapter_index) + { + for (output_index = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_index, &output)); ++output_index) + { + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + found = FALSE; + display_device.cb = sizeof(display_device); + for (device_index = 0; EnumDisplayDevicesW(NULL, device_index, &display_device, 0); ++device_index) + { + if (!lstrcmpiW(display_device.DeviceName, output_desc.DeviceName)) + { + found = TRUE; + break; + } + } + ok(found, "Failed to find device %s for adapter %u, output %u.\n", + wine_dbgstr_w(output_desc.DeviceName), adapter_index, output_index); + + ok(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + if (!adapter_index && !output_index) + ok(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + else + ok(!(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), + "Got unexpected state flags %#x for adapter %u, output %u.\n", + display_device.StateFlags, adapter_index, output_index); + + /* Should have the same monitor handle. */ + monitor = get_monitor(display_device.DeviceName); + ok(!!monitor, "Failed to find monitor %s.\n", wine_dbgstr_w(display_device.DeviceName)); + ok(monitor == output_desc.Monitor, "Got unexpected monitor %p, expected %p.\n", + monitor, output_desc.Monitor); + + /* Should have the same monitor rectangle. */ + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), + "Failed to get monitor info for adapter %u, output %u, error %#x.\n", + adapter_index, output_index, GetLastError()); + ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), + "Got unexpected output rect %s, expected %s for adapter %u, output %u.\n", + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&output_desc.DesktopCoordinates), + adapter_index, output_index); + + IDXGIOutput_Release(output); + ++output_count; + } + + IDXGIAdapter_Release(adapter); + } + + IDXGIFactory_Release(factory); + + expected_output_count = GetSystemMetrics(SM_CMONITORS); + todo_wine_if(expected_output_count > 1) + ok(output_count == expected_output_count, "Expect output count %d, got %d\n", + expected_output_count, output_count); +} + struct message { unsigned int message; @@ -5824,6 +5946,7 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); + queue_test(test_multi_adapter); run_queued_tests();

1 0

Henri Verbeet : wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity).
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 125ba807e0d56a2da15875cb485067216505271a URL: https://source.winehq.org/git/wine.git/?a=commit;h=125ba807e0d56a2da15875cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 7 16:20:03 2020 +0330 wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f6d36f8c25..499d23fbbd 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1459,10 +1459,10 @@ void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock return; } - if (stage > WINED3D_MAX_TEXTURES) + if (stage >= WINED3D_MAX_TEXTURES) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", - stage, WINED3D_MAX_TEXTURES); + stage, WINED3D_MAX_TEXTURES - 1); return; }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: c436080e8e9cc8d44822d7d687b2d552816a3ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c436080e8e9cc8d44822d7d6… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Feb 7 14:35:19 2020 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 58 ++++++++++++++++++---------------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/po/fi.po b/po/fi.po index ed89ee2509..ac15875867 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3703,17 +3703,15 @@ msgstr "Odotettiin merkkiä '@'" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript -käännösvirhe" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript -suoritusvirhe" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Tuntematon virhe" +msgstr "Tuntematon ajonaikainen virhe" #: jscript.rc:54 msgid "Number expected" @@ -3761,7 +3759,7 @@ msgstr "Syntaksivirhe säännöllisessä lausekkeessa" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Poikkeusta ei otettu kiinni" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters" @@ -8310,79 +8308,59 @@ msgstr "Tarjoaja" #: version.rc:45 msgid "Select the data you want to connect to:" -msgstr "Valitse data, johon haluat yhdistää:" +msgstr "Valitse tietolähde, johon haluat yhdistää:" #: version.rc:52 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Yhteydet" +msgstr "Yhteys" #: version.rc:55 -#, fuzzy -#| msgid "Select the data you want to connect to:" msgid "Specify the following to connect to ODBC data:" -msgstr "Valitse data, johon haluat yhdistää:" +msgstr "Määritä seuraavat, jotta voit yhdistää ODBC-tietolähteeseen:" #: version.rc:56 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Määritä tietolähde:" #: version.rc:57 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Anna nimesi" +msgstr "Käytä tietolähteen &nimeä" #: version.rc:60 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Nollattuja yhteyksiä" +msgstr "Syötä yhteysasetukset &merkkijonona" #: version.rc:61 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Yhteydet" +msgstr "Yhteys&asetukset:" #: version.rc:63 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "&Lisää..." +msgstr "&Luo..." #: version.rc:64 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Syötä palvelimen kirjautumistiedot" #: version.rc:65 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "&Käyttäjänimi:" +msgstr "&Tunnus:" #: version.rc:69 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tyhjä sivu" +msgstr "&Ei salasanaa" #: version.rc:70 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Väärä salasana.\n" +msgstr "Sa&lli salasanan tallennus" #: version.rc:71 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Syötä ensiksi käytettävä &katalogi:" #: version.rc:73 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Nollattuja yhteyksiä" +msgstr "Testaa y&hteyttä" #: version.rc:36 msgid "Data Link Properties"

1 0

Jacek Caban : wbemprox: Fix checking for digit characters.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 5a44fc7b8156e4cfaa4ad66f2b67ee3443395888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a44fc7b8156e4cfaa4ad66f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:06:58 2020 +0100 wbemprox: Fix checking for digit characters. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 6 +++--- dlls/wbemprox/wbemprox_private.h | 5 +++++ dlls/wbemprox/wql.y | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1f8afb46fe..c680ae23c3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1694,17 +1694,17 @@ static WCHAR *convert_bios_date( const WCHAR *str ) while (len && iswspace( p[len - 1] )) { len--; } q = p; - while (len && iswdigit( *q )) { q++; len--; }; + while (len && is_digit( *q )) { q++; len--; }; if (q - p != 2 || !len || *q != '/') return NULL; month = (p[0] - '0') * 10 + p[1] - '0'; p = ++q; len--; - while (len && iswdigit( *q )) { q++; len--; }; + while (len && is_digit( *q )) { q++; len--; }; if (q - p != 2 || !len || *q != '/') return NULL; day = (p[0] - '0') * 10 + p[1] - '0'; p = ++q; len--; - while (len && iswdigit( *q )) { q++; len--; }; + while (len && is_digit( *q )) { q++; len--; }; if (q - p == 4) year = (p[0] - '0') * 1000 + (p[1] - '0') * 100 + (p[2] - '0') * 10 + p[3] - '0'; else if (q - p == 2) year = 1900 + (p[0] - '0') * 10 + p[1] - '0'; else return NULL; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9096b392e3..57ac793a4e 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -272,6 +272,11 @@ static inline WCHAR *heap_strdupAW( const char *src ) return dst; } +static inline BOOL is_digit(WCHAR c) +{ + return '0' <= c && c <= '9'; +} + static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 0fae44da2e..f5b249aaba 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -785,7 +785,7 @@ static int get_token( const WCHAR *s, int *token ) *token = TK_STRING; return i; case '.': - if (!iswdigit( s[1] )) + if (!is_digit( s[1] )) { *token = TK_DOT; return 1; @@ -794,7 +794,7 @@ static int get_token( const WCHAR *s, int *token ) case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': *token = TK_INTEGER; - for (i = 1; iswdigit( s[i] ); i++) {} + for (i = 1; is_digit( s[i] ); i++) {} return i; default: if (!id_char[*s]) break;

1 0

Jacek Caban : winhttp: Fix digit character check in parse_port.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: be403aac2150faa7e971edee1e7bb5bbcc7e9e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be403aac2150faa7e971edee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:07:07 2020 +0100 winhttp: Fix digit character check in parse_port. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index ba9ed4366a..3e248bca9f 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -158,7 +158,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) { const WCHAR *p = str; DWORD port = 0; - while (len && iswdigit( *p )) + while (len && '0' <= *p && *p <= '9') { if ((port = port * 10 + *p - '0') > 65535) return ERROR_WINHTTP_INVALID_URL; p++; len--;

1 0

Jacek Caban : webservices: Fix digit character checks.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 29848ee3fda5dc7b24c7072365bfdd860835f3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29848ee3fda5dc7b24c70723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:07:03 2020 +0100 webservices: Fix digit character checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/url.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 8bd3d82660..6f2ce9d6c9 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -87,11 +87,13 @@ static inline int url_decode_byte( char c1, char c2 ) if (c1 >= '0' && c1 <= '9') ret = (c1 - '0') * 16; else if (c1 >= 'a' && c1 <= 'f') ret = (c1 - 'a' + 10) * 16; - else ret = (c1 - 'A' + 10) * 16; + else if (c1 >= 'A' && c1 <= 'F') ret = (c1 - 'A' + 10) * 16; + else return -1; if (c2 >= '0' && c2 <= '9') ret += c2 - '0'; else if (c2 >= 'a' && c2 <= 'f') ret += c2 - 'a' + 10; - else ret += c2 - 'A' + 10; + else if (c2 >= 'A' && c2 <= 'F') ret += c2 - 'A' + 10; + else return -1; return ret; } @@ -102,15 +104,16 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) BOOL decode = FALSE, convert = FALSE; ULONG i, len_utf8, len_left; unsigned char *utf8, *r; + int b; *ret_len = len; for (i = 0; i < len; i++, p++) { if ((len - i) < 3) break; - if (p[0] == '%' && iswxdigit( p[1] ) && iswxdigit( p[2] )) + if (p[0] == '%' && (b = url_decode_byte( p[1], p[2] )) != -1) { decode = TRUE; - if (url_decode_byte( p[1], p[2] ) > 159) + if (b > 159) { convert = TRUE; break; @@ -125,9 +128,9 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) p = str; while (len) { - if (len >= 3 && p[0] == '%' && iswxdigit( p[1] ) && iswxdigit( p[2] )) + if (len >= 3 && p[0] == '%' && (b = url_decode_byte( p[1], p[2] )) != -1) { - *q++ = url_decode_byte( p[1], p[2] ); + *q++ = b; p += 3; len -= 3; } @@ -144,9 +147,9 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) len_left = len_utf8; while (len_left) { - if (len_left >= 3 && r[0] == '%' && isxdigit( r[1] ) && isxdigit( r[2] )) + if (len_left >= 3 && r[0] == '%' && (b = url_decode_byte( r[1], r[2] )) != -1) { - r[0] = url_decode_byte( r[1], r[2] ); + r[0] = b; len_left -= 3; memmove( r + 1, r + 3, len_left ); len_utf8 -= 2; @@ -214,7 +217,7 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS if (len && *q == ':') { p = ++q; len--; - while (len && iswdigit( *q )) + while (len && '0' <= *q && *q <= '9') { if ((port = port * 10 + *q - '0') > 65535) goto done; q++; len--; @@ -481,7 +484,7 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S { q = url->portAsString.chars; len = url->portAsString.length; - while (len && iswdigit( *q )) + while (len && '0' <= *q && *q <= '9') { if ((port = port * 10 + *q - '0') > 65535) {

1 0

Jacek Caban : quartz: Remove unused functions.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: c4d77976ac9a5de000ff23874e7b6c8a4be47f42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d77976ac9a5de000ff2387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 15:06:51 2020 +0100 quartz: Remove unused functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 5 ----- dlls/quartz/videorenderer.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 4e991ff561..e65363dea4 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,11 +64,6 @@ static inline DSoundRenderImpl *impl_from_strmbase_renderer(struct strmbase_rend return CONTAINING_RECORD(iface, DSoundRenderImpl, renderer); } -static inline DSoundRenderImpl *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, DSoundRenderImpl, renderer.filter.IBaseFilter_iface); -} - static inline DSoundRenderImpl *impl_from_IBasicAudio(IBasicAudio *iface) { return CONTAINING_RECORD(iface, DSoundRenderImpl, IBasicAudio_iface); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e634a92fbe..9b671ff370 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -68,11 +68,6 @@ static inline VideoRendererImpl *impl_from_strmbase_renderer(struct strmbase_ren return CONTAINING_RECORD(iface, VideoRendererImpl, renderer); } -static inline VideoRendererImpl *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, VideoRendererImpl, renderer.filter.IBaseFilter_iface); -} - static inline VideoRendererImpl *impl_from_IVideoWindow(IVideoWindow *iface) { return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlWindow.IVideoWindow_iface);

1 0