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

Jacek Caban : winepulse: Use a critical section for PE-side locking.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: a4149d53f734bf898087e22170eab5bed9a423d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4149d53f734bf898087e221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 16:18:43 2021 +0200 winepulse: Use a critical section for PE-side locking. 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 | 63 ++++++++++++++++++++++++------------------- dlls/winepulse.drv/pulse.c | 33 +++++++++++++++-------- dlls/winepulse.drv/unixlib.h | 2 -- 3 files changed, 58 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4149d53f734bf898087…

1 0

Jacek Caban : winepulse: Use native memory allocators where possible.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: d8e9621cfad50596378283704dfb1e6926d77ed8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8e9621cfad5059637828370… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 16:18:47 2021 +0200 winepulse: Use native memory allocators where possible. 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 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 2511e8fea39..4710728cd88 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -807,7 +807,7 @@ static HRESULT WINAPI pulse_create_stream(const char *name, EDataFlow dataflow, return hr; } - if (!(stream = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*stream)))) + if (!(stream = calloc(1, sizeof(*stream)))) { pulse_unlock(); return E_OUTOFMEMORY; @@ -884,7 +884,7 @@ exit: if (stream->stream) { pa_stream_disconnect(stream->stream); pa_stream_unref(stream->stream); - RtlFreeHeap(GetProcessHeap(), 0, stream); + free(stream); } } @@ -910,9 +910,9 @@ static void WINAPI pulse_release_stream(struct pulse_stream *stream, HANDLE time pulse_unlock(); RtlFreeHeap(GetProcessHeap(), 0, stream->tmp_buffer); - RtlFreeHeap(GetProcessHeap(), 0, stream->peek_buffer); + free(stream->peek_buffer); RtlFreeHeap(GetProcessHeap(), 0, stream->local_buffer); - RtlFreeHeap(GetProcessHeap(), 0, stream); + free(stream); } static int write_buffer(const struct pulse_stream *stream, BYTE *buffer, UINT32 bytes) @@ -1068,9 +1068,9 @@ static void pulse_write(struct pulse_stream *stream) to_write = bytes - stream->pa_held_bytes; TRACE("prebuffering %u frames of silence\n", (int)(to_write / pa_frame_size(&stream->ss))); - buf = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, to_write); + buf = calloc(1, to_write); pa_stream_write(stream->stream, buf, to_write, NULL, 0, PA_SEEK_RELATIVE); - RtlFreeHeap(GetProcessHeap(), 0, buf); + free(buf); } stream->just_underran = FALSE; @@ -1179,8 +1179,8 @@ static void pulse_read(struct pulse_stream *stream) { if (src_len > stream->peek_buffer_len) { - RtlFreeHeap(GetProcessHeap(), 0, stream->peek_buffer); - stream->peek_buffer = RtlAllocateHeap(GetProcessHeap(), 0, src_len); + free(stream->peek_buffer); + stream->peek_buffer = malloc(src_len); stream->peek_buffer_len = src_len; }

1 0

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

May 27, 2021

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

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

May 27, 2021

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

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

May 27, 2021

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: Use winvista+ AppData paths.
by Alexandre Julliard May 27, 2021

May 27, 2021

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: Use stored registry path for known folder symlinks.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 2a52efb7a3ef9e65c473433aa920569cac909569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a52efb7a3ef9e65c473433a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 27 13:37:03 2021 -0500 shell32: Use stored registry path for known folder symlinks. This allows us to keep the same symlinks for knownfolders after the upcoming patches. A functional change is that, if a user or application has redirected one of the known folders, we will now attempt to create the symlink at the redirected path instead of the default one. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 71267ecf580..c78fd1af80a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4064,7 +4064,7 @@ static inline char * _SHGetFolderUnixPath(const int nFolder) HRESULT hr; hr = SHGetFolderPathW(NULL, nFolder, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); + SHGFP_TYPE_CURRENT, wszTempPath); if (FAILED(hr)) return NULL; return wine_get_unix_file_name(wszTempPath);

1 0

