May 2021 - Wine-Commits - list.winehq.org

Francois Gouget : user32/tests: Avoid copying the clipboard buffer sizes everywhere.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: a5639d62b5104f903fcd1eaaabdc29345263fc0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5639d62b5104f903fcd1eaa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 20 15:49:20 2021 +0200 user32/tests: Avoid copying the clipboard buffer sizes everywhere. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 6fc4325e985..e2a2c332710 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -381,7 +381,7 @@ static void test_RegisterClipboardFormatA(void) format_id2 = RegisterClipboardFormatA("MY_COOL_CLIPBOARD_FORMAT"); ok(format_id2 == format_id, "invalid clipboard format id %04x\n", format_id2); - len = GetClipboardFormatNameA(format_id, buf, 256); + len = GetClipboardFormatNameA(format_id, buf, ARRAY_SIZE(buf)); ok(len == lstrlenA("my_cool_clipboard_format"), "wrong format name length %d\n", len); ok(!lstrcmpA(buf, "my_cool_clipboard_format"), "wrong format name \"%s\"\n", buf); @@ -390,7 +390,7 @@ static void test_RegisterClipboardFormatA(void) lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); - len = GetAtomNameA((ATOM)format_id, buf, 256); + len = GetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); ok(len == 0, "GetAtomNameA should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); @@ -398,7 +398,7 @@ todo_wine { lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); - len = GlobalGetAtomNameA((ATOM)format_id, buf, 256); + len = GlobalGetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); ok(len == 0, "GlobalGetAtomNameA should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); } @@ -420,7 +420,7 @@ todo_wine for (format_id = 0; format_id < 0x10fff; format_id++) { SetLastError(0xdeadbeef); - len = GetClipboardFormatNameA(format_id, buf, 256); + len = GetClipboardFormatNameA(format_id, buf, ARRAY_SIZE(buf)); if (format_id < 0xc000 || format_id > 0xffff) ok(!len, "GetClipboardFormatNameA should fail, but it returned %d (%s)\n", len, buf); @@ -456,7 +456,7 @@ todo_wine while ((format_id = EnumClipboardFormats(format_id))) { ok(IsClipboardFormatAvailable(format_id), "format %04x was listed as available\n", format_id); - len = GetClipboardFormatNameA(format_id, buf, 256); + len = GetClipboardFormatNameA(format_id, buf, ARRAY_SIZE(buf)); trace("%04x: %s\n", format_id, len ? buf : ""); } @@ -1920,12 +1920,12 @@ static void test_GetUpdatedClipboardFormats(void) ok( !count, "wrong count %u\n", count ); SetLastError( 0xdeadbeef ); - r = pGetUpdatedClipboardFormats( formats, 256, NULL ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), NULL ); ok( !r, "succeeded\n" ); ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); count = 0xdeadbeef; - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( !count, "wrong count %u\n", count ); @@ -1935,7 +1935,7 @@ static void test_GetUpdatedClipboardFormats(void) ok( r, "gle %d\n", GetLastError() ); count = 0xdeadbeef; - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( !count, "wrong count %u\n", count ); @@ -1943,7 +1943,7 @@ static void test_GetUpdatedClipboardFormats(void) count = 0xdeadbeef; memset( formats, 0xcc, sizeof(formats) ); - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( count == 1, "wrong count %u\n", count ); ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); @@ -1952,7 +1952,7 @@ static void test_GetUpdatedClipboardFormats(void) SetClipboardData( CF_TEXT, 0 ); count = 0xdeadbeef; memset( formats, 0xcc, sizeof(formats) ); - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( count == 2, "wrong count %u\n", count ); ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); @@ -1978,7 +1978,7 @@ static void test_GetUpdatedClipboardFormats(void) count = 0xdeadbeef; memset( formats, 0xcc, sizeof(formats) ); - r = pGetUpdatedClipboardFormats( formats, 256, &count ); + r = pGetUpdatedClipboardFormats( formats, ARRAY_SIZE(formats), &count ); ok( r, "gle %d\n", GetLastError() ); ok( count == 4, "wrong count %u\n", count ); ok( formats[0] == CF_UNICODETEXT, "wrong format %u\n", formats[0] ); @@ -2097,7 +2097,7 @@ static void test_string_data_process( int i ) data = GetClipboardData( CF_UNICODETEXT ); ok( data != 0, "%u: could not get data\n", i ); len = GlobalSize( data ); - len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, 12 ); + len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, ARRAY_SIZE(bufferW) ); ok( len == len2 * sizeof(WCHAR), "%u: wrong size %u / %u\n", i, len, len2 ); ok( !memcmp( data, bufferW, len ), "%u: wrong data %s\n", i, wine_dbgstr_wn( data, len2 )); } @@ -2117,7 +2117,7 @@ static void test_string_data_process( int i ) ok( data != 0, "%u: could not get data\n", i ); len = GlobalSize( data ); len2 = WideCharToMultiByte( CP_ACP, 0, bufferW, test_data[i].len / sizeof(WCHAR), - bufferA, 12, NULL, NULL ); + bufferA, ARRAY_SIZE(bufferA), NULL, NULL ); bufferA[len2 - 1] = 0; ok( len == len2, "%u: wrong size %u / %u\n", i, len, len2 ); ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data );

