October 2020 - Wine-commits

Hans Leidekker : dssenh/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 2e11036feb02913100dc7d2fa40b5fcd18c90dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e11036feb02913100dc7d2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 2 16:56:44 2020 +0200 dssenh/tests: Get rid of workarounds for old Windows versions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 204 ++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e11036feb02913100dc…

1 0

Józef Kucia : include: Move the ID3D12Debug interface to d3d12sdklayers.idl.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 99f2a5cd9fa363d659acabc9440b44f8dd38b51c URL: https://source.winehq.org/git/wine.git/?a=commit;h=99f2a5cd9fa363d659acabc9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 19:43:59 2020 +0330 include: Move the ID3D12Debug interface to d3d12sdklayers.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 1 + dlls/dxgi/tests/dxgi.c | 1 + include/Makefile.in | 1 + include/d3d12.idl | 11 ----------- include/d3d12sdklayers.idl | 30 ++++++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 8c57f07357..f5a4c2ba11 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "dxgi1_6.h" #include "wine/test.h" diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ce1aee5ee3..bee2163843 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -24,6 +24,7 @@ #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "winternl.h" #include "ddk/d3dkmthk.h" #include "wine/heap.h" diff --git a/include/Makefile.in b/include/Makefile.in index 91a02645c3..10a9bd7aa8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -110,6 +110,7 @@ SOURCES = \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ + d3d12sdklayers.idl \ d3d12shader.idl \ d3d8.h \ d3d8caps.h \ diff --git a/include/d3d12.idl b/include/d3d12.idl index 201e01f07e..8b1e85fcef 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2138,17 +2138,6 @@ interface ID3D12Device : ID3D12Object LUID GetAdapterLuid(); } -[ - uuid(344488b7-6846-474b-b989-f027448245e0), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug : IUnknown -{ - void EnableDebugLayer(); -} - [ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl new file mode 100644 index 0000000000..dfbb738217 --- /dev/null +++ b/include/d3d12sdklayers.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2016-2019 Józef Kucia for CodeWeavers + * + * 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 + */ + +import "d3d12.idl"; + +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug : IUnknown +{ + void EnableDebugLayer(); +}

1 0

