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

Jacek Caban : winepulse: Use NtAllocateVirtualMemory for tmp_buffer.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 77813eb7586779df0fb3b700000a17e339fd5ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77813eb7586779df0fb3b700… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 16:18:53 2021 +0200 winepulse: Use NtAllocateVirtualMemory for tmp_buffer. 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/pulse.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 4710728cd88..96b9b696125 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -61,7 +61,7 @@ struct pulse_stream INT32 locked; UINT32 bufsize_frames, real_bufsize_bytes, period_bytes; UINT32 started, peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; - UINT32 tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; + SIZE_T tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; BYTE *local_buffer, *tmp_buffer, *peek_buffer; void *locked_ptr; BOOL please_quit, just_started, just_underran; @@ -909,7 +909,9 @@ static void WINAPI pulse_release_stream(struct pulse_stream *stream, HANDLE time pa_stream_unref(stream->stream); pulse_unlock(); - RtlFreeHeap(GetProcessHeap(), 0, stream->tmp_buffer); + if (stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_bytes, MEM_RELEASE); free(stream->peek_buffer); RtlFreeHeap(GetProcessHeap(), 0, stream->local_buffer); free(stream); @@ -1077,8 +1079,7 @@ static void pulse_write(struct pulse_stream *stream) } buf = stream->local_buffer + stream->pa_offs_bytes; - TRACE("held: %u, avail: %u\n", - stream->pa_held_bytes, bytes); + TRACE("held: %lu, avail: %u\n", stream->pa_held_bytes, bytes); bytes = min(stream->pa_held_bytes, bytes); if (stream->pa_offs_bytes + bytes > stream->real_bufsize_bytes) @@ -1453,14 +1454,24 @@ static HRESULT WINAPI pulse_reset(struct pulse_stream *stream) return S_OK; } -static void alloc_tmp_buffer(struct pulse_stream *stream, UINT32 bytes) +static BOOL alloc_tmp_buffer(struct pulse_stream *stream, SIZE_T bytes) { if (stream->tmp_buffer_bytes >= bytes) - return; + return TRUE; + + if (stream->tmp_buffer) + { + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_bytes, MEM_RELEASE); + stream->tmp_buffer = NULL; + stream->tmp_buffer_bytes = 0; + } + if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + 0, &bytes, MEM_COMMIT, PAGE_READWRITE)) + return FALSE; - RtlFreeHeap(GetProcessHeap(), 0, stream->tmp_buffer); - stream->tmp_buffer = RtlAllocateHeap(GetProcessHeap(), 0, bytes); stream->tmp_buffer_bytes = bytes; + return TRUE; } static UINT32 pulse_render_padding(struct pulse_stream *stream) @@ -1515,7 +1526,11 @@ static HRESULT WINAPI pulse_get_render_buffer(struct pulse_stream *stream, UINT3 wri_offs_bytes = (stream->lcl_offs_bytes + stream->held_bytes) % stream->real_bufsize_bytes; if (wri_offs_bytes + bytes > stream->real_bufsize_bytes) { - alloc_tmp_buffer(stream, bytes); + if (!alloc_tmp_buffer(stream, bytes)) + { + pulse_unlock(); + return E_OUTOFMEMORY; + } *data = stream->tmp_buffer; stream->locked = -bytes; } @@ -1590,7 +1605,7 @@ static HRESULT WINAPI pulse_release_render_buffer(struct pulse_stream *stream, U stream->clock_written += written_bytes; stream->locked = 0; - TRACE("Released %u, held %zu\n", written_frames, stream->held_bytes / pa_frame_size(&stream->ss)); + TRACE("Released %u, held %lu\n", written_frames, stream->held_bytes / pa_frame_size(&stream->ss)); pulse_unlock(); return S_OK;

1 0

Jacek Caban : winepulse: Use NtAllocateVirtualMemory for local_buffer.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: ce151dd681fe5ee80daba96dce12e37d6846e152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce151dd681fe5ee80daba96d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 16:19:00 2021 +0200 winepulse: Use NtAllocateVirtualMemory for local_buffer. 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/pulse.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 96b9b696125..1fc8f7b59b8 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -59,8 +59,9 @@ struct pulse_stream BOOL mute; INT32 locked; - UINT32 bufsize_frames, real_bufsize_bytes, period_bytes; - UINT32 started, peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; + BOOL started; + SIZE_T bufsize_frames, alloc_size, real_bufsize_bytes, period_bytes; + SIZE_T peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; SIZE_T tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; BYTE *local_buffer, *tmp_buffer, *peek_buffer; void *locked_ptr; @@ -843,9 +844,10 @@ static HRESULT WINAPI pulse_create_stream(const char *name, EDataFlow dataflow, /* Update frames according to new size */ dump_attr(attr); if (dataflow == eRender) { - stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); - stream->local_buffer = RtlAllocateHeap(GetProcessHeap(), 0, stream->real_bufsize_bytes); - if(!stream->local_buffer) + stream->alloc_size = stream->real_bufsize_bytes = + stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); + if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, + 0, &stream->real_bufsize_bytes, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets; @@ -857,8 +859,9 @@ static HRESULT WINAPI pulse_create_stream(const char *name, EDataFlow dataflow, capture_packets = stream->real_bufsize_bytes / stream->period_bytes; - stream->local_buffer = RtlAllocateHeap(GetProcessHeap(), 0, stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket)); - if (!stream->local_buffer) + stream->alloc_size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); + if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, + 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; else { ACPacket *cur_packet = (ACPacket*)((char*)stream->local_buffer + stream->real_bufsize_bytes); @@ -912,8 +915,10 @@ static void WINAPI pulse_release_stream(struct pulse_stream *stream, HANDLE time if (stream->tmp_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &stream->tmp_buffer_bytes, MEM_RELEASE); + if (stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, + &stream->alloc_size, MEM_RELEASE); free(stream->peek_buffer); - RtlFreeHeap(GetProcessHeap(), 0, stream->local_buffer); free(stream); }

1 0

Andrew Eikum : shell32: Use winvista+ AppData paths.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 4111801ab317529c3e24c39a6a97e7043438231a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4111801ab317529c3e24c39a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 27 13:37:17 2021 -0500 shell32: Use winvista+ AppData paths. Katamari Damacy Reroll makes an assumption that the LocalAppData folder is a sibling of the LocalAppDataLow folder. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 +++--- dlls/shell32/shellpath.c | 69 ++++++++++++++++++++++++++---------------------- po/ar.po | 34 +++++++----------------- po/ast.po | 42 +++++++++-------------------- po/bg.po | 36 +++++++------------------ po/ca.po | 42 +++++++++-------------------- po/cs.po | 42 +++++++++-------------------- po/da.po | 36 +++++++------------------ po/de.po | 42 +++++++++-------------------- po/el.po | 36 +++++++------------------ po/en.po | 42 +++++++++-------------------- po/en_US.po | 42 +++++++++-------------------- po/eo.po | 42 +++++++++-------------------- po/es.po | 42 +++++++++-------------------- po/fa.po | 37 +++++++------------------- po/fi.po | 42 +++++++++-------------------- po/fr.po | 42 +++++++++-------------------- po/he.po | 42 +++++++++-------------------- po/hi.po | 34 +++++++----------------- po/hr.po | 42 +++++++++-------------------- po/hu.po | 34 +++++++----------------- po/it.po | 34 +++++++----------------- po/ja.po | 42 +++++++++-------------------- po/ko.po | 42 +++++++++-------------------- po/lt.po | 34 +++++++----------------- po/ml.po | 34 +++++++----------------- po/nb_NO.po | 42 +++++++++-------------------- po/nl.po | 42 +++++++++-------------------- po/or.po | 34 +++++++----------------- po/pa.po | 34 +++++++----------------- po/pl.po | 42 +++++++++-------------------- po/pt_BR.po | 42 +++++++++-------------------- po/pt_PT.po | 42 +++++++++-------------------- po/rm.po | 34 +++++++----------------- po/ro.po | 44 ++++++++++-------------------- po/ru.po | 42 +++++++++-------------------- po/si.po | 42 +++++++++-------------------- po/sk.po | 36 +++++++------------------ po/sl.po | 42 +++++++++-------------------- po/sr_RS(a)cyrillic.po | 34 +++++++----------------- po/sr_RS(a)latin.po | 34 +++++++----------------- po/sv.po | 42 +++++++++-------------------- po/ta.po | 34 +++++++----------------- po/te.po | 34 +++++++----------------- po/th.po | 36 +++++++------------------ po/tr.po | 42 +++++++++-------------------- po/uk.po | 42 +++++++++-------------------- po/wa.po | 34 +++++++----------------- po/wine.pot | 34 +++++++----------------- po/zh_CN.po | 42 +++++++++-------------------- po/zh_TW.po | 42 +++++++++-------------------- 51 files changed, 601 insertions(+), 1381 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4111801ab317529c3e24…

1 0

Andrew Eikum : shell32: Calculate known folder paths from parent and relative path.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 98d43c5dcfb28183667d874d4c07dfd9bb434149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98d43c5dcfb28183667d874d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 27 13:38:03 2021 -0500 shell32: Calculate known folder paths from parent and relative path. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 249 +++++++++++++++++------------------------------ 1 file changed, 89 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98d43c5dcfb28183667d…

1 0

Andrew Eikum : shell32/tests: Add tests to show relative known folder paths match SHGetKnownFolderPath.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 73c08fb638938ac6f903ad91d5ef2c93ae18a971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c08fb638938ac6f903ad91… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 27 13:38:16 2021 -0500 shell32/tests: Add tests to show relative known folder paths match SHGetKnownFolderPath. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 64 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4c9b9693983..62fa68eb20a 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -291,6 +291,18 @@ static const char *getFolderName(int folder) } } +static LPWSTR wcscasestr( LPCWSTR str, LPCWSTR sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && towlower(*p1) == towlower(*p2)) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} + /* Standard CSIDL values (and their flags) uses only two less-significant bytes */ #define NO_CSIDL 0x10000 #define WINE_ATTRIBUTES_OPTIONAL 0x20000 @@ -1964,10 +1976,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId HRESULT hr; int csidl, expectedCsidl, ret; KNOWNFOLDER_DEFINITION kfd; - IKnownFolder *folder; + IKnownFolder *folder, *kf_parent; WCHAR sName[1024]; BOOL found = FALSE; unsigned int i; + WCHAR *ikf_path, *gkfp_path, *ikf_parent_path; for (i = 0; i < ARRAY_SIZE(known_folders); ++i) { @@ -2019,10 +2032,57 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId ok_(__FILE__, known_folder->line)(!(kfd.kfdFlags & (~known_folder->definitionFlags)), "invalid known folder flags for %s: 0x%08x expected, but 0x%08x retrieved\n", known_folder->sFolderId, known_folder->definitionFlags, kfd.kfdFlags); + gkfp_path = NULL; + hr = pSHGetKnownFolderPath(folderId, KF_FLAG_DEFAULT, NULL, &gkfp_path); + if(SUCCEEDED(hr)) + { + ikf_path = NULL; + hr = IKnownFolder_GetPath(folder, KF_FLAG_DEFAULT, &ikf_path); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolder::GetPath failed: 0x%08x\n", hr); + ok_(__FILE__, known_folder->line)(ikf_path != NULL, "SHGetKnownFolderPath gave NULL path\n"); + + /* IKnownFolder::GetPath and SHGetKnownFolderPath should be the same */ + ok_(__FILE__, known_folder->line)(lstrcmpW(gkfp_path, ikf_path) == 0, "Got different paths: %s vs %s\n", + debugstr_w(gkfp_path), debugstr_w(ikf_path)); + + if(kfd.pszRelativePath) + { + /* RelativePath should be a substring of the path */ + ok_(__FILE__, known_folder->line)(wcscasestr(ikf_path, kfd.pszRelativePath) != NULL, + "KNOWNFOLDER_DEFINITION.pszRelativePath %s is not a substring of full path %s\n", + debugstr_w(kfd.pszRelativePath), debugstr_w(ikf_path)); + + hr = IKnownFolderManager_GetFolder(mgr, &kfd.fidParent, &kf_parent); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolderManager::GetFolder(parent) failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)) + { + ikf_parent_path = NULL; + hr = IKnownFolder_GetPath(kf_parent, KF_FLAG_DEFAULT, &ikf_parent_path); + ok_(__FILE__, known_folder->line)(hr == S_OK, "IKnownFolder::GetPath(parent) failed: 0x%08x\n", hr); + + /* Parent path + pszRelativePath should give the full path */ + ok_(__FILE__, known_folder->line)(memcmp(ikf_parent_path, ikf_path, lstrlenW(ikf_parent_path) * sizeof(WCHAR)) == 0, + "Full path %s does not start with parent path %s\n", + debugstr_w(ikf_path), debugstr_w(ikf_parent_path)); + ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\', + "Missing slash\n"); + ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0, + "Full path %s does not end with relative path %s\n", + debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath)); + + CoTaskMemFree(ikf_parent_path); + IKnownFolder_Release(kf_parent); + } + } + + CoTaskMemFree(ikf_path); + CoTaskMemFree(gkfp_path); + } FreeKnownFolderDefinitionFields(&kfd); } - IKnownFolder_Release(folder); + IKnownFolder_Release(folder); } break;