1 0

Jacek Caban : winepulse: Move pulse_get_current_padding to unix lib.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 42d826bc8c1d625ed2985ff06c2cd047209a1916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d826bc8c1d625ed2985ff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:24:23 2021 +0200 winepulse: Move pulse_get_current_padding to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 24 +++--------------------- dlls/winepulse.drv/pulse.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8938eac011c..654126e6dfe 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -638,11 +638,6 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, return pulse->get_latency(This->pulse_stream, latency); } -static void ACImpl_GetRenderPad(ACImpl *This, UINT32 *out) -{ - *out = This->pulse_stream->held_bytes / pa_frame_size(&This->pulse_stream->ss); -} - static void ACImpl_GetCapturePad(ACImpl *This, UINT32 *out) { ACPacket *packet = This->pulse_stream->locked_ptr; @@ -659,28 +654,15 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; TRACE("(%p)->(%p)\n", This, out); if (!out) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) { - pulse->unlock(); - return hr; - } - - if (This->dataflow == eRender) - ACImpl_GetRenderPad(This, out); - else - ACImpl_GetCapturePad(This, out); - pulse->unlock(); - - TRACE("%p Pad: %u ms (%u)\n", This, MulDiv(*out, 1000, This->pulse_stream->ss.rate), *out); - return S_OK; + return pulse->get_current_padding(This->pulse_stream, out); } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 711d9874818..a17bce283f6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1416,6 +1416,23 @@ static void alloc_tmp_buffer(struct pulse_stream *stream, UINT32 bytes) stream->tmp_buffer_bytes = bytes; } +static UINT32 pulse_render_padding(struct pulse_stream *stream) +{ + return stream->held_bytes / pa_frame_size(&stream->ss); +} + +static UINT32 pulse_capture_padding(struct pulse_stream *stream) +{ + ACPacket *packet = stream->locked_ptr; + if (!packet && !list_empty(&stream->packet_filled_head)) + { + packet = (ACPacket*)list_head(&stream->packet_filled_head); + stream->locked_ptr = packet; + list_remove(&packet->entry); + } + return stream->held_bytes / pa_frame_size(&stream->ss); +} + static HRESULT WINAPI pulse_get_render_buffer(struct pulse_stream *stream, UINT32 frames, BYTE **data) { size_t bytes; @@ -1567,6 +1584,25 @@ static HRESULT WINAPI pulse_get_latency(struct pulse_stream *stream, REFERENCE_T return S_OK; } +static HRESULT WINAPI pulse_get_current_padding(struct pulse_stream *stream, UINT32 *out) +{ + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + + if (stream->dataflow == eRender) + *out = pulse_render_padding(stream); + else + *out = pulse_capture_padding(stream); + pulse_unlock(); + + TRACE("%p Pad: %u ms (%u)\n", stream, muldiv(*out, 1000, stream->ss.rate), *out); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1610,6 +1646,7 @@ static const struct unix_funcs unix_funcs = pulse_release_render_buffer, pulse_get_buffer_size, pulse_get_latency, + pulse_get_current_padding, pulse_set_volumes, pulse_set_event_handle, pulse_test_connect, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 8be3ba67264..6017d8052e8 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -86,6 +86,7 @@ struct unix_funcs DWORD flags); HRESULT (WINAPI *get_buffer_size)(struct pulse_stream *stream, UINT32 *out); HRESULT (WINAPI *get_latency)(struct pulse_stream *stream, REFERENCE_TIME *latency); + HRESULT (WINAPI *get_current_padding)(struct pulse_stream *stream, UINT32 *out); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); HRESULT (WINAPI *set_event_handle)(struct pulse_stream *stream, HANDLE event);