Biswapriyo Nath : include: Add the D3D12_SHADER_VERSION_TYPE enumeration.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 1f85606e6b1893611f1513340b520399d29849d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f85606e6b1893611f151334… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Oct 2 19:44:00 2020 +0330 include: Add the D3D12_SHADER_VERSION_TYPE enumeration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12shader.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl index 9cf39c6cc3..f6cc35a843 100644 --- a/include/d3d12shader.idl +++ b/include/d3d12shader.idl @@ -20,6 +20,17 @@ import "oaidl.idl"; import "ocidl.idl"; import "d3dcommon.idl"; +typedef enum D3D12_SHADER_VERSION_TYPE +{ + D3D12_SHVER_PIXEL_SHADER = 0x0, + D3D12_SHVER_VERTEX_SHADER = 0x1, + D3D12_SHVER_GEOMETRY_SHADER = 0x2, + D3D12_SHVER_HULL_SHADER = 0x3, + D3D12_SHVER_DOMAIN_SHADER = 0x4, + D3D12_SHVER_COMPUTE_SHADER = 0x5, + D3D12_SHVER_RESERVED0 = 0xfff0, +} D3D12_SHADER_VERSION_TYPE; + typedef struct _D3D12_SHADER_DESC { UINT Version;

1 0

Rémi Bernon : dxgi/tests: Check that the last adapter is always WARP.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: cce4f36e214125173a8df84d27ba5b33df8d1434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cce4f36e214125173a8df84d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 19:44:01 2020 +0330 dxgi/tests: Check that the last adapter is always WARP. Some games specifically ignore the last adapter from the adapter list, as it's always WARP on Windows. This makes them fail to detect GPUs correctly on Wine, as they drop one of the reported adapters. Signed-off-by: Rémi Bernon <rbernon(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 | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bee2163843..a34f574236 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5327,9 +5327,12 @@ static void test_multi_adapter(void) unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; DXGI_OUTPUT_DESC old_output_desc, output_desc; + DXGI_ADAPTER_DESC1 adapter_desc1; + DXGI_ADAPTER_DESC adapter_desc; DISPLAY_DEVICEW display_device; MONITORINFO monitor_info; DEVMODEW old_mode, mode; + IDXGIAdapter1 *adapter1; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; @@ -5531,6 +5534,48 @@ static void test_multi_adapter(void) IDXGIAdapter_Release(adapter); } + /* Windows 8+ always have a WARP adapter present at the end. */ + todo_wine ok(adapter_index >= 2 || broken(adapter_index < 2) /* Windows 7 and before */, + "Got unexpected adapter count %u.\n", adapter_index); + if (adapter_index < 2) + { + todo_wine win_skip("WARP adapter missing, skipping tests.\n"); + goto done; + } + + hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), + "Got unexpected description %s.\n", wine_dbgstr_w(adapter_desc.Description)); + todo_wine ok(adapter_desc.VendorId == 0x1414, + "Got unexpected vendor ID %#x.\n", adapter_desc.VendorId); + todo_wine ok(adapter_desc.DeviceId == 0x008c, + "Got unexpected device ID %#x.\n", adapter_desc.DeviceId); + ok(adapter_desc.SubSysId == 0x0000, + "Got unexpected sub-system ID %#x.\n", adapter_desc.SubSysId); + ok(adapter_desc.Revision == 0x0000, + "Got unexpected revision %#x.\n", adapter_desc.Revision); + todo_wine ok(!adapter_desc.DedicatedVideoMemory, + "Got unexpected DedicatedVideoMemory %#lx.\n", adapter_desc.DedicatedVideoMemory); + ok(!adapter_desc.DedicatedSystemMemory, + "Got unexpected DedicatedSystemMemory %#lx.\n", adapter_desc.DedicatedSystemMemory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, + "Got unexpected flags %#x.\n", adapter_desc1.Flags); + IDXGIAdapter1_Release(adapter1); + } + + IDXGIAdapter_Release(adapter); + +done: IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS);

1 0

Anton Baskanov : amstream: Implement IDirectDrawStreamSample::CompletionStatus.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 29a4921278b2675f47c60a4a90788a2ea90d7e3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a4921278b2675f47c60a4a… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 2 00:57:19 2020 +0700 amstream: Implement IDirectDrawStreamSample::CompletionStatus. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 53 ++++++-- dlls/amstream/tests/amstream.c | 292 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 335 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29a4921278b2675f47c6…

1 0

Anton Baskanov : amstream: Implement IDirectDrawStreamSample::GetSampleTimes.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: e58b42d48d2d5e91b623abeb7c02187864321d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58b42d48d2d5e91b623abeb… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 2 00:57:20 2020 +0700 amstream: Implement IDirectDrawStreamSample::GetSampleTimes. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 28 ++++++-- dlls/amstream/tests/amstream.c | 155 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 177 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e58b42d48d2d5e91b623…

1 0

Michael Stefaniuc : fltmgr.sys: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: b231650925eeaf29062791919332f942b61a050b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b231650925eeaf2906279191… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:24 2020 +0200 fltmgr.sys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index a1b81e5a89..e1016a4989 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -82,8 +82,7 @@ void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) void* WINAPI FltGetRoutineAddress(LPCSTR name) { - static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0}; - HMODULE mod = GetModuleHandleW(fltmgrW); + HMODULE mod = GetModuleHandleW(L"fltmgr.sys"); void *func; func = GetProcAddress(mod, name);

1 0

