wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Kristján Gerhardsson : wined3d: Add GPU information for AMD VEGA20.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 29172fb7e253b8056ddacfdc8b481816b17172b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29172fb7e253b8056ddacfdc… Author: Kristján Gerhardsson <kristjang(a)ccpgames.com> Date: Mon Aug 5 18:43:36 2019 +0430 wined3d: Add GPU information for AMD VEGA20. Signed-off-by: Kristján Gerhardsson <kristjang(a)ccpgames.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6043cc1..7b4d8c5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -396,7 +396,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_M395X, "AMD Radeon R9 M395X", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7fd136..e5c972c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2378,7 +2378,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_R9_M395X = 0x6920, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, - CARD_AMD_RADEON_RX_VEGA = 0x687f, + CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, + CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Zebediah Figura : wined3d: Inhibit the screensaver while a full-screen application has focus.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 236f590fd61a9cf7e186a03218c704621e7461c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=236f590fd61a9cf7e186a032… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 18:43:35 2019 +0430 wined3d: Inhibit the screensaver while a full-screen application has focus. This matches Windows behaviour at least as of Windows 7. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/swapchain.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a6b005..6b4b079 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -912,6 +912,8 @@ static void destroy_default_samplers(struct wined3d_device *device, struct wined HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) { + unsigned int screensaver_active; + TRACE("device %p, window %p.\n", device, window); if (!wined3d_register_window(NULL, window, device, 0)) @@ -922,6 +924,9 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); return WINED3D_OK; } @@ -932,6 +937,11 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) if (device->focus_window) wined3d_unregister_window(device->focus_window); InterlockedExchangePointer((void **)&device->focus_window, NULL); + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } } static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 04ee045..63fd7a1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1172,6 +1172,7 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; + unsigned int screensaver_active; BOOL focus_messages, filter; /* This code is not protected by the wined3d mutex, so it may run while @@ -1184,6 +1185,10 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (activate) { + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) { /* The d3d versions do not agree on the exact messages here. D3d8 restores @@ -1209,6 +1214,12 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa } else { + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, NULL))) ERR("Failed to set display mode.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7d9cd7..f7fd136 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3180,7 +3180,8 @@ struct wined3d_device BYTE d3d_initialized : 1; BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ - BYTE padding : 4; + BYTE restore_screensaver : 1; + BYTE padding : 3; unsigned char surface_alignment; /* Line Alignment of surfaces */

1 0