1 0

Jacek Caban : winepulse: Use event handle to signal main loop readiness.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: b4c7823bbb6a792098131f5572506784c8ed0f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c7823bbb6a792098131f55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 16:18:36 2021 +0200 winepulse: Use event handle to signal main loop readiness. 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 | 12 ++++++++---- dlls/winepulse.drv/pulse.c | 7 +++---- dlls/winepulse.drv/unixlib.h | 3 +-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index bc28bce137e..1a39db0f72b 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -193,8 +193,9 @@ static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioStreamVolume_iface); } -static DWORD CALLBACK pulse_mainloop_thread(void *tmp) { - pulse->main_loop(); +static DWORD CALLBACK pulse_mainloop_thread(void *event) +{ + pulse->main_loop(event); return 0; } @@ -557,14 +558,17 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if (!pulse_thread) { - if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, NULL, 0, NULL))) + HANDLE event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, event, 0, NULL))) { ERR("Failed to create mainloop thread.\n"); pulse->unlock(); + CloseHandle(event); return E_FAIL; } SetThreadPriority(pulse_thread, THREAD_PRIORITY_TIME_CRITICAL); - pulse->cond_wait(); + WaitForSingleObject(event, INFINITE); + CloseHandle(event); } name = get_application_name(); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 05e1dacd68e..143406988d4 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -109,7 +109,7 @@ static void WINAPI pulse_unlock(void) pthread_mutex_unlock(&pulse_mutex); } -static int WINAPI pulse_cond_wait(void) +static int pulse_cond_wait(void) { return pthread_cond_wait(&pulse_cond, &pulse_mutex); } @@ -175,13 +175,13 @@ static int pulse_poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, return r; } -static void WINAPI pulse_main_loop(void) +static void WINAPI pulse_main_loop(HANDLE event) { int ret; pulse_ml = pa_mainloop_new(); pa_mainloop_set_poll_func(pulse_ml, pulse_poll_func, NULL); + NtSetEvent(event, NULL); pulse_lock(); - pulse_broadcast(); pa_mainloop_run(pulse_ml, &ret); pulse_unlock(); pa_mainloop_free(pulse_ml); @@ -1809,7 +1809,6 @@ static const struct unix_funcs unix_funcs = { pulse_lock, pulse_unlock, - pulse_cond_wait, pulse_main_loop, pulse_create_stream, pulse_release_stream, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 13793c734cd..797ed3bdaa5 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -35,8 +35,7 @@ struct unix_funcs { void (WINAPI *lock)(void); void (WINAPI *unlock)(void); - int (WINAPI *cond_wait)(void); - void (WINAPI *main_loop)(void); + void (WINAPI *main_loop)(HANDLE event); HRESULT (WINAPI *create_stream)(const char *name, EDataFlow dataflow, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, UINT32 *channel_count,

1 0

Anton Baskanov : quartz/dsoundrender: Don't reset EOS on paused->running state transition.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: a2504b8ec70da37dbe98b6a547502297d31db1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2504b8ec70da37dbe98b6a5… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:44 2021 +0700 quartz/dsoundrender: Don't reset EOS on paused->running state transition. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 656a5e1f7ab..7c92eb6e6cc 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -605,10 +605,7 @@ static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFEREN SetEvent(filter->state_event); if (filter->sink.pin.peer) - { - filter->eos = FALSE; IDirectSoundBuffer_Play(filter->dsbuffer, 0, 0, DSBPLAY_LOOPING); - } return S_OK; }

1 0

Anton Baskanov : quartz/dsoundrender: Defer EC_COMPLETE until running.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 4a9936e31896b8e529ca1c5ce2e6d31f29942e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a9936e31896b8e529ca1c5c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed May 26 23:46:45 2021 +0700 quartz/dsoundrender: Defer EC_COMPLETE until running. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 14 +++++++++++++- dlls/quartz/tests/dsoundrender.c | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 7c92eb6e6cc..68c88ea5a15 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -461,7 +461,8 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) filter->eos = TRUE; - if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + if (filter->filter.state == State_Running && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, &IID_IMediaEventSink, (void **)&event_sink))) { IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, @@ -599,6 +600,8 @@ static HRESULT dsound_render_init_stream(struct strmbase_filter *iface) static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start) { struct dsound_render *filter = impl_from_strmbase_filter(iface); + IFilterGraph *graph = filter->filter.graph; + IMediaEventSink *event_sink; filter->stream_start = start; @@ -607,6 +610,15 @@ static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFEREN if (filter->sink.pin.peer) IDirectSoundBuffer_Play(filter->dsbuffer, 0, 0, DSBPLAY_LOOPING); + if (filter->eos && graph + && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } + return S_OK; } diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 87c3706b145..fdc23d2b48c 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -920,7 +920,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = send_frame(input); todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); @@ -928,7 +928,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + ok(ret == 1, "Expected EC_COMPLETE.\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Alexandre Julliard : winebuild: Store all parameters on the stack for syscall thunks on ARM.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 543e49397fd54b87bebae0c95f99dca33f7d7a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=543e49397fd54b87bebae0c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 21:13:18 2021 +0200 winebuild: Store all parameters on the stack for syscall thunks on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 4 +- tools/winebuild/import.c | 89 ++++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 5e53f323aeb..11b6aa8d0ad 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -174,6 +174,7 @@ struct syscall_frame { DWORD pad; DWORD cpsr; + DWORD r4; DWORD r5; DWORD r6; DWORD r7; @@ -181,9 +182,8 @@ struct syscall_frame DWORD r9; DWORD r10; DWORD r11; - DWORD thunk_addr; - DWORD r4; DWORD ret_addr; + DWORD thunk_addr; }; struct arm_thread_data diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b745f16db42..141936dca30 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1697,41 +1697,44 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\tjmp 2b\n" ); break; case CPU_ARM: - output( "\tpush {r5-r11,lr}\n" ); + output( "\tpush {r4-r11}\n" ); output( "\tadd r6, sp, #40\n" ); /* stack parameters */ output( "\tldr r5, 6f+8\n" ); - output( "\tcmp r4, r5\n" ); + output( "\tcmp ip, r5\n" ); output( "\tbcs 5f\n" ); output( "\tsub sp, sp, #8\n" ); output( "\tmrc p15, 0, r7, c13, c0, 2\n" ); /* NtCurrentTeb() */ output( "\tadd r7, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ - output( "\tmrs ip, CPSR\n" ); - output( "\tbfi ip, lr, #5, #1\n" ); /* set thumb bit */ - output( "\tstr ip, [sp, #4]\n" ); + output( "\tmrs r0, CPSR\n" ); + output( "\tbfi r0, lr, #5, #1\n" ); /* set thumb bit */ + output( "\tstr r0, [sp, #4]\n" ); output( "\tstr sp, [r7]\n" ); /* syscall frame */ output( "\tldr r5, 6f+4\n"); if (UsePIC) output( "1:\tadd r5, pc\n"); - output( "\tldrb r5, [r5, r4]\n" ); /* syscall args */ - output( "\tsubs r5, #16\n" ); /* first 4 args are in registers */ - output( "\tble 3f\n" ); - output( "\tsub ip, sp, r5\n" ); - output( "\tand ip, #~7\n" ); - output( "\tmov sp, ip\n" ); + output( "\tldrb r5, [r5, ip]\n" ); /* syscall args */ + output( "\tcmp r5, #16\n" ); + output( "\tit le\n" ); + output( "\tmovle r5, #16\n" ); + output( "\tsub r0, sp, r5\n" ); + output( "\tand r0, #~7\n" ); + output( "\tmov sp, r0\n" ); output( "2:\tsubs r5, r5, #4\n" ); - output( "\tldr ip, [r6, r5]\n" ); - output( "\tstr ip, [sp, r5]\n" ); + output( "\tldr r0, [r6, r5]\n" ); + output( "\tstr r0, [sp, r5]\n" ); output( "\tbgt 2b\n" ); - output( "3:\tldr r5, 6f\n"); + output( "\tldr r5, 6f\n"); if (UsePIC) output( "4:\tadd r5, pc\n"); - output( "\tldr ip, [r5, r4, lsl #2]\n"); /* syscall table */ + output( "\tldr ip, [r5, ip, lsl #2]\n"); /* syscall table */ + output( "\tpop {r0-r3}\n" ); /* first 4 args are in registers */ output( "\tblx ip\n"); output( "\tmov ip, #0\n" ); output( "\tstr ip, [r7]\n" ); output( "\tsub ip, r6, #40\n" ); output( "\tmov sp, ip\n" ); - output( "\tpop {r5-r11,pc}\n" ); - output( "5:\tldr r0, 6f+12\n" ); - output( "\tpop {r5-r11,pc}\n" ); + output( "\tpop {r4-r12,pc}\n" ); + output( "5:\tmovw r0, #0x%x\n", invalid_param & 0xffff ); + output( "\tmovt r0, #0x%x\n", invalid_param >> 16 ); + output( "\tpop {r4-r12,pc}\n" ); if (UsePIC) { output( "6:\t.long .Lsyscall_table-4b-%u\n", thumb_mode ? 4 : 8 ); @@ -1743,7 +1746,6 @@ static void output_syscall_dispatcher( int count, const char *variant ) output( "\t.long .Lsyscall_args\n" ); } output( "\t.long %u\n", count ); - output( "\t.long 0x%x\n", invalid_param ); break; case CPU_ARM64: output( "\tcmp x8, %u\n", count ); @@ -1922,22 +1924,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tret\n" ); break; case CPU_ARM: - output( "\tpush {r4,lr}\n" ); - output( "\tmov r4, #%u\n", i ); - if (UsePIC) - { - output( "\tldr ip, 2f\n"); - output( "1:\tadd ip, pc\n" ); - } - else - { - output( "\tmovw ip, :lower16:%s\n", asm_name("__wine_syscall_dispatcher") ); - output( "\tmovt ip, :upper16:%s\n", asm_name("__wine_syscall_dispatcher") ); - } - output( "\tldr ip, [ip]\n"); - output( "\tblx ip\n"); - output( "\tpop {r4,pc}\n" ); - if (UsePIC) output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); + output( "\tpush {r0-r3}\n" ); + output( "\tmovw ip, #%u\n", i ); + output( "\tmov r3, lr\n" ); + output( "\tbl %s\n", asm_name("__wine_syscall") ); + output( "\tadd sp, #16\n" ); + output( "\tbx ip\n" ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); @@ -1958,13 +1950,38 @@ void output_syscalls( DLLSPEC *spec ) output_function_size( name ); } - if (target_cpu == CPU_x86 && !UsePIC) + switch (target_cpu) { + case CPU_x86: + if (UsePIC) break; output( "\t.align %d\n", get_alignment(16) ); output( "\t%s\n", func_declaration("__wine_syscall") ); output( "%s:\n", asm_name("__wine_syscall") ); output( "\tjmp *(%s)\n", asm_name("__wine_syscall_dispatcher") ); output_function_size( "__wine_syscall" ); + break; + case CPU_ARM: + output( "\t.align %d\n", get_alignment(16) ); + output( "\t%s\n", func_declaration("__wine_syscall") ); + output( "%s:\n", asm_name("__wine_syscall") ); + output( "\tpush {r3,lr}\n" ); + if (UsePIC) + { + output( "\tldr r0, 2f\n"); + output( "1:\tadd r0, pc\n" ); + } + else + { + output( "\tmovw r0, :lower16:%s\n", asm_name("__wine_syscall_dispatcher") ); + output( "\tmovt r0, :upper16:%s\n", asm_name("__wine_syscall_dispatcher") ); + } + output( "\tldr r0, [r0]\n"); + output( "\tbx r0\n"); + if (UsePIC) output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); + output_function_size( "__wine_syscall" ); + break; + default: + break; } output( "\t.data\n" ); output( "\t.align %d\n", get_alignment( get_ptr_size() ) );

1 0

Paul Gofman : server: Do not allow parenting non-empty job.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: e1c3ee6d51510824ea729237c8c41619fd5a3886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1c3ee6d51510824ea729237… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 27 19:05:17 2021 +0300 server: Do not allow parenting non-empty job. Fixes a regression introduced by 21f5597de417575d476a00b567d972a89903b4b6 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 60 +++++++++++++++++++++++++++++++++++++++++++ server/process.c | 5 ++++ 2 files changed, 65 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9b91b6f0998..10786c52e9e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4502,6 +4502,7 @@ done: static void test_nested_jobs(void) { + BOOL ret, already_in_job = TRUE, create_succeeded = FALSE; PROCESS_INFORMATION info[2]; char buffer[MAX_PATH + 26]; STARTUPINFOA si = {0}; @@ -4514,6 +4515,65 @@ static void test_nested_jobs(void) return; } + job1 = pCreateJobObjectW(NULL, NULL); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, NULL); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + create_succeeded = TRUE; + sprintf(buffer, "\"%s\" process wait", selfname); + for (i = 0; i < 2; ++i) + { + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &info[i]); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + create_succeeded = FALSE; + break; + } + ok(ret, "CreateProcessA error %u\n", GetLastError()); + } + + if (create_succeeded) + { + ret = pIsProcessInJob(info[0].hProcess, NULL, &already_in_job); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + + if (!already_in_job) + { + ret = pAssignProcessToJobObject(job2, info[1].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job1, info[0].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job2, info[0].hProcess); + ok(!ret, "AssignProcessToJobObject succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + + TerminateProcess(info[1].hProcess, 0); + wait_child_process(info[1].hProcess); + CloseHandle(info[1].hProcess); + CloseHandle(info[1].hThread); + + ret = pAssignProcessToJobObject(job2, info[0].hProcess); + ok(!ret, "AssignProcessToJobObject succeeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } + + TerminateProcess(info[0].hProcess, 0); + wait_child_process(info[0].hProcess); + CloseHandle(info[0].hProcess); + CloseHandle(info[0].hThread); + } + + if (already_in_job) + { + win_skip("Test process is already in job, can't test parenting non-empty job.\n"); + } + + CloseHandle(job1); + CloseHandle(job2); + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); diff --git a/server/process.c b/server/process.c index 87ff3186bb5..5b271b12328 100644 --- a/server/process.c +++ b/server/process.c @@ -311,6 +311,11 @@ static void add_job_process( struct job *job, struct process *process ) } else { + if (job->total_processes) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } /* transfer reference. */ job->parent = process->job; list_add_tail( &job->parent->child_job_list, &job->parent_job_entry );

1 0