Michael Stefaniuc : fntcache: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 403b51279677788effc8fc7d6b8697fcaa300901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=403b51279677788effc8fc7d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:25 2020 +0200 fntcache: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fntcache/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index 8de84b262e..f579c4ebf3 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -83,14 +83,13 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_d */ VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { - static const WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e',0}; SERVICE_STATUS status; TRACE( "starting service\n" ); stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); - service_handle = RegisterServiceCtrlHandlerExW( fontcacheW, service_handler, NULL ); + service_handle = RegisterServiceCtrlHandlerExW( L"FontCache", service_handler, NULL ); if (!service_handle) return;

1 0

Michael Stefaniuc : httpapi: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 21a4bd7b4890269852357793db9d245333ecba2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a4bd7b4890269852357793… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:26 2020 +0200 httpapi: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 9 +++------ dlls/httpapi/tests/httpapi.c | 31 ++++++++++++------------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 6be4d11d35..52fa6cc1d8 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(http); -static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; - static WCHAR *heap_strdupW(const WCHAR *str) { int len = wcslen(str) + 1; @@ -53,7 +51,6 @@ static WCHAR *heap_strdupW(const WCHAR *str) */ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved) { - static const WCHAR httpW[] = {'h','t','t','p',0}; SC_HANDLE manager, service; TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, @@ -68,7 +65,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) return GetLastError(); - if (!(service = OpenServiceW(manager, httpW, SERVICE_START))) + if (!(service = OpenServiceW(manager, L"http", SERVICE_START))) { ERR("Failed to open HTTP service, error %u.\n", GetLastError()); CloseServiceHandle(manager); @@ -205,7 +202,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) if (!handle) return ERROR_INVALID_PARAMETER; - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); @@ -752,7 +749,7 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, if (flags) FIXME("Unhandled flags %#x.\n", flags); - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index b6bfbbccf0..c54158d45a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -33,13 +33,6 @@ #include "wine/test.h" -static const WCHAR invalid_url1[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; -static const WCHAR invalid_url2[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; -static const WCHAR invalid_url3[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0','/',0}; -static const WCHAR invalid_url4[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/',0}; -static const WCHAR invalid_url5[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','/',0}; -static const WCHAR invalid_url6[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','0','/',0}; - static ULONG (WINAPI *pHttpAddUrlToUrlGroup)(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); static ULONG (WINAPI *pHttpCreateServerSession)(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *session_id, ULONG reserved); static ULONG (WINAPI *pHttpCreateRequestQueue)(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); @@ -205,17 +198,17 @@ static void test_v1_server(void) ret = HttpAddUrl(NULL, L"http://localhost:50000/", NULL); ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_INVALID_PARAMETER /* < Vista */, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url1, NULL); + ret = HttpAddUrl(queue, L"http://localhost:50000", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url2, NULL); + ret = HttpAddUrl(queue, L"localhost:50000", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url3, NULL); + ret = HttpAddUrl(queue, L"localhost:50000/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url4, NULL); + ret = HttpAddUrl(queue, L"http://localhost/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url5, NULL); + ret = HttpAddUrl(queue, L"http://localhost:/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url6, NULL); + ret = HttpAddUrl(queue, L"http://localhost:0/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); port = add_url_v1(queue); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); @@ -1273,17 +1266,17 @@ static void test_v2_server(void) port = add_url_v2(group); - ret = pHttpAddUrlToUrlGroup(group, invalid_url1, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:50000", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url2, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url3, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url4, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url5, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url6, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:0/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0);

1 0

Michael Stefaniuc : http.sys: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: cef48706eb3c5039e7fdcd1a7a48495ebc3608a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef48706eb3c5039e7fdcd1a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:27 2020 +0200 http.sys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 31c7fc0971..e655edfeea 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -977,8 +977,6 @@ static void WINAPI unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { - static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; - static const WCHAR directory_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p',0}; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; UNICODE_STRING string; WSADATA wsadata; @@ -986,12 +984,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlInitUnicodeString(&string, directory_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http"); attr.ObjectName = &string; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { ERR("Failed to create request queue device, status %#x.\n", ret);

1 0