November 2020 - Wine-Commits

Jacek Caban : jscript: Set error location when handling errors directly in parser.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: b485d58293bd7403a79d29c75a5b31b18b3cf52a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b485d58293bd7403a79d29c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 26 15:27:50 2020 +0100 jscript: Set error location when handling errors directly in parser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 507369ca202..6016be6cfd8 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -780,7 +780,7 @@ ObjectLiteral { if(ctx->script->version < 2) { WARN("Trailing comma in object literal is illegal in legacy mode.\n"); - ctx->hres = JS_E_SYNTAX; + set_error(ctx, @3, JS_E_SYNTAX); YYABORT; } $$ = new_prop_and_value_expression(ctx, $2); @@ -824,7 +824,7 @@ IdentifierName if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { WARN("%s keyword used as an identifier in legacy mode.\n", debugstr_w($1)); - ctx->hres = JS_E_SYNTAX; + set_error(ctx, @$, JS_E_SYNTAX); YYABORT; } $$ = $1;

1 0

Nikolay Sivov : mf/session: Propagate allocator initialization failure code (Coverity).
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 9177e80de85fe76a1edc5644bcb635be12191bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9177e80de85fe76a1edc5644… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 26 15:12:19 2020 +0300 mf/session: Propagate allocator initialization failure code (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6d4b58289d8..1a7439a13c3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -794,6 +794,7 @@ static void session_shutdown_current_topology(struct media_session *session) IMFMediaSink *sink; IUnknown *object; WORD idx = 0; + HRESULT hr; topology = session->presentation.current_topology; force_shutdown = session->state == SESSION_STATE_SHUT_DOWN; @@ -813,7 +814,8 @@ static void session_shutdown_current_topology(struct media_session *session) if (SUCCEEDED(IMFTopologyNode_GetUnknown(node, &_MF_TOPONODE_IMFActivate, &IID_IMFActivate, (void **)&activate))) { - IMFActivate_ShutdownObject(activate); + if (FAILED(hr = IMFActivate_ShutdownObject(activate))) + WARN("Failed to shut down activation object for the sink, hr %#x.\n", hr); IMFActivate_Release(activate); } else if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) @@ -1392,7 +1394,11 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (SUCCEEDED(MFGetService(topo_node->object.object, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&topo_node->u.sink.allocator))) { - IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, 2, media_type); + if (FAILED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, + 2, media_type))) + { + WARN("Failed to initialize sample allocator for the stream, hr %#x.\n", hr); + } IMFVideoSampleAllocator_QueryInterface(topo_node->u.sink.allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&topo_node->u.sink.allocator_cb); IMFVideoSampleAllocatorCallback_SetCallback(topo_node->u.sink.allocator_cb,

1 0

Matteo Bruni : d3d9/tests: Use get_readback_color() in test_null_format().
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 065d16a766176b473f9653f9664175aa303f8d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=065d16a766176b473f9653f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 25 18:11:27 2020 +0100 d3d9/tests: Use get_readback_color() in test_null_format(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5218d8a2029..efd8d701885 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24986,6 +24986,7 @@ static void test_null_format(void) {600, 320, 0x0000ff00}, }; IDirect3DSurface9 *original_rt, *small_rt, *null_rt, *small_null_rt; + struct surface_readback rb; IDirect3DDevice9 *device; IDirect3D9 *d3d; unsigned int i; @@ -25101,13 +25102,15 @@ static void test_null_format(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { - color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);

1 0

Piotr Caban : msvcrt: Don't write Unicode BOM if file is not empty in _wsopen_dispatch.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 00a024725e86f3dd3f8bb52849fd2597bbf58d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00a024725e86f3dd3f8bb528… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 15:26:27 2020 +0100 msvcrt: Don't write Unicode BOM if file is not empty in _wsopen_dispatch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1cf778cca07..3b1c7d549d9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2297,9 +2297,14 @@ int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int s if (oflags & (MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT)) { + LARGE_INTEGER size = {{0}}; + + if ((access & GENERIC_WRITE) && (creation==OPEN_EXISTING || creation==OPEN_ALWAYS)) + GetFileSizeEx(hand, &size); + if ((access & GENERIC_WRITE) && (creation==CREATE_NEW || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING - || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) + || ((creation==OPEN_EXISTING || creation==OPEN_ALWAYS) && !size.QuadPart))) { if (oflags & MSVCRT__O_U8TEXT) {

1 0

Biswapriyo Nath : include: Add D3D11_FEATURE_DATA_D3D11_OPTIONS5 structure in d3d11.idl.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: c4b65b6f1ec674072e75f515b20de0895b9405fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b65b6f1ec674072e75f515… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 26 01:04:28 2020 +0530 include: Add D3D11_FEATURE_DATA_D3D11_OPTIONS5 structure in d3d11.idl. 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/d3d11.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 80a65c9ae16..3613238d722 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -657,6 +657,7 @@ typedef enum D3D11_FEATURE D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, D3D11_FEATURE_D3D11_OPTIONS4, D3D11_FEATURE_SHADER_CACHE, + D3D11_FEATURE_D3D11_OPTIONS5, } D3D11_FEATURE; typedef struct D3D11_FEATURE_DATA_THREADING @@ -809,6 +810,19 @@ typedef struct D3D11_FEATURE_DATA_SHADER_CACHE UINT SupportFlags; } D3D11_FEATURE_DATA_SHADER_CACHE; +typedef enum D3D11_SHARED_RESOURCE_TIER +{ + D3D11_SHARED_RESOURCE_TIER_0, + D3D11_SHARED_RESOURCE_TIER_1, + D3D11_SHARED_RESOURCE_TIER_2, + D3D11_SHARED_RESOURCE_TIER_3, +} D3D11_SHARED_RESOURCE_TIER; + +typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS5 +{ + D3D11_SHARED_RESOURCE_TIER SharedResourceTier; +} D3D11_FEATURE_DATA_D3D11_OPTIONS5; + typedef enum D3D11_FILL_MODE { D3D11_FILL_WIREFRAME = 2,

1 0

Biswapriyo Nath : include: Add D3D11_FENCE_FLAG_NON_MONITORED name in d3d11_3.idl.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 317adb8705a0907a5721d57a87f21094eb2bce6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=317adb8705a0907a5721d57a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Nov 25 22:27:24 2020 +0530 include: Add D3D11_FENCE_FLAG_NON_MONITORED name in d3d11_3.idl. 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/d3d11_3.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/d3d11_3.idl b/include/d3d11_3.idl index 4f9ea797416..f188a37e34f 100644 --- a/include/d3d11_3.idl +++ b/include/d3d11_3.idl @@ -49,6 +49,7 @@ typedef enum D3D11_FENCE_FLAG D3D11_FENCE_FLAG_NONE = 0x1, D3D11_FENCE_FLAG_SHARED = 0x2, D3D11_FENCE_FLAG_SHARED_CROSS_ADAPTER = 0x4, + D3D11_FENCE_FLAG_NON_MONITORED = 0x8, } D3D11_FENCE_FLAG; typedef struct D3D11_TEXTURE2D_DESC1

1 0

Biswapriyo Nath : include: Add D3D11_FORMAT_SUPPORT2 enumeration in d3d11.idl.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 0d16b018c279cd911ab829c7553978b9cce8b9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d16b018c279cd911ab829c7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 26 01:06:31 2020 +0530 include: Add D3D11_FORMAT_SUPPORT2 enumeration in d3d11.idl. 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/d3d11.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 73ef42223eb..982f4abb8ae 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1445,6 +1445,22 @@ typedef enum D3D11_FORMAT_SUPPORT D3D11_FORMAT_SUPPORT_VIDEO_ENCODER = 0x40000000, } D3D11_FORMAT_SUPPORT; +typedef enum D3D11_FORMAT_SUPPORT2 +{ + D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD = 0x00000001, + D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS = 0x00000002, + D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE = 0x00000004, + D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE = 0x00000008, + D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX = 0x00000010, + D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX = 0x00000020, + D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD = 0x00000040, + D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE = 0x00000080, + D3D11_FORMAT_SUPPORT2_OUTPUT_MERGER_LOGIC_OP = 0x00000100, + D3D11_FORMAT_SUPPORT2_TILED = 0x00000200, + D3D11_FORMAT_SUPPORT2_SHAREABLE = 0x00000400, + D3D11_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x00004000, +} D3D11_FORMAT_SUPPORT2; + typedef enum D3D11_CLEAR_FLAG { D3D11_CLEAR_DEPTH = 0x0001L,

1 0

Biswapriyo Nath : include: Add D3D10_RAISE_FLAG structure in d3d10.idl.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 2736a82c73001351749faa217baf42bdec75a4bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2736a82c73001351749faa21… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Nov 25 22:26:25 2020 +0530 include: Add D3D10_RAISE_FLAG structure in d3d10.idl. 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/d3d10.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/d3d10.idl b/include/d3d10.idl index 146332ac1cd..c35e44a0d92 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -891,6 +891,10 @@ typedef enum D3D10_MAP_FLAG { D3D10_MAP_FLAG_DO_NOT_WAIT = 0x100000, } D3D10_MAP_FLAG; +typedef enum D3D10_RAISE_FLAG { + D3D10_RAISE_FLAG_DRIVER_INTERNAL_ERROR = 0x1, +} D3D10_RAISE_FLAG; + typedef enum D3D10_CLEAR_FLAG { D3D10_CLEAR_DEPTH = 0x1, D3D10_CLEAR_STENCIL = 0x2

1 0

Michael Stefaniuc : kernelbase: Use wide-char string literals.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 1b1b6c5f7d28768feb853eefd015aa714b819ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b1b6c5f7d28768feb853eef… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 25 23:52:03 2020 +0100 kernelbase: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- dlls/kernelbase/registry.c | 3 +-- dlls/kernelbase/tests/path.c | 12 ++++++------ dlls/kernelbase/volume.c | 10 ++++------ 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d7e2f0a2347..f0c79bcc94c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2944,7 +2944,7 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, else if (*src == '%' && isxdigit(*(src + 1)) && isxdigit(*(src + 2)) && !stop_unescaping) { INT ih; - WCHAR buf[5] = {'0','x',0}; + WCHAR buf[5] = L"0x"; memcpy(buf + 2, src + 1, 2*sizeof(WCHAR)); buf[4] = 0; StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d1588d0b265..574bf2f56b7 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2775,7 +2775,6 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Parse the value and load the string. */ { WCHAR *pComma = wcsrchr(pwszExpandedBuffer, ','), *pNewBuffer; - const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; DWORD baseDirLen; int reqChars; @@ -2802,7 +2801,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer if (baseDirLen) { lstrcpyW(pwszTempBuffer, pwszBaseDir); if (pwszBaseDir[baseDirLen - 1] != '\\') - lstrcatW(pwszTempBuffer, backslashW); + lstrcatW(pwszTempBuffer, L"\\"); } lstrcatW(pwszTempBuffer, pwszExpandedBuffer + 1); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 2ee7b512b31..8d85542612f 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -546,9 +546,9 @@ static void test_PathAllocCombine(void) static void test_PathCchCombine(void) { - WCHAR expected[PATHCCH_MAX_CCH] = {'C', ':', '\\', 'a', 0}; - WCHAR p1[PATHCCH_MAX_CCH] = {'C', ':', '\\', 0}; - WCHAR p2[PATHCCH_MAX_CCH] = {'a', 0}; + WCHAR expected[PATHCCH_MAX_CCH] = L"C:\\a"; + WCHAR p1[PATHCCH_MAX_CCH] = L"C:\\"; + WCHAR p2[PATHCCH_MAX_CCH] = L"a"; WCHAR output[PATHCCH_MAX_CCH]; HRESULT hr; INT i; @@ -607,9 +607,9 @@ static void test_PathCchCombine(void) static void test_PathCchCombineEx(void) { - WCHAR expected[MAX_PATH] = {'C',':','\\','a',0}; - WCHAR p1[MAX_PATH] = {'C',':','\\',0}; - WCHAR p2[MAX_PATH] = {'a',0}; + WCHAR expected[MAX_PATH] = L"C:\\a"; + WCHAR p1[MAX_PATH] = L"C:\\"; + WCHAR p2[MAX_PATH] = L"a"; WCHAR output[MAX_PATH]; HRESULT hr; int i; diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 53cc0d49b65..7daf9c98823 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -152,7 +152,6 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) /* get the label by reading it from a file at the root of the filesystem */ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DWORD len ) { - static const WCHAR labelW[] = {'.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; HANDLE handle; UNICODE_STRING name; IO_STATUS_BLOCK io; @@ -167,12 +166,12 @@ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DW attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - name.MaximumLength = device->Length + sizeof(labelW); + name.MaximumLength = device->Length + sizeof(L".windows-label"); name.Length = name.MaximumLength - sizeof(WCHAR); if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return; memcpy( name.Buffer, device->Buffer, device->Length ); - memcpy( name.Buffer + device->Length / sizeof(WCHAR), labelW, sizeof(labelW) ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), L".windows-label", sizeof(L".windows-label") ); if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { @@ -193,7 +192,6 @@ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DW /* get the serial number by reading it from a file at the root of the filesystem */ static DWORD get_filesystem_serial( const UNICODE_STRING *device ) { - static const WCHAR serialW[] = {'.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; HANDLE handle; UNICODE_STRING name; IO_STATUS_BLOCK io; @@ -207,12 +205,12 @@ static DWORD get_filesystem_serial( const UNICODE_STRING *device ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - name.MaximumLength = device->Length + sizeof(serialW); + name.MaximumLength = device->Length + sizeof(L".windows-serial"); name.Length = name.MaximumLength - sizeof(WCHAR); if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return 0; memcpy( name.Buffer, device->Buffer, device->Length ); - memcpy( name.Buffer + device->Length / sizeof(WCHAR), serialW, sizeof(serialW) ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), L".windows-serial", sizeof(L".windows-serial") ); if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) {

1 0

Michael Stefaniuc : wininet: Use wide-char string literals.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: e88abf0dc4ae7ec6b2fd21130be09dadc478b9fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e88abf0dc4ae7ec6b2fd2113… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 25 23:52:04 2020 +0100 wininet: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 13 +-- dlls/wininet/dialogs.c | 9 +- dlls/wininet/ftp.c | 26 ++--- dlls/wininet/http.c | 284 ++++++++++++++++++------------------------------ dlls/wininet/internet.c | 52 ++++----- dlls/wininet/urlcache.c | 24 +--- 6 files changed, 146 insertions(+), 262 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e88abf0dc4ae7ec6b2fd…

1 0