1 0

Jacek Caban : winepulse: Move pulse_get_next_packet_size to unix lib.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: a6131544e87c554f70c21a04fb4697d8e1f508d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6131544e87c554f70c21a04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 22:27:30 2021 +0200 winepulse: Move pulse_get_next_packet_size to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 24 ++++-------------------- dlls/winepulse.drv/pulse.c | 21 +++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 9 +-------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index b85d9b5e80b..bf9a6672b05 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -638,18 +638,6 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, return pulse->get_latency(This->pulse_stream, latency); } -static void ACImpl_GetCapturePad(ACImpl *This, UINT32 *out) -{ - ACPacket *packet = This->pulse_stream->locked_ptr; - if (!packet && !list_empty(&This->pulse_stream->packet_filled_head)) { - packet = (ACPacket*)list_head(&This->pulse_stream->packet_filled_head); - This->pulse_stream->locked_ptr = packet; - list_remove(&packet->entry); - } - if (out) - *out = This->pulse_stream->held_bytes / pa_frame_size(&This->pulse_stream->ss); -} - static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) { @@ -1234,17 +1222,13 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%p)\n", This, frames); + if (!frames) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - pulse->lock(); - ACImpl_GetCapturePad(This, NULL); - if (This->pulse_stream->locked_ptr) - *frames = This->pulse_stream->period_bytes / pa_frame_size(&This->pulse_stream->ss); - else - *frames = 0; - pulse->unlock(); - return S_OK; + return pulse->get_next_packet_size(This->pulse_stream, frames); } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 4ff3753c189..43212822f4e 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); +typedef struct _ACPacket +{ + struct list entry; + UINT64 qpcpos; + BYTE *data; + UINT32 discont; +} ACPacket; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -1674,6 +1682,18 @@ static HRESULT WINAPI pulse_get_current_padding(struct pulse_stream *stream, UIN return S_OK; } +static HRESULT WINAPI pulse_get_next_packet_size(struct pulse_stream *stream, UINT32 *frames) +{ + pulse_lock(); + pulse_capture_padding(stream); + if (stream->locked_ptr) + *frames = stream->period_bytes / pa_frame_size(&stream->ss); + else + *frames = 0; + pulse_unlock(); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1720,6 +1740,7 @@ static const struct unix_funcs unix_funcs = pulse_get_buffer_size, pulse_get_latency, pulse_get_current_padding, + pulse_get_next_packet_size, pulse_set_volumes, pulse_set_event_handle, pulse_test_connect, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index e3471607d26..956dc36e267 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -29,14 +29,6 @@ struct pulse_config unsigned int speakers_mask; }; -typedef struct _ACPacket -{ - struct list entry; - UINT64 qpcpos; - BYTE *data; - UINT32 discont; -} ACPacket; - struct pulse_stream { EDataFlow dataflow; @@ -90,6 +82,7 @@ struct unix_funcs HRESULT (WINAPI *get_buffer_size)(struct pulse_stream *stream, UINT32 *out); HRESULT (WINAPI *get_latency)(struct pulse_stream *stream, REFERENCE_TIME *latency); HRESULT (WINAPI *get_current_padding)(struct pulse_stream *stream, UINT32 *out); + HRESULT (WINAPI *get_next_packet_size)(struct pulse_stream *stream, UINT32 *frames); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); HRESULT (WINAPI *set_event_handle)(struct pulse_stream *stream, HANDLE event);

1 0

Francois Gouget : user32/tests: Fix the clipboard CF_LOCALE test.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 948f20312b040d3c2ef2b238534569edc569f709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948f20312b040d3c2ef2b238… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 20 13:42:12 2021 +0200 user32/tests: Fix the clipboard CF_LOCALE test. By default CF_LOCALE matches the current input language, not the default user LCID. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index e2a2c332710..2fceab6c0f6 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -777,10 +777,11 @@ static void test_synthesized(void) case CF_LOCALE: { UINT *ptr = GlobalLock( data ); + DWORD layout = LOWORD( GetKeyboardLayout(0) ); ok( GlobalSize( data ) == sizeof(*ptr), "%u: size %lu\n", i, GlobalSize( data )); - ok( *ptr == GetUserDefaultLCID() || + ok( *ptr == layout || broken( *ptr == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )), - "%u: CF_LOCALE %08x/%08x\n", i, *ptr, GetUserDefaultLCID() ); + "%u: CF_LOCALE %04x/%04x\n", i, *ptr, layout ); GlobalUnlock( data ); break; }