Henri Verbeet : wined3d: Allow zero width/height for fullscreen swapchains as well in wined3d_swapchain_resize_buffers().
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: a5ed207ab08f7986517ea8fe16e6d1733d8fb61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5ed207ab08f7986517ea8fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 27 19:30:09 2021 +0200 wined3d: Allow zero width/height for fullscreen swapchains as well in wined3d_swapchain_resize_buffers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 20 ++++++++++---------- dlls/wined3d/swapchain.c | 7 ++----- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 57547f1b540..0d3caa61783 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4716,7 +4716,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) flush_events(); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); output = NULL; @@ -4763,7 +4763,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4771,7 +4771,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* An invisible window doesn't cause the swapchain to exit fullscreen * mode. */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; @@ -4795,7 +4795,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4814,7 +4814,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * IDXGISwapChain_Present() calls to work, otherwise they will return * DXGI_ERROR_INVALID_CALL */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); if (flags[i] == DXGI_PRESENT_TEST) todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), @@ -4830,14 +4830,14 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ShowWindow(occluding_window, SW_SHOW); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); /* hr == S_OK on vista and 2008 */ todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); if (flags[i] == DXGI_PRESENT_TEST) { @@ -4846,12 +4846,12 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* IDXGISwapChain_Present() without flags refreshes the occlusion * state. */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, 0); todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); } @@ -4867,7 +4867,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) DestroyWindow(occluding_window); flush_events(); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 10e12a11482..693557448fe 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2007,15 +2007,12 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha if (!width || !height) { + RECT client_rect; + /* The application is requesting that either the swapchain width or * height be set to the corresponding dimension in the window's * client rect. */ - RECT client_rect; - - if (!desc->windowed) - return WINED3DERR_INVALIDCALL; - if (!GetClientRect(swapchain->state.device_window, &client_rect)) { ERR("Failed to get client rect, last error %#x.\n", GetLastError());

1 0

Zebediah Figura : wined3d: Implement restoring context in wined3d_deferred_context_record_command_list().
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 55511718608f574a14eb8fee9b01f3ea816e748f URL: https://source.winehq.org/git/wine.git/?a=commit;h=55511718608f574a14eb8fee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:34 2021 -0500 wined3d: Implement restoring context in wined3d_deferred_context_record_command_list(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 39 +++++++++++++-------------------------- dlls/wined3d/cs.c | 11 ++++------- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d8c3b2df19c..63c36414f20 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32268,15 +32268,7 @@ static void test_deferred_context_state(void) ID3D11Buffer_Release(ret_buffer); hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); - todo_wine ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); - if (hr != S_OK) - { - ID3D11DeviceContext_Release(deferred); - ID3D11Buffer_Release(blue_buffer); - ID3D11Buffer_Release(green_buffer); - release_test_context(&test_context); - return; - } + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); ID3D11DeviceContext_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); ok(ret_buffer == blue_buffer, "Got unexpected buffer %p.\n", ret_buffer); @@ -32297,7 +32289,9 @@ static void test_deferred_context_state(void) ID3D11DeviceContext_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); ID3D11DeviceContext_PSGetConstantBuffers(immediate, 0, 1, &ret_buffer); - ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + todo_wine ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + if (ret_buffer) + ID3D11Buffer_Release(ret_buffer); ID3D11CommandList_Release(list2); ID3D11CommandList_Release(list1); @@ -32471,16 +32465,7 @@ static void test_deferred_context_rendering(void) ID3D11DeviceContext_ClearRenderTargetView(deferred, test_context.backbuffer_rtv, green); hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); - todo_wine ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); - if (hr != S_OK) - { - ID3D11BlendState_Release(red_blend); - ID3D11BlendState_Release(green_blend); - ID3D11BlendState_Release(blue_blend); - ID3D11DeviceContext_Release(deferred); - release_test_context(&test_context); - return; - } + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); @@ -32490,12 +32475,12 @@ static void test_deferred_context_rendering(void) ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); - ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + todo_wine ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); - ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + todo_wine ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); @@ -32511,7 +32496,7 @@ static void test_deferred_context_rendering(void) ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); - ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + todo_wine ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); ID3D11CommandList_Release(list2); ID3D11CommandList_Release(list1); @@ -32537,7 +32522,7 @@ static void test_deferred_context_rendering(void) ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, blue); ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); - ok(color == 0xffff0000, "Got unexpected color %#08x.\n", color); + todo_wine ok(color == 0xffff0000, "Got unexpected color %#08x.\n", color); ID3D11CommandList_Release(list1); ID3D11DeviceContext_Release(deferred); @@ -32571,10 +32556,12 @@ static void test_deferred_context_rendering(void) set_viewport(immediate, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); draw_color_quad(&test_context, &white); color = get_texture_color(test_context.backbuffer, 320, 240); - ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + todo_wine ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); ID3D11DeviceContext_OMGetBlendState(immediate, &ret_blend, blend_factor, &sample_mask); - ok(!ret_blend, "Got unexpected blend state %p.\n", ret_blend); + todo_wine ok(!ret_blend, "Got unexpected blend state %p.\n", ret_blend); + if (ret_blend) + ID3D11BlendState_Release(ret_blend); ID3D11CommandList_Release(list1); ID3D11DeviceContext_Release(deferred); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index db1c811a1f1..1e082ce724d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3395,12 +3395,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device TRACE("context %p, list %p.\n", context, list); - if (restore) - { - FIXME("Restoring context state is not implemented.\n"); - return E_NOTIMPL; - } - if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -3429,7 +3423,10 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->resource_count = 0; /* This is in fact recorded into a subsequent command list. */ - wined3d_device_context_reset_state(&deferred->c); + if (restore) + wined3d_device_context_set_state(&deferred->c, deferred->c.state); + else + wined3d_device_context_reset_state(&deferred->c); TRACE("Created command list %p.\n", object); *list = object;

1 0

Zebediah Figura : d3d11: Implement ID3D11Device::CreateDeferredContext().
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 60027fcc23e665fdd073e5fbe33bdd4850cd9e84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60027fcc23e665fdd073e5fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 27 11:14:29 2021 -0500 d3d11: Implement ID3D11Device::CreateDeferredContext(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42191 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 83 +++++++++++++++++++++----- dlls/d3d11/tests/d3d11.c | 65 +++++++++++--------- dlls/wined3d/cs.c | 146 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 3 + include/wine/wined3d.h | 3 + 6 files changed, 256 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60027fcc23e665fdd073…

1 0