February 2023 - Wine-commits

Zebediah Figura : winegstreamer: Separate a mf_video_format_to_wg() helper.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: 2803a220f684869ccd66e78778133b2586282da9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2803a220f684869ccd66e78778133b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 15:51:38 2023 -0600 winegstreamer: Separate a mf_video_format_to_wg() helper. --- dlls/winegstreamer/mfplat.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index f00167fb36f..79787cfafd4 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -667,11 +667,23 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, struct wg memcpy(format->u.audio_mpeg4.codec_data, user_data->pbAudioSpecificConfig, codec_data_size); } +static enum wg_video_format mf_video_format_to_wg(const GUID *subtype) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(video_formats); ++i) + { + if (IsEqualGUID(subtype, video_formats[i].subtype)) + return video_formats[i].format; + } + FIXME("Unrecognized video subtype %s.\n", debugstr_guid(subtype)); + return WG_VIDEO_FORMAT_UNKNOWN; +} + static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { UINT64 frame_rate, frame_size; MFVideoArea aperture; - unsigned int i; UINT32 size; if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size))) @@ -701,15 +713,7 @@ static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *sub format->u.video.fps_d = (UINT32)frame_rate; } - for (i = 0; i < ARRAY_SIZE(video_formats); ++i) - { - if (IsEqualGUID(subtype, video_formats[i].subtype)) - { - format->u.video.format = video_formats[i].format; - return; - } - } - FIXME("Unrecognized video subtype %s.\n", debugstr_guid(subtype)); + format->u.video.format = mf_video_format_to_wg(subtype); } static void mf_media_type_to_wg_format_audio_wma(IMFMediaType *type, const GUID *subtype, struct wg_format *format)

1 0

Hans Leidekker : ntdll: Initialize PEB version numbers with Windows 10 values.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: 65a3e1499b15a2da4971e2bab48c3943beb06f96 URL: https://gitlab.winehq.org/wine/wine/-/commit/65a3e1499b15a2da4971e2bab48c39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 9 16:51:41 2023 +0100 ntdll: Initialize PEB version numbers with Windows 10 values. --- dlls/ntdll/unix/env.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 6f1709f4713..79dc7ffc5c3 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1848,9 +1848,9 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) { peb->ImageBaseAddress = module; peb->ProcessParameters = params; - peb->OSMajorVersion = 6; - peb->OSMinorVersion = 1; - peb->OSBuildNumber = 0x1db1; + peb->OSMajorVersion = 10; + peb->OSMinorVersion = 0; + peb->OSBuildNumber = 18362; peb->OSPlatformId = VER_PLATFORM_WIN32_NT; peb->ImageSubSystem = main_image_info.SubSystemType; peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion;

1 0

Hans Leidekker : ntdll: Look at CurrentMajor/MinorVersionNumber registry values before CurrentVersion.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: 0692d07f85f30ee5191a781b8b6f51006f2ae407 URL: https://gitlab.winehq.org/wine/wine/-/commit/0692d07f85f30ee5191a781b8b6f51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 9 13:45:02 2023 +0100 ntdll: Look at CurrentMajor/MinorVersionNumber registry values before CurrentVersion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54463 --- dlls/ntdll/version.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 3a903c54c6b..9c396598d4e 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -276,18 +276,36 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) memset( version, 0, sizeof(*version) ); - RtlInitUnicodeString( &valueW, L"CurrentVersion" ); - if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count )) + RtlInitUnicodeString( &valueW, L"CurrentMajorVersionNumber" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ) && + info->Type == REG_DWORD) { - WCHAR *p, *str = (WCHAR *)info->Data; - str[info->DataLength / sizeof(WCHAR)] = 0; - p = wcschr( str, '.' ); - if (p) + version->dwMajorVersion = *(DWORD *)info->Data; + + RtlInitUnicodeString( &valueW, L"CurrentMinorVersionNumber" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ) && + info->Type == REG_DWORD) { - *p++ = 0; - version->dwMinorVersion = wcstoul( p, NULL, 10 ); + version->dwMinorVersion = *(DWORD *)info->Data; + } + else version->dwMajorVersion = 0; + } + + if (!version->dwMajorVersion) + { + RtlInitUnicodeString( &valueW, L"CurrentVersion" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count )) + { + WCHAR *p, *str = (WCHAR *)info->Data; + str[info->DataLength / sizeof(WCHAR)] = 0; + p = wcschr( str, '.' ); + if (p) + { + *p++ = 0; + version->dwMinorVersion = wcstoul( p, NULL, 10 ); + } + version->dwMajorVersion = wcstoul( str, NULL, 10 ); } - version->dwMajorVersion = wcstoul( str, NULL, 10 ); } if (version->dwMajorVersion) /* we got the main version, now fetch the other fields */

1 0