1 0

Rémi Bernon : user32/tests: Use int for wait_move_event delay type.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: ba7d543c5c1d8bf8d3cb1083ef780bc6294b7aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba7d543c5c1d8bf8d3cb1083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 20 16:36:55 2021 +0200 user32/tests: Use int for wait_move_event delay type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7eaa2c67945..469c193c1a3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12523,8 +12523,9 @@ done: static void wait_move_event(HWND hwnd, int x, int y) { MSG msg; - DWORD timeout = GetTickCount() + 500, delay; + DWORD timeout = GetTickCount() + 500; BOOL ret; + int delay; while ((delay = timeout - GetTickCount()) > 0) {

1 0

Paul Gofman : kernelbase: Pass PROC_THREAD_ATTRIBUTE_JOB_LIST to NtCreateUserProcess().
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 0f4bc322866275469cd42e0a9e05af382d5cc3f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f4bc322866275469cd42e0a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 20 03:29:02 2021 +0300 kernelbase: Pass PROC_THREAD_ATTRIBUTE_JOB_LIST to NtCreateUserProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 06a90bf55ca..ab89d3bcf31 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -249,11 +249,12 @@ static NTSTATUS create_nt_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBUT SECURITY_ATTRIBUTES *tsa, DWORD process_flags, RTL_USER_PROCESS_PARAMETERS *params, RTL_USER_PROCESS_INFORMATION *info, HANDLE parent, - const struct proc_thread_attr *handle_list ) + const struct proc_thread_attr *handle_list, + const struct proc_thread_attr *job_list) { OBJECT_ATTRIBUTES process_attr, thread_attr; PS_CREATE_INFO create_info; - ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[7] ) / sizeof(ULONG_PTR)]; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[8] ) / sizeof(ULONG_PTR)]; PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; UNICODE_STRING nameW; NTSTATUS status; @@ -312,6 +313,14 @@ static NTSTATUS create_nt_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBUT attr->Attributes[pos].ReturnLength = NULL; pos++; } + if (job_list) + { + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_JOB_LIST; + attr->Attributes[pos].Size = job_list->size; + attr->Attributes[pos].ValuePtr = job_list->value; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + } attr->TotalLength = offsetof( PS_ATTRIBUTE_LIST, Attributes[pos] ); InitializeObjectAttributes( &process_attr, NULL, 0, NULL, psa ? psa->lpSecurityDescriptor : NULL ); @@ -353,7 +362,7 @@ static NTSTATUS create_vdm_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBU winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( token, debug, psa, tsa, flags, params, info, NULL, NULL ); + status = create_nt_process( token, debug, psa, tsa, flags, params, info, NULL, NULL, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -382,7 +391,7 @@ static NTSTATUS create_cmd_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBU swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( token, debug, psa, tsa, flags, params, info, NULL, NULL ); + status = create_nt_process( token, debug, psa, tsa, flags, params, info, NULL, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -485,7 +494,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR const WCHAR *cur_dir, STARTUPINFOW *startup_info, PROCESS_INFORMATION *info, HANDLE *new_token ) { - const struct proc_thread_attr *handle_list = NULL; + const struct proc_thread_attr *handle_list = NULL, *job_list = NULL; WCHAR name[MAX_PATH]; WCHAR *p, *tidy_cmdline = cmd_line; RTL_USER_PROCESS_PARAMETERS *params = NULL; @@ -580,6 +589,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR params->ConsoleHandle = console->reference; break; } + case PROC_THREAD_ATTRIBUTE_JOB_LIST: + job_list = &attrs->attrs[i]; + TRACE( "PROC_THREAD_ATTRIBUTE_JOB_LIST handle count %Iu.\n", + attrs->attrs[i].size / sizeof(HANDLE) ); + break; default: FIXME("Unsupported attribute %#Ix.\n", attrs->attrs[i].attr); break; @@ -594,7 +608,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR if (flags & CREATE_SUSPENDED) nt_flags |= PROCESS_CREATE_FLAGS_SUSPENDED; status = create_nt_process( token, debug, process_attr, thread_attr, - nt_flags, params, &rtl_info, parent, handle_list ); + nt_flags, params, &rtl_info, parent, handle_list, job_list ); switch (status) { case STATUS_SUCCESS:

1 0

Floris Renaud : po: Update Dutch Translation.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: e671ee0aa4b1dd2dabdb12d2d67d0676a182c6a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e671ee0aa4b1dd2dabdb12d2… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu May 20 14:21:11 2021 +0200 po: Update Dutch Translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 410 +++++++++++++++++++++------------------------------------------ 1 file changed, 135 insertions(+), 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e671ee0aa4b1dd2dabdb…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 5670351417d59e56de2581766ef8c829998e9614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5670351417d59e56de258176… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed May 19 23:34:14 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 335 ++++++++++++++++++++++----------------------------------------- 1 file changed, 117 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5670351417d59e56de25…

1 0

Paul Gofman : kernelbase: Support PROC_THREAD_ATTRIBUTE_JOB_LIST in UpdateProcThreadAttribute().
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 0986c8a35fdf9e1070390e0a424042f8396b6932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0986c8a35fdf9e1070390e0a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 20 03:29:01 2021 +0300 kernelbase: Support PROC_THREAD_ATTRIBUTE_JOB_LIST in UpdateProcThreadAttribute(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 8 +++++++ 2 files changed, 62 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 52c3036fe59..9acf0aaaaee 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4537,6 +4537,59 @@ static void test_nested_jobs(void) CloseHandle(job2); } +static void test_job_list_attribute(void) +{ + PPROC_THREAD_ATTRIBUTE_LIST attrs; + HANDLE jobs[2]; + SIZE_T size; + BOOL ret; + + if (!pInitializeProcThreadAttributeList) + { + win_skip("No support for ProcThreadAttributeList\n"); + return; + } + + ret = pInitializeProcThreadAttributeList(NULL, 1, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + attrs = heap_alloc(size); + + + jobs[0] = (HANDLE)0xdeadbeef; + jobs[1] = NULL; + + ret = pInitializeProcThreadAttributeList(attrs, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = pUpdateProcThreadAttribute(attrs, 0, PROC_THREAD_ATTRIBUTE_JOB_LIST, jobs, + sizeof(*jobs), NULL, NULL); + if (!ret && GetLastError() == ERROR_NOT_SUPPORTED) + { + /* Supported since Win10. */ + win_skip("PROC_THREAD_ATTRIBUTE_JOB_LIST is not supported.\n"); + pDeleteProcThreadAttributeList(attrs); + heap_free(attrs); + return; + } + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = pInitializeProcThreadAttributeList(attrs, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = pUpdateProcThreadAttribute(attrs, 0, PROC_THREAD_ATTRIBUTE_JOB_LIST, jobs, + 3, NULL, NULL); + ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "Got unexpected ret %#x, GetLastError() %u.\n", + ret, GetLastError()); + + ret = pInitializeProcThreadAttributeList(attrs, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = pUpdateProcThreadAttribute(attrs, 0, PROC_THREAD_ATTRIBUTE_JOB_LIST, jobs, + sizeof(*jobs) * 2, NULL, NULL); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + pDeleteProcThreadAttributeList(attrs); + heap_free(attrs); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4688,6 +4741,7 @@ START_TEST(process) test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); + test_job_list_attribute(); test_BreakawayOk(job); CloseHandle(job); } diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index ae91168ecf4..06a90bf55ca 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1687,6 +1687,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH UpdateProcThreadAttribute( struct _PROC_THREAD_ATT } break; + case PROC_THREAD_ATTRIBUTE_JOB_LIST: + if ((size / sizeof(HANDLE)) * sizeof(HANDLE) != size) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + break; + default: SetLastError( ERROR_NOT_SUPPORTED ); FIXME( "Unhandled attribute %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER );

1 0

Andrew Eikum : shell32: Avoid gcc 11 misleading-indentation warning.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 2e6fea0d1c9c876276e0a6544424c7910efd0415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6fea0d1c9c876276e0a654… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 19 15:52:15 2021 -0500 shell32: Avoid gcc 11 misleading-indentation warning. dlls/shell32/classes.c:315:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] dlls/shell32/classes.c:318:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/classes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 4e571259acb..c63800fcc1b 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -310,10 +310,10 @@ BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx RegCloseKey(hkey); } - if (ret) - TRACE("-- %s %i\n", szDest, *picon_idx); - else - TRACE("-- not found\n"); + if (ret) + TRACE("-- %s %i\n", szDest, *picon_idx); + else + TRACE("-- not found\n"); return ret; }

1 0