Józef Kucia : wined3d: Fix memory leak in wined3d_swapchain_state_create() (Coverity).
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 14dee7bd0ddd9e7f6393d33ce26c09d9885c2b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14dee7bd0ddd9e7f6393d33c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 15:30:00 2019 +0200 wined3d: Fix memory leak in wined3d_swapchain_state_create() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d73dd1..04ee045 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1624,7 +1624,10 @@ HRESULT CDECL wined3d_swapchain_state_create(const struct wined3d_swapchain_desc return E_OUTOFMEMORY; if (FAILED(hr = wined3d_swapchain_state_init(s, desc, window, wined3d, adapter_idx))) + { + heap_free(s); return hr; + } *state = s;

1 0

Alexandre Julliard : Wine release 4.13
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: website Branch: master Commit: ab1f9499333b52e1d02b842c66336f44a63dc3a8 URL: https://source.winehq.org/git/website.git/?a=commit;h=ab1f9499333b52e1d02b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 2 21:26:45 2019 +0200 Wine release 4.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019080201.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2019080201.xml b/news/en/2019080201.xml new file mode 100644 index 0000000..a2a688d --- /dev/null +++ b/news/en/2019080201.xml @@ -0,0 +1,14 @@ +<news> +<date>August 2, 2019</date> +<title>Wine 4.13 Released</title> +<body> + The Wine development release 4.13 is now available. + <a href="{$root}/announce/4.13">What's new</a> in this release: +<ul> + <li>Support for Passport HTTP redirects.</li> + <li>A bunch of header updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.13 : Alexandre Julliard : Release 4.13
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: refs/tags/wine-4.13 Tag: 074ff20a8494ed44c2c0d354ea376a35fcbb1374 URL: https://source.winehq.org/git/wine.git/?a=tag;h=074ff20a8494ed44c2c0d354ea3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 2 21:24:39 2019 +0200 Release 4.13

1 0

Alexandre Julliard : Release 4.13.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 21c1ab7a737246f63a0ce6a6262d6953cd23ab0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c1ab7a737246f63a0ce6a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 2 21:24:39 2019 +0200 Release 4.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +++--- 4 files changed, 203 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21c1ab7a737246f63a0c…

1 0

Hans Leidekker : oledb32: Remove unnecessary casts.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: b56fe9c90b265f30a7919e5bcc864de41438b270 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56fe9c90b265f30a7919e5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 2 15:36:21 2019 +0200 oledb32: Remove unnecessary casts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b56fe9c90b265f30a791…

1 0

Hans Leidekker : oledb32: Add support for DBTYPE_VARIANT -> DBTYPE_DATE conversion.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 32b6ef326ac44ed189a8d57ad458160017b065f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b6ef326ac44ed189a8d57a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 2 15:36:20 2019 +0200 oledb32: Add support for DBTYPE_VARIANT -> DBTYPE_DATE conversion. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 8 ++++ dlls/oledb32/tests/convert.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a53d926..0935989 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -475,6 +475,14 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = (SystemTimeToVariantTime(&st, d) ? S_OK : E_FAIL); break; } + case DBTYPE_VARIANT: + { + VARIANT tmp; + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, src, 0, VT_DATE)) == S_OK) + *d = V_DATE(&tmp); + break; + } default: FIXME("Unimplemented conversion %04x -> DATE\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 7da9c0a..51fd2f7 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -4122,6 +4122,97 @@ static void test_converttonumeric(void) SysFreeString(bstr); } +static void test_converttodate(void) +{ + static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',0}; + DBLENGTH dst_len; + HRESULT hr; + DATE dst, date = 41408.086250; + DBSTATUS dst_status; + VARIANT var; + BSTR bstr; + + dst = 0.0; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_DATE, sizeof(date), &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 41408.086250, "got %f\n", dst); + + VariantInit(&var); + V_VT(&var) = VT_DATE; + V_DATE(&var) = 41408.086250; + dst = 0.0; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DATE, sizeof(var), &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 41408.086250, "got %f\n", dst); + + VariantInit(&var); + V_VT(&var) = VT_R8; + V_R8(&var) = 41408.086250; + dst = 0.0; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DATE, sizeof(var), &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 41408.086250, "got %f\n", dst); + + VariantInit(&var); + V_VT(&var) = VT_I4; + V_I4(&var) = 41408; + dst = 0.0; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DATE, sizeof(var), &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 41408.000000, "got %f\n", dst); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + dst = 0.0; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DATE, sizeof(var), &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 41408.000000, "got %f\n", dst); + VariantClear(&var); + + dst = 0.0; + dst_len = 0; + bstr = SysAllocString(strW); + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DATE, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 41408.000000, "got %f\n", dst); + SysFreeString(bstr); + + V_VT(&var) = VT_EMPTY; + dst = 1.0; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DATE, sizeof(var), &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0.0, "got %f\n", dst); + + V_VT(&var) = VT_NULL; + dst = 1.0; + dst_len = 0xdeadbeef; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DATE, sizeof(var), &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0xdeadbeef, "got %ld\n", dst_len); + ok(dst == 1.0, "got %f\n", dst); +} + START_TEST(convert) { HRESULT hr; @@ -4164,6 +4255,7 @@ START_TEST(convert) test_converttotimestamp(); test_converttoiunknown(); test_converttonumeric(); + test_converttodate(); IDataConvert_Release(convert);

1 0

Hans Leidekker : winhttp: Set last error for invalid and unimplemented header queries.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 788f588f0a1194c0334f7fde1dd5ef74791dfbf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=788f588f0a1194c0334f7fde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 2 11:01:38 2019 +0200 winhttp: Set last error for invalid and unimplemented header queries. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 8 +++++++- dlls/winhttp/tests/winhttp.c | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 175837d..409ef68 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -746,9 +746,15 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na return ret; default: - if (attr >= ARRAY_SIZE(attribute_table) || !attribute_table[attr]) + if (attr >= ARRAY_SIZE(attribute_table)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!attribute_table[attr]) { FIXME("attribute %u not implemented\n", attr); + SetLastError( ERROR_WINHTTP_HEADER_NOT_FOUND ); return FALSE; } TRACE("attribute %s\n", debugstr_w(attribute_table[attr])); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b075638..eb7c7b5 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -456,6 +456,14 @@ static void test_WinHttpSendRequest (void) "Expected ERROR_SUCCESS got %u.\n", GetLastError()); ok(ret == TRUE, "WinHttpReceiveResponse failed: %u.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_ORIG_URI, NULL, NULL, &len, NULL); + ok(!ret && GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_MAX + 1, NULL, NULL, &len, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + bytes_rw = -1; ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError());

1 0

Hans Leidekker : winhttp: Handle Passport redirects.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: d6a80a4833123fc8e051907ed059f47bb386d4a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a80a4833123fc8e051907e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 2 11:01:37 2019 +0200 winhttp: Handle Passport redirects. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 46 +++++++++++++++++++++++-- dlls/winhttp/session.c | 2 +- dlls/winhttp/tests/winhttp.c | 77 ++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0e54168..175837d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -873,7 +873,7 @@ static enum auth_scheme scheme_from_flag( DWORD flag ) return SCHEME_INVALID; } -static DWORD auth_scheme_from_header( WCHAR *header ) +static DWORD auth_scheme_from_header( const WCHAR *header ) { unsigned int i; @@ -2628,7 +2628,7 @@ static WCHAR *get_redirect_url( struct request *request, DWORD *len ) WCHAR *ret; query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; if (!(ret = heap_alloc( size ))) return NULL; *len = size / sizeof(WCHAR) - 1; if (query_headers( request, WINHTTP_QUERY_LOCATION, NULL, ret, &size, NULL )) return ret; @@ -2747,6 +2747,42 @@ end: return ret; } +static BOOL is_passport_request( struct request *request ) +{ + static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t','1','.','4'}; + WCHAR buf[1024]; + DWORD len = ARRAY_SIZE(buf); + + if (!(request->connect->session->passport_flags & WINHTTP_ENABLE_PASSPORT_AUTH) || + !query_headers( request, WINHTTP_QUERY_WWW_AUTHENTICATE, NULL, buf, &len, NULL )) return FALSE; + + if (!strncmpiW( buf, passportW, ARRAY_SIZE(passportW) ) && + (buf[ARRAY_SIZE(passportW)] == ' ' || !buf[ARRAY_SIZE(passportW)])) return TRUE; + + return FALSE; +} + +static BOOL handle_passport_redirect( struct request *request ) +{ + static const WCHAR status401W[] = {'4','0','1',0}; + DWORD flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE; + int i, len = strlenW( request->raw_headers ); + WCHAR *p = request->raw_headers; + + if (!process_header( request, attr_status, status401W, flags, FALSE )) return FALSE; + + for (i = 0; i < len; i++) + { + if (i <= len - 3 && p[i] == '3' && p[i + 1] == '0' && p[i + 2] == '2') + { + p[i] = '4'; + p[i + 2] = '1'; + break; + } + } + return TRUE; +} + static BOOL receive_response( struct request *request, BOOL async ) { BOOL ret; @@ -2774,7 +2810,11 @@ static BOOL receive_response( struct request *request, BOOL async ) if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); - if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) + if (status == HTTP_STATUS_REDIRECT && is_passport_request( request )) + { + ret = handle_passport_redirect( request ); + } + else if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) { if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS || request->hdr.redirect_policy == WINHTTP_OPTION_REDIRECT_POLICY_NEVER) break; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 239b86b..ef4bb17 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -210,7 +210,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b return TRUE; case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: - FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); + session->passport_flags = *(DWORD *)buffer; return TRUE; case WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5849257..b075638 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2236,6 +2236,13 @@ static const char largeauth[] = "Content-Type: text/plain\r\n" "\r\n"; +static const char passportauth[] = +"HTTP/1.1 302 Found\r\n" +"Content-Length: 0\r\n" +"Location: /\r\n" +"WWW-Authenticate: Passport1.4\r\n" +"\r\n"; + static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; static const char auth_unseen[] = "Auth Unseen"; @@ -2415,6 +2422,10 @@ static DWORD CALLBACK server_thread(LPVOID param) } else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } + else if (strstr(buffer, "GET /passport")) + { + send(c, passportauth, sizeof(passportauth) - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3518,6 +3529,71 @@ static void test_connection_info( int port ) WinHttpCloseHandle( ses ); } +static void test_passport_auth( int port ) +{ + static const WCHAR passportW[] = + {'/','p','a','s','s','p','o','r','t',0}; + static const WCHAR foundW[] = + {'F','o','u','n','d',0}; + static const WCHAR unauthorizedW[] = + {'U','n','a','u','t','h','o','r','i','z','e','d',0}; + static const WCHAR headersW[] = + {'H','T','T','P','/','1','.','1',' ','4','0','1',' ','F','o','u','n','d','\r','\n', + 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','0','\r','\n', + 'L','o','c','a','t','i','o','n',':',' ','/','\r','\n', + 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',':',' ', + 'P','a','s','s','p','o','r','t','1','.','4','\r','\n','\r','\n',0}; + HINTERNET ses, con, req; + DWORD status, size, option; + WCHAR buf[128]; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "got %u\n", GetLastError() ); + + option = WINHTTP_ENABLE_PASSPORT_AUTH; + ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH, &option, sizeof(option) ); + ok( ret, "got %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "got %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, passportW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "got %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "got %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "got %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "got %u\n", GetLastError() ); + ok( status == HTTP_STATUS_DENIED, "got %u\n", status ); + + buf[0] = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_TEXT, NULL, buf, &size, NULL ); + ok( ret, "got %u\n", GetLastError() ); + ok( !lstrcmpW(foundW, buf) || broken(!lstrcmpW(unauthorizedW, buf)) /* < win7 */, "got %s\n", wine_dbgstr_w(buf) ); + + buf[0] = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buf, &size, NULL ); + ok( ret || broken(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, "got %u\n", GetLastError() ); + if (ret) + { + ok( size == lstrlenW(headersW) * sizeof(WCHAR), "got %u\n", size ); + ok( !lstrcmpW(headersW, buf), "got %s\n", wine_dbgstr_w(buf) ); + } + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_credentials(void) { static WCHAR userW[] = {'u','s','e','r',0}; @@ -4783,6 +4859,7 @@ START_TEST (winhttp) test_multiple_reads(si.port); test_cookies(si.port); test_request_path_escapes(si.port); + test_passport_auth(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 38e39cb..93cf0f7 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -93,6 +93,7 @@ struct session struct list cookie_cache; HANDLE unload_event; DWORD secure_protocols; + DWORD passport_flags; }; struct connect

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
71
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 August 2019