Jason Millard : vbscript: Add missing stubs for GetLocale and SetLocale builtins.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: c5957eb9377b607a5f01f44204336b6b079b3435 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5957eb9377b607a5f01f44204336b… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 17:23:15 2023 -0500 vbscript: Add missing stubs for GetLocale and SetLocale builtins. --- dlls/vbscript/global.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7ca2c2b9c72..0baab7e4420 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2178,6 +2178,12 @@ static HRESULT Global_Second(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wSecond); } +static HRESULT Global_SetLocale(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT Global_DateValue(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -3048,6 +3054,12 @@ static HRESULT Global_FormatPercent(BuiltinDisp *This, VARIANT *args, unsigned a return return_bstr(res, str); } +static HRESULT Global_GetLocale(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT Global_FormatDateTime(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { int format = 0; @@ -3270,6 +3282,7 @@ static const builtin_prop_t global_props[] = { {L"FormatDateTime", Global_FormatDateTime, 0, 1, 2}, {L"FormatNumber", Global_FormatNumber, 0, 1, 5}, {L"FormatPercent", Global_FormatPercent, 0, 1, 5}, + {L"GetLocale", Global_GetLocale, 0, 0}, {L"GetObject", Global_GetObject, 0, 0, 2}, {L"GetRef", Global_GetRef, 0, 1}, {L"Hex", Global_Hex, 0, 1}, @@ -3316,6 +3329,7 @@ static const builtin_prop_t global_props[] = { {L"ScriptEngineMajorVersion", Global_ScriptEngineMajorVersion, 0, 0}, {L"ScriptEngineMinorVersion", Global_ScriptEngineMinorVersion, 0, 0}, {L"Second", Global_Second, 0, 1}, + {L"SetLocale", Global_SetLocale, 0, 0, 1}, {L"Sgn", Global_Sgn, 0, 1}, {L"Sin", Global_Sin, 0, 1}, {L"Space", Global_Space, 0, 1},

1 0

Jason Millard : vbscript: Fix compile when colon follows Else on new line.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: afb2125cdf281e0f200d2c11b372f8f71fddff65 URL: https://gitlab.winehq.org/wine/wine/-/commit/afb2125cdf281e0f200d2c11b372f8… Author: Jason Millard <jsm174(a)gmail.com> Date: Thu Feb 9 12:14:37 2023 -0500 vbscript: Fix compile when colon follows Else on new line. --- dlls/vbscript/parser.y | 3 +-- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 382504a3d5a..03415dc2b1c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -319,8 +319,7 @@ ElseIf Else_opt : /* empty */ { $$ = NULL; } - | tELSE tNL StatementsNl_opt { $$ = $3; } - | tELSE StatementsNl_opt { $$ = $2; } + | tELSE StSep_opt StatementsNl_opt { $$ = $3; } CaseClausules : /* empty */ { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3a67cd09dff..1707cc9a92b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -298,6 +298,15 @@ Else x = true End If Call ok(x, "else not called?") +' Else with colon before statement following newline +x = false +If false Then + Call ok(false, "inside if false") +Else +: x = true +End If +Call ok(x, "else not called?") + x = false If false Then Call ok(false, "inside if false")

1 0

Zebediah Figura : mfreadwrite/tests: Avoid depending on sample size in test_source_reader().
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: b924671ea83a097f90fefa2998acbedc5580829a URL: https://gitlab.winehq.org/wine/wine/-/commit/b924671ea83a097f90fefa2998acbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 15:04:16 2023 -0600 mfreadwrite/tests: Avoid depending on sample size in test_source_reader(). At the same time, avoid depending on file length. --- dlls/mfreadwrite/tests/mfplat.c | 48 ++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 14e92cceab2..b28a2bf775b 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -782,14 +782,22 @@ static void test_source_reader(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(mediatype); - hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, - &timestamp, &sample); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr != S_OK) - goto skip_read_sample; - ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); - IMFSample_Release(sample); + for (;;) + { + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(!(stream_flags & ~MF_SOURCE_READERF_ENDOFSTREAM), "Unexpected stream flags %#lx.\n", stream_flags); + + if (stream_flags & MF_SOURCE_READERF_ENDOFSTREAM) + { + ok(!sample, "Unexpected sample object.\n"); + break; + } + + IMFSample_Release(sample); + } /* There is no video stream. */ hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, &actual_index, &stream_flags, @@ -805,28 +813,6 @@ static void test_source_reader(void) hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, NULL, &timestamp, &sample); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); - hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, - &timestamp, &sample); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); - /* TODO: gstreamer outputs .wav sample in increments of 4096, instead of 4410 */ - todo_wine -{ - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); - ok(!sample, "Unexpected sample object.\n"); -} - if(!stream_flags) - { - IMFSample_Release(sample); - - hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, - &timestamp, &sample); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); - ok(!sample, "Unexpected sample object.\n"); - } - hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -862,8 +848,6 @@ static void test_source_reader(void) ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); -skip_read_sample: - /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr);

1 0

Zebediah Figura : mfreadwrite/tests: Test an audio/video file.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: 81b09cdee242e45aa1cf72632bc4bf53007f6df0 URL: https://gitlab.winehq.org/wine/wine/-/commit/81b09cdee242e45aa1cf72632bc4bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 15:22:47 2023 -0600 mfreadwrite/tests: Test an audio/video file. --- dlls/mfreadwrite/tests/mfplat.c | 176 +++++++++++++++++++++++++++++++++---- dlls/mfreadwrite/tests/resource.rc | 5 ++ dlls/mfreadwrite/tests/test.mp4 | Bin 0 -> 13078 bytes 3 files changed, 162 insertions(+), 19 deletions(-)

1 0

Zebediah Figura : ws2_32: Forbid passing zero buffers to WSARecv().
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: wine Branch: master Commit: 79387b2f9fa5c73ce45f2a6f98d3b036277cbccc URL: https://gitlab.winehq.org/wine/wine/-/commit/79387b2f9fa5c73ce45f2a6f98d3b0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 7 19:35:37 2023 -0600 ws2_32: Forbid passing zero buffers to WSARecv(). --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e8a04e2e714..2a8fcf01ed8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4035,6 +4035,12 @@ int WINAPI WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { + if (!dwBufferCount) + { + SetLastError( WSAEINVAL ); + return -1; + } + return WS2_recv_base(s, lpBuffers, dwBufferCount, NumberOfBytesReceived, lpFlags, NULL, NULL, lpOverlapped, lpCompletionRoutine, NULL); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d29e1c768dc..58dcf9e7f4e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12811,14 +12811,14 @@ static void test_empty_recv(void) WSASetLastError(0xdeadbeef); ret = WSARecv(client, NULL, 0, NULL, &flags, &overlapped, NULL); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); wsabuf.buf = buffer; wsabuf.len = 0; WSASetLastError(0xdeadbeef); ret = WSARecv(client, &wsabuf, 0, NULL, &flags, &overlapped, NULL); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL);

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support abs() for SM1.
by Alexandre Julliard 09 Feb '23

09 Feb '23

Module: vkd3d Branch: master Commit: 240b2f966f104a1a818863a6a33121dd738ac5d5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/240b2f966f104a1a818863a6a3312… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 02:30:36 2023 +0300 vkd3d-shader/hlsl: Support abs() for SM1. --- libs/vkd3d-shader/hlsl_codegen.c | 30 ++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ 2 files changed, 34 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7c95ebd1..5fd754e5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1591,6 +1591,31 @@ static bool lower_dot(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *co return true; } +/* Lower ABS to MAX */ +static bool lower_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg, *neg, *replacement; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + arg = expr->operands[0].node; + if (expr->op != HLSL_OP1_ABS) + return false; + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + if (!(replacement = hlsl_new_binary_expr(ctx, HLSL_OP2_MAX, neg, arg))) + return false; + list_add_before(&instr->entry, &replacement->entry); + + hlsl_replace_node(instr, replacement); + return true; +} + static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type, *arg_type; @@ -3009,6 +3034,11 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_dot, body, NULL); } + if (profile->major_version < 2) + { + transform_ir(ctx, lower_abs, body, NULL); + } + transform_ir(ctx, validate_static_object_references, body, NULL); /* TODO: move forward, remove when no longer needed */ diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 34bead54..41b111a5 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -682,6 +682,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b switch (expr->op) { + case HLSL_OP1_ABS: + write_sm1_unary_op(ctx, buffer, D3DSIO_ABS, &instr->reg, &arg1->reg, 0, 0); + break; + case HLSL_OP1_EXP2: write_sm1_per_component_unary_op(ctx, buffer, instr, D3DSIO_EXP); break;

1 0

Alex Henrie : httpapi: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: cd2002fd23f4cf862c7a7835bc19f53338caa77f URL: https://gitlab.winehq.org/wine/wine/-/commit/cd2002fd23f4cf862c7a7835bc19f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 7 22:05:18 2023 -0700 httpapi: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/httpapi/httpapi_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 10131fdd029..b808b627174 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -185,7 +185,7 @@ ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); IO_STATUS_BLOCK iosb; TRACE("handle %p, reserved %#lx.\n", handle, reserved); @@ -193,7 +193,6 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) if (!handle) return ERROR_INVALID_PARAMETER; - 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)); @@ -741,7 +740,7 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); IO_STATUS_BLOCK iosb; TRACE("version %u.%u, name %s, sa %p, flags %#lx, handle %p.\n", @@ -753,7 +752,6 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, if (flags) FIXME("Unhandled flags %#lx.\n", flags); - RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT;

1 0