- wine-devel - winehq.org

[PATCH v2 0/6] MR117: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 23 May '22

23 May '22

Avoid using user32. -- v2: winemac: Directly use win32u for user functions in window.c. winemac: Directly use win32u for user functions in opengl.c. winemac: Directly use win32u for user functions in mouse.c. winemac: Directly use win32u in more places. winemac: Directly use win32u for user functions in clipboard.c. winemac: Directly use win32u for user functions in display.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/117

3 8

[PATCH 0/6] MR117: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 23 May '22

23 May '22

Avoid using user32. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/117

2 6

[PATCH 0/3] MR115: winex11.drv: Define ControlMask when not available
by Alistair Leslie-Hughes (＠alesliehughes) 23 May '22

23 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/115

3 5

[PATCH 0/6] MR114: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 23 May '22

23 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/114

2 6

[PATCH v2 5/5] mshtml/tests: Add HTMLStorage tests.
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/tests/misc.c | 190 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1702a24c804..7526fa997d2 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "optary.h" @@ -106,11 +107,200 @@ static void test_HTMLLoadOptions(void) IHtmlLoadOptions_Release(loadopts); } +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) +{ + BSTR url; + IBindCtx *bc; + IMoniker *url_mon; + IPersistMoniker *persist_mon; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = CreateBindCtx(0, &bc); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); + + url = SysAllocString(start_url); + hres = CreateURLMoniker(NULL, url, &url_mon); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, + (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, + (void**)&persist_mon); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); + + hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, + STGM_SHARE_EXCLUSIVE | STGM_READWRITE); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); + + IPersistMoniker_Release(persist_mon); + IMoniker_Release(url_mon); + IBindCtx_Release(bc); + SysFreeString(url); + return doc; +} + +static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) +{ + IHTMLWindow2 *window; + IHTMLWindow6 *window6; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return hres; + } + + hres = IHTMLWindow6_get_localStorage(window6, storage); + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + + IHTMLWindow6_Release(window6); + return hres; +} + +static void test_HTMLStorage(void) +{ + IHTMLDocument2 *doc, *doc2; + IHTMLStorage *storage, *storage2; + VARIANT var; + BSTR key, value; + HRESULT hres; + + doc = create_doc_from_url(L"http://www.codeweavers.com/"); + doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); + + hres = get_localstorage(doc, &storage); + ok(hres == S_OK, "got: %08lx\n", hres); + + hres = get_localstorage(doc2, &storage2); + ok(hres == S_OK, "got: %08lx\n", hres); + + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + value = SysAllocString(L"null"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + SysFreeString(value); + + key = SysAllocString(L"winetest"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + /* retrieve value from different storage instance */ + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"winetest"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + SysFreeString(value); + + /* item doesn't exist */ + key = SysAllocString(L"nosuch"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + + hres = IHTMLStorage_getItem(storage, NULL, NULL); + ok(hres == E_POINTER, "getItem returned: %08lx\n", hres); + + hres = IHTMLStorage_getItem(storage, key, NULL); + ok(hres == E_POINTER, "getItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, NULL, &var); + ok(hres == S_OK, "getItem returned: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage, NULL, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + key = SysAllocString(L"winetest2"); + hres = IHTMLStorage_setItem(storage, key, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_setItem(storage, NULL, key); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + /* Unicode characters */ + key = SysAllocString(L"winetest"); + value = SysAllocString(L"\x20ac"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + key = SysAllocString(L"\x20ac"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + IHTMLStorage_Release(storage); + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc); + IHTMLDocument2_Release(doc2); +} + START_TEST(misc) { CoInitialize(NULL); test_HTMLLoadOptions(); + test_HTMLStorage(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH v2 4/5] mshtml: Protect storage with a mutex.
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 502eb8c25ab..1793cfae184 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -191,9 +191,21 @@ static WCHAR *build_filename(const WCHAR *hostname) return ret; } +static WCHAR *build_mutexname(const WCHAR *filename) +{ + WCHAR *ret, *ptr; + ret = wcsdup(filename); + if(!ret) + return NULL; + for(ptr = ret; *ptr; ptr++) + if(*ptr == '\\') *ptr = '_'; + return ret; +} + struct storage { WCHAR *filename; IXMLDOMDocument *doc; + HANDLE mutex; }; static void close_storage(struct storage *storage) @@ -201,6 +213,8 @@ static void close_storage(struct storage *storage) free(storage->filename); if(storage->doc) IXMLDOMDocument_Release(storage->doc); + ReleaseMutex(storage->mutex); + CloseHandle(storage->mutex); free(storage); } @@ -210,7 +224,7 @@ static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) HRESULT hres = E_OUTOFMEMORY; VARIANT var; VARIANT_BOOL success; - WCHAR *ptr; + WCHAR *mutexname, *ptr; storage = calloc(1, sizeof(*storage)); if(!storage) @@ -220,6 +234,18 @@ static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) if(!storage->filename) goto done; + mutexname = build_mutexname(storage->filename); + if(!mutexname) + goto done; + + storage->mutex = CreateMutexW(NULL, FALSE, mutexname); + free(mutexname); + if(!storage->mutex) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + WaitForSingleObject(storage->mutex, INFINITE); + *(ptr = wcsrchr(storage->filename, '\\')) = 0; if(!create_path(storage->filename)) { hres = E_FAIL; -- 2.30.2

1 0

[PATCH v2 3/5] mshtml: Implement HTMLStorage_removeItem().
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 59 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index b01247db56b..502eb8c25ab 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -506,11 +506,66 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST return hres; } +static HRESULT remove_item(BSTR hostname, BSTR key) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_removeChild(root, node, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); - return E_NOTIMPL; + BSTR hostname; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + + if(!This->window) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = remove_item(hostname, bstrKey); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) -- 2.30.2

1 0

[PATCH v2 2/5] mshtml: Implement HTMLStorage_setItem().
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 117 +++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index fe1d6a21b88..b01247db56b 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -386,11 +386,124 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return hres; } +static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value) +{ + BSTR str; + VARIANT var; + HRESULT hres; + + str = SysAllocString(name); + if(!str) + return E_OUTOFMEMORY; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = value; + + hres = IXMLDOMElement_setAttribute(elem, str, var); + + SysFreeString(str); + return hres; +} + +static HRESULT save_storage(struct storage *storage) +{ + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(storage->filename); + if(!V_BSTR(&var)) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_save(storage->doc, var); + SysFreeString(V_BSTR(&var)); + return hres; +} + +static HRESULT set_item(BSTR hostname, BSTR key, BSTR value) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + }else { + BSTR str = SysAllocString(L"item"); + hres = IXMLDOMDocument_createElement(storage->doc, str, &elem); + SysFreeString(str); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"name", key); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + + hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); - return E_NOTIMPL; + BSTR hostname; + HRESULT hres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + + if(!This->window) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = set_item(hostname, bstrKey, bstrValue); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) -- 2.30.2

1 0

[PATCH 0/5] MR113: include: Fix malloc attributes, and a few related warnings.
by Rémi Bernon (＠rbernon) 23 May '22

23 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/113

2 5

[PATCH] evr/sample: Use proper locking method for SetAllocator().
by Nikolay Sivov 22 May '22

22 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/sample.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 3521e6c4d51..f03292704b5 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -1446,8 +1446,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, TRACE("%p, %p, %p.\n", iface, sample_allocator, state); - IMFSample_LockStore(sample->sample); - + EnterCriticalSection(&sample->cs); if (sample->tracked_result) hr = MF_E_NOTACCEPTING; else @@ -1464,8 +1463,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, } } } - - IMFSample_UnlockStore(sample->sample); + LeaveCriticalSection(&sample->cs); return hr; } -- 2.35.1

1 0

[PATCH 0/1] MR111: winedbg: Allow debugging a 32bit target from a 64bit winedbg in --gdb mode.
by Jinoh Kang (＠iamahuman) 22 May '22

22 May '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/111

2 1

Re: [PATCH v2 0/0] MR4: wined3d: Don't transition GENERAL layouts for blits. - closed
by Stefan Dösinger (＠stefan) 22 May '22

22 May '22

This merge request was closed by Stefan Dösinger. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4

1 0

Re: [PATCH v2 0/0] MR4: wined3d: Don't transition GENERAL layouts for blits.
by Stefan Dösinger (＠stefan) 22 May '22

22 May '22

I'll close this merge request for now and recreate it later once I figured out what breaks World of Tanks. Preferably I'll also include patches to keep resources that are used both as render target and as shader resource view in a compressed state. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4#note_1091

1 0

[PATCH 0/1] MR108: wmphoto: Zero user buffer before calling jxrlib Copy.
by Esme (＠madewokherd) 21 May '22

21 May '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51788 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/108

2 1

[PATCH 0/1] MR107: mscoree/tests: Use wait_child_process for csc process.
by Esme (＠madewokherd) 21 May '22

21 May '22

I'm hoping this will help with the recent mscoree:comtest failures. Based on the test output, it appears that the 5 second wait is timing out. I was going to just add time, but, well, it would also be nice to check the return value of the wait, and we already have a function that does that so... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/107

2 1

[PATCH 0/2] MR106: Avoid mpg123 functions with suffix
by André Zwing (＠AndreRH) 21 May '22

21 May '22

Otherwise I get: ld: dlls/l3codeca.acm/mpegl3.o: in function `MPEG3_DriverProc': mpegl3.c:(.text+0x977): undefined reference to `mpg123_feedseek_64' and MPG123_NO_LARGENAME is also defined for the builtin mpg123. With this patch the headers behave the same. Not sure why I am the first to spot this, maybe others mostly use the host mpg123? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/106

2 2

Wine staging 7.9 release
by Alistair Leslie-Hughes 21 May '22

21 May '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.9 (549 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * d3drm: Support IDirect3D3 when creating device Added: * none Updated: * eventfd_synchronization Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2 0/4] MR40: mfplat: Consolidate stream and file IMFByteStream methods
by Andrew Eikum (＠aeikum) 20 May '22

20 May '22

-- v2: mfplat/tests: Add tests for IMFByteStream position. mfplat: Consolidate stream and file IMFByteStream Read/Write callback vtables. mfplat: Simplify IMFByteStream async Read/Write methods. mfplat: Consolidate stream and file IMFByteStream vtables. https://gitlab.winehq.org/wine/wine/-/merge_requests/40

4 9

[PATCH 0/1] MR105: winegstreamer: reintroduce flushing for wg_parser
by zlice (＠zlice) 20 May '22

20 May '22

Previous commit removed flushing but this causes issues in some games (Fallout 3 mainly). - add flushing - move variable creation after initial condition returns in wm_reader_get_stream_sample. This caused some slow down. - Remove EOS sets. Some are not what flushing did before. Had some seg faults on exiting Fallout 3 with them in. original commit 5144b27661fcd6705353d832e0383085f8afe842 that removed flushing EOS set in `quartz_parser.c` appropriatly lets radio loop in Fallout 3, otherwise looped audio hit an infinite 'blip-blip-blip' and radio songs ending will similarly skip a few times. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/105

2 1

Re: [PATCH v2 0/6] MR103: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 20 May '22

20 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/103

1 0

[PATCH v2 0/2] MR85: ntdll: Fix Wow64 crashes when many threads are created.
by Brendan Shanks (＠bshanks) 20 May '22

20 May '22

On both Mac and Linux under Wow64, after ~120 threads are created, the 64-bit stacks start to be allocated above 4GB. This triggered crashes in alloc_fs_sel() and when the result of get_cpu_area() was used. (On Mac the ntdll threadpool tests reproduced this, but on both platforms a test app that created 256 threads also worked). -- v2: ntdll: Avoid truncating pointer to 32-bits in get_cpu_area(). ntdll: Use 32-bit stack in alloc_fs_sel(). https://gitlab.winehq.org/wine/wine/-/merge_requests/85

3 3

Re: [PATCH v2 0/2] MR102: d3dx9: Build without -DWINE_NO_LONG_TYPES. - approved
by Alexandre Julliard (＠julliard) 20 May '22

20 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/102

1 0

[PATCH v3 0/4] MR98: Some registry access fixes
by Torge Matthies (＠tmatthies) 20 May '22

20 May '22

I had these in my patch repo for quite a while. Patch 1 shouldn't need explanation. The problem fixed by patch 2 and 3 is that sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger than the actual minimum size required to get all the requested info, because those structs include an array of size 1 as their last member, which is intended to be a variable length array. Fixing these size calculations removes one allocation in wineserver and reduces the amount of data transmitted by 1 - 2 bytes. Patch 4 just reduces the amount of data transmitted from wineserver for each update_display_cache_from_registry call, which is called every time the display device lists are locked. -- v3: win32u: Query basic instead of full key information to get the LastWriteTime. win32u: Calculate buffer sizes from registry structs correctly. ntdll: Calculate buffer sizes from registry structs correctly. ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey. https://gitlab.winehq.org/wine/wine/-/merge_requests/98

3 5

Re: [PATCH v2 0/6] MR100: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 20 May '22

20 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/100

1 0

Re: [PATCH v3 0/3] MR95: combase: Try loading WinRT activatable classes from the activation context path. - approved
by Alexandre Julliard (＠julliard) 20 May '22

20 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/95

1 0

[PATCH 5/5] dxgi: Implement adapter video memory budget change notification.
by Zhiyi Zhang 20 May '22

20 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51665 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 13 +++- dlls/dxgi/tests/dxgi.c | 4 -- dlls/wined3d/directx.c | 143 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 3 + 5 files changed, 158 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 20c017eba08..b178376341b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -333,15 +333,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXG static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent( IWineDXGIAdapter *iface, HANDLE event, DWORD *cookie) { - FIXME("iface %p, event %p, cookie %p stub!\n", iface, event, cookie); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - return E_NOTIMPL; + TRACE("iface %p, event %p, cookie %p.\n", iface, event, cookie); + + if (!event || !cookie) + return DXGI_ERROR_INVALID_CALL; + + return wined3d_adapter_register_budget_change_notification(adapter->wined3d_adapter, event, cookie); } static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification( IWineDXGIAdapter *iface, DWORD cookie) { - FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); + TRACE("iface %p, cookie %#lx.\n", iface, cookie); + + wined3d_adapter_unregister_budget_change_notification(cookie); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 04bba29e8e5..33e9ead31ad 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7539,16 +7539,13 @@ static void test_video_memory_budget_notification(void) goto done; hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, NULL, &cookie); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); event = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, &cookie); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7560,7 +7557,6 @@ static void test_video_memory_budget_notification(void) if (memory_info.Budget) { ret = WaitForSingleObject(event, 1000); - todo_wine ok(ret == WAIT_OBJECT_0, "Expected event fired.\n"); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c58a346add..667bcdde0c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -23,6 +23,7 @@ #include "wined3d_private.h" #include "winternl.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -38,6 +39,19 @@ enum wined3d_driver_model DRIVER_MODEL_NT6X }; +struct wined3d_adapter_budget_change_notification +{ + const struct wined3d_adapter *adapter; + HANDLE event; + DWORD cookie; + UINT64 last_local_budget; + UINT64 last_non_local_budget; + struct list entry; +}; + +static struct list adapter_budget_change_notifications = LIST_INIT( adapter_budget_change_notifications ); +static HANDLE notification_thread, notification_thread_stop_event; + /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; @@ -1046,6 +1060,135 @@ HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter return WINED3D_OK; } +static DWORD CALLBACK notification_thread_func(void *stop_event) +{ + struct wined3d_adapter_budget_change_notification *notification; + struct wined3d_video_memory_info info; + HRESULT hr; + + while (TRUE) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_local_budget) + { + notification->last_local_budget = info.budget; + SetEvent(notification->event); + continue; + } + + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_non_local_budget) + { + notification->last_non_local_budget = info.budget; + SetEvent(notification->event); + } + } + wined3d_mutex_unlock(); + + if (WaitForSingleObject(stop_event, 1000) == WAIT_OBJECT_0) + break; + } + + return TRUE; +} + +HRESULT CDECL wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie) +{ + static DWORD cookie_counter; + static BOOL wrapped; + struct wined3d_adapter_budget_change_notification *notification, *new_notification; + HANDLE thread = NULL; + BOOL found = FALSE; + + new_notification = heap_alloc_zero(sizeof(*new_notification)); + if (!new_notification) + return E_OUTOFMEMORY; + + wined3d_mutex_lock(); + new_notification->adapter = adapter; + new_notification->event = event; + new_notification->cookie = cookie_counter++; + if (cookie_counter < new_notification->cookie) + wrapped = TRUE; + if (wrapped) + { + while (TRUE) + { + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == new_notification->cookie) + { + found = TRUE; + break; + } + } + + if (!found) + break; + + new_notification->cookie = cookie_counter++; + } + } + + *cookie = new_notification->cookie; + list_add_head(&adapter_budget_change_notifications, &new_notification->entry); + + if (!notification_thread) + { + notification_thread_stop_event = CreateEventW(0, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, notification_thread_func, notification_thread_stop_event, + CREATE_SUSPENDED, NULL); + notification_thread = thread; + } + wined3d_mutex_unlock(); + if (thread) + ResumeThread(thread); + return WINED3D_OK; +} + +HRESULT CDECL wined3d_adapter_unregister_budget_change_notification(DWORD cookie) +{ + struct wined3d_adapter_budget_change_notification *notification; + HANDLE thread, thread_stop_event; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == cookie) + { + list_remove(&notification->entry); + heap_free(notification); + break; + } + } + + if (!list_empty(&adapter_budget_change_notifications)) + { + wined3d_mutex_unlock(); + return WINED3D_OK; + } + + thread = notification_thread; + thread_stop_event = notification_thread_stop_event; + notification_thread = NULL; + notification_thread_stop_event = NULL; + wined3d_mutex_unlock(); + SetEvent(thread_stop_event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(thread_stop_event); + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 845ca0fb170..63220e1222c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -22,6 +22,8 @@ @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) @ cdecl wined3d_adapter_get_video_memory_info(ptr long long ptr) +@ cdecl wined3d_adapter_register_budget_change_notification(ptr ptr ptr) +@ cdecl wined3d_adapter_unregister_budget_change_notification(long) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b7a626f751..116aea82348 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,6 +2364,9 @@ unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapt HRESULT __cdecl wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, unsigned int node_idx, enum wined3d_memory_segment_group group, struct wined3d_video_memory_info *info); +HRESULT __cdecl wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie); +HRESULT __cdecl wined3d_adapter_unregister_budget_change_notification(DWORD cookie); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.34.1

3 5

[PATCH 0/6] MR103: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 20 May '22

20 May '22

Avoid gdi32 calls. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/103

3 7

[PATCH v3 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Brendan Shanks (＠bshanks) 20 May '22

20 May '22

- signal_alloc_thread() and signal_free_thread() mostly match signal_i386.c, but with the difference that first thread’s FS needs to be allocated in signal_init_process(). signal_alloc_thread() is called too early before the Wow TEB is allocated. - The LDT code is copied from signal_i386.c. Would it be worthwhile to move that into a common file? -- v3: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+. ntdll: Store Wow64 FS selector in thread_data. https://gitlab.winehq.org/wine/wine/-/merge_requests/76

2 2

Re: [PATCH v2 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Brendan Shanks (＠bshanks) 20 May '22

20 May '22

On Fri May 20 11:07:31 2022 +0000, Alexandre Julliard wrote: > This doesn't seem to be used for anything, do we need it? Ah true, it's not needed upstream, I'll remove it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/76#note_1059

1 0

[PATCH] dlls/win32u: ensure enum is large enough to store a LONG
by Eric Pouech 20 May '22

20 May '22

nothing ensures that the enum's storage has the size of an int C standard says: - at least size of a char - large enough to store all values of enum without cropping them - (signed vs unsigned is compiler dependant as well) even if it's unlikely it would be defined with something else than an int, added a C_ASSERT just in case Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/win32u/sysparams.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index dd494188121..13f9e6c0025 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4575,6 +4575,7 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va static DPI_AWARENESS dpi_awareness; +C_ASSERT(sizeof(dpi_awareness) == sizeof(LONG)); /*********************************************************************** * NtUserSetProcessDpiAwarenessContext (win32u.@) @@ -4594,7 +4595,7 @@ BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown return FALSE; } - return !InterlockedCompareExchange( &dpi_awareness, awareness, 0 ); + return !InterlockedCompareExchange( (LONG*)&dpi_awareness, awareness, 0 ); } /***********************************************************************

1 0

[PATCH 0/7] MR104: Revamp type management (on input)
by eric pouech (＠epo) 20 May '22

20 May '22

This serie revamps type management inside winedbg: - parsing of a type is done when input command is parsed (and no longer when it's executed). It allows to discriminate between identifier and type (as any C compiler would do) and act accordingly. - basic type (int, long...) are now searched inside data model - types can be prefixed by a module name (like struct ntdll!CONTEXT64) to force lookup of type inside that module (otherwise all modules are searched) - print command is extended to print the details of a type (p struct _CONTEXT64 will show details) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/104

2 7

[PATCH] wininet: Return failure when adding HTTP header with empty value.
by Ziqing Hui 20 May '22

20 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/wininet/http.c | 6 ++++++ dlls/wininet/tests/http.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 55698467cda..f6680790986 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6139,6 +6139,12 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR { HTTPHEADERW hdr; + if (!value[0]) + { + LeaveCriticalSection(&request->headers_section); + return ERROR_INVALID_PARAMETER; + } + hdr.lpszField = (LPWSTR)field; hdr.lpszValue = (LPWSTR)value; hdr.wFlags = hdr.wCount = 0; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae81e2..1cde6ea257c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2064,8 +2064,6 @@ static void HttpHeaders_test(void) ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %lu\n", GetLastError()); /* Header with empty value should cause a failure */ - todo_wine - { SetLastError(0xdeadbeef); ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest1:", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %lu.\n", GetLastError()); @@ -2087,7 +2085,6 @@ static void HttpHeaders_test(void) ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), "Header with empty value is present.\n"); ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %lu.\n", GetLastError()); - } ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: -- 2.25.1

3 2

Re: [PATCH] winegstreamer: reintroduce flushing for wg_parser
by Bernhard Kölbl 20 May '22

20 May '22

Am Fr., 20. Mai 2022 um 16:36 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: > > wow I did. gitlab phew thx I'll do that > Great! > On Fri, May 20, 2022 at 10:34 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> Hi Zlice, >> >> I guess you forgot to attach the patch file. >> >> Btw. if you're more versed in GitLab you could also try to submit a >> merge request there: https://gitlab.winehq.org/ >> >> Cheers, >> Bernhard >> >> Am Fr., 20. Mai 2022 um 16:26 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: >> > >> > Previous commit removed flushing but this causes issues in some games. >> > >> > - add flushing back >> > - move variable creation after initial condition returns in wm_reader_get_stream_sample. This caused some slow down. >> > - Remove EOS sets. Some are not what flushing did before. Had some seg faults on exiting Fallout 3 with them in. >> > >> > I'm not confident on the EOS sets but they seemed to cause issues leaving them in and the commit that removed flushing 5144b27661fcd6705353d832e0383085f8afe842 mentioned it should be done client side. >> > >> > -zlice

1 0

[PATCH] winegstreamer: reintroduce flushing for wg_parser
by Zlice Z 20 May '22

20 May '22

Previous commit removed flushing but this causes issues in some games. - add flushing back - move variable creation after initial condition returns in wm_reader_get_stream_sample. This caused some slow down. - Remove EOS sets. Some are not what flushing did before. Had some seg faults on exiting Fallout 3 with them in. I'm not confident on the EOS sets but they seemed to cause issues leaving them in and the commit that removed flushing 5144b27661fcd6705353d832e0383085f8afe842 <https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085…> mentioned it should be done client side. -zlice

2 1

[PATCH 1/5] mshtml: Expose IHTMLDOMImplementation2 members in IE9+ modes.
by Gabriel Ivăncescu 20 May '22

20 May '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 9 ++++++++- dlls/mshtml/tests/documentmode.js | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 9962cc2..4385c4c 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -299,6 +299,12 @@ static const IHTMLDOMImplementation2Vtbl HTMLDOMImplementation2Vtbl = { HTMLDOMImplementation2_hasFeature }; +static void HTMLDOMImplementation_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) +{ + if(compat_mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLDOMImplementation2_tid, NULL); +} + static const tid_t HTMLDOMImplementation_iface_tids[] = { IHTMLDOMImplementation_tid, 0 @@ -307,7 +313,8 @@ static dispex_static_data_t HTMLDOMImplementation_dispex = { L"DOMImplementation", NULL, DispHTMLDOMImplementation_tid, - HTMLDOMImplementation_iface_tids + HTMLDOMImplementation_iface_tids, + HTMLDOMImplementation_init_dispex_info }; HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementation **ret) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 74e871e..eeeb1c8 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -364,6 +364,23 @@ sync_test("window_props", function() { test_exposed("console", v >= 10); }); +sync_test("domimpl_props", function() { + var domimpl = document.implementation; + function test_exposed(prop, expect) { + if(expect) + ok(prop in domimpl, prop + " not found in DOMImplementation."); + else + ok(!(prop in domimpl), prop + " found in DOMImplementation."); + } + + var v = document.documentMode; + + test_exposed("hasFeature", true); + test_exposed("createDocument", v >= 9); + test_exposed("createDocumentType", v >= 9); + test_exposed("createHTMLDocument", v >= 9); +}); + sync_test("xhr_props", function() { var xhr = new XMLHttpRequest(); -- 2.34.1

3 11

Re: winegstream reintroduce parser flushing
by Bernhard Kölbl 20 May '22

20 May '22

Am Fr., 20. Mai 2022 um 15:54 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: > > I think I did the patch right this time? Not really fluent with git. > It's still missing your full name in the "from" line, according to: https://wiki.winehq.org/Submitting_Patches#Check_your_Git_setup > I see the part about needing to be subscribed to the mailing list. > Can I unsub immediately after? > You probably should stay subscribed for the time your patch will be reviewed. > Can send directly to wine-devel again with the patch subject if this looks good. > Sure, and it's probably best to set the E-Mail subject to the commit message. Just look how other patches are submitted. Thanks, Bernhard > Thanks > > On Fri, May 20, 2022 at 9:21 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> This still doesn't meet the requirements for how a patch needs to look like. >> Please check the link I sent, again and rework the patch and mail >> accordingly: i.e. Correct commit message, correct patch format, etc. >> >> Thanks, >> Bernhard >> >> Am Fr., 20. Mai 2022 um 14:34 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: >> > >> > Removed commented blocks, added more verbose comments. >> > >> > On Fri, May 20, 2022 at 3:46 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> >> >> Hi Zlice, >> >> >> >> thanks for your patch. Unfortunately you're missing out on quite a few requirements for this to get accepted. I'd recommend to refactor your submission using this guide as reference: https://wiki.winehq.org/Submitting_Patches and to resend it afterwards. >> >> >> >> E.g. you left in C++ comments, which aren't allowed. >> >> >> >> Thanks, >> >> Bernhard >> >> >> >> >> >> Zlice Z <zlice555(a)gmail.com> schrieb am Fr., 20. Mai 2022, 09:22: >> >>> >> >>> Sent a patch yesterday that was mediocre and barely helps. >> >>> >> >>> commit https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085… >> >>> >> >>> removed flushing from parser, which after commit bisecting turns out to be the cause of Fallout 3 radio chugging every new song. >> >>> >> >>> - re-introduced parser flushing (self explanatory, commit said it's not worth it but it helps here) >> >>> >> >>> - moved some variable initialization in wm_reader.c to after initial conditional returns. these were in a switch-case before in the middle of the function and it seems to be part of the stuttering, wasn't moved in the mentioned commit though >> >>> >> >>> - commented out and left my name by some EOS sets. they used to be checked for EOS 'events' but those references have been changed to 'buffer' and idk what the right action is. wine seemed to randomly seg fault on exit with leaving them on though. suspect they incorrectly guess and set 'end of stream' ?

1 0

[PATCH v3] vbscript: Implement CDate().
by Jacek Caban 20 May '22

20 May '22

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: more tests dlls/vbscript/global.c | 27 +++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-)

1 0

Re: winegstream reintroduce parser flushing
by Bernhard Kölbl 20 May '22

20 May '22

This still doesn't meet the requirements for how a patch needs to look like. Please check the link I sent, again and rework the patch and mail accordingly: i.e. Correct commit message, correct patch format, etc. Thanks, Bernhard Am Fr., 20. Mai 2022 um 14:34 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: > > Removed commented blocks, added more verbose comments. > > On Fri, May 20, 2022 at 3:46 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> Hi Zlice, >> >> thanks for your patch. Unfortunately you're missing out on quite a few requirements for this to get accepted. I'd recommend to refactor your submission using this guide as reference: https://wiki.winehq.org/Submitting_Patches and to resend it afterwards. >> >> E.g. you left in C++ comments, which aren't allowed. >> >> Thanks, >> Bernhard >> >> >> Zlice Z <zlice555(a)gmail.com> schrieb am Fr., 20. Mai 2022, 09:22: >>> >>> Sent a patch yesterday that was mediocre and barely helps. >>> >>> commit https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085… >>> >>> removed flushing from parser, which after commit bisecting turns out to be the cause of Fallout 3 radio chugging every new song. >>> >>> - re-introduced parser flushing (self explanatory, commit said it's not worth it but it helps here) >>> >>> - moved some variable initialization in wm_reader.c to after initial conditional returns. these were in a switch-case before in the middle of the function and it seems to be part of the stuttering, wasn't moved in the mentioned commit though >>> >>> - commented out and left my name by some EOS sets. they used to be checked for EOS 'events' but those references have been changed to 'buffer' and idk what the right action is. wine seemed to randomly seg fault on exit with leaving them on though. suspect they incorrectly guess and set 'end of stream' ?

1 0

[PATCH v2] vbscript: Implement CDate().
by Robert Wilhelm 20 May '22

20 May '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v2: if VT_DATE conversion fails, doing arg -> R8 -> DATE. --- dlls/vbscript/global.c | 29 +++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5280730f19f..d5d3ec585c0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -742,8 +742,33 @@ static HRESULT Global_CByte(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_CDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&v, &v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CDbl(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e5b0ee6d37..a23bb043090 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1183,6 +1183,38 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDateError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDate(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDate(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDate(Empty) = 0, "CDate(Empty) = " & CDate(Empty)) +Call ok(getVT(CDate(Empty)) = "VT_DATE", "getVT(CDate(Empty)) = " & getVT(CDate(Empty))) +Call ok(CDate(0) = 0, "CDate(0) = " & CDate(0)) +Call ok(getVT(CDate(0)) = "VT_DATE", "getVT(CDate(0)) = " & getVT(CDate(0))) +Call ok(CDate(1) = #1899-12-31#, "CDate(1) = " & CDate(1)) +Call ok(getVT(CDate(1)) = "VT_DATE", "getVT(CDate(1)) = " & getVT(CDate(1))) +Call ok(CDate("1") = #1899-12-31#, "CDate(""1"") = " & CDate("1")) +Call ok(getVT(CDate("1")) = "VT_DATE", "getVT(CDate(""1"")) = " & getVT(CDate("1"))) +If isEnglishLang Then + Call ok(CDate("1/1/2000") = #2000-1-1#, "CDate(""1/1/2000"") = " & CDate("1/1/2000")) + Call ok(getVT(CDate("1/1/2000")) = "VT_DATE", "getVT(CDate(""1/1/2000"")) = " & getVT(CDate("1/1/2000"))) +End If +Call ok(CDate(-1) = #1899-12-29#, "CDate(-1) = " & CDate(-1)) +Call ok(getVT(CDate(-1)) = "VT_DATE", "getVT(CDate(-1)) = " & getVT(CDate(-1))) +Call ok(CDate(100000) = #2173-10-14#, "CDate(100000) = " & CDate(100000)) +Call ok(getVT(CDate(100000)) = "VT_DATE", "getVT(CDate(100000)) = " & getVT(CDate(100000))) +Call testCDateError("", 13, 13) +Call testCDateError(null, 94, 94) + Sub testCDblError(strings, error_num1, error_num2) on error resume next Dim x -- 2.36.1

1 0

[PATCH] kernelbase: Add SetThreadInformation().
by Nikolay Sivov 20 May '22

20 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52956 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 19 +++++++++++++++++++ include/processthreadsapi.h | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ca339181e32..cbba3abdba0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1470,6 +1470,7 @@ @ stdcall -import SetThreadGroupAffinity(long ptr ptr) @ stdcall -import SetThreadIdealProcessor(long long) @ stdcall -import SetThreadIdealProcessorEx(long ptr ptr) +@ stdcall -import SetThreadInformation(long long ptr long) @ stdcall -import SetThreadLocale(long) @ stdcall -import SetThreadPreferredUILanguages(long ptr ptr) @ stdcall -import SetThreadPriority(long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 791c3603918..fd9701dd20b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1520,7 +1520,7 @@ @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadIdealProcessorEx(long ptr ptr) -# @ stub SetThreadInformation +@ stdcall SetThreadInformation(long long ptr long) @ stdcall SetThreadLocale(long) @ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 6ba58cf0a67..f11d17748fe 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -606,6 +606,25 @@ LANGID WINAPI DECLSPEC_HOTPATCH SetThreadUILanguage( LANGID langid ) } +/********************************************************************** + * SetThreadInformation (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetThreadInformation( HANDLE thread, THREAD_INFORMATION_CLASS info_class, + VOID *info, DWORD size ) +{ + switch (info_class) + { + case ThreadMemoryPriority: + return set_ntstatus( NtSetInformationThread( thread, ThreadPagePriority, info, size )); + case ThreadPowerThrottling: + return set_ntstatus( NtSetInformationThread( thread, ThreadPowerThrottlingState, info, size )); + default: + FIXME("Unsupported class %u.\n", info_class); + return FALSE; + } +} + + /********************************************************************** * SuspendThread (kernelbase.@) */ diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h index 8cdaff4796a..d266b7a727b 100644 --- a/include/processthreadsapi.h +++ b/include/processthreadsapi.h @@ -23,8 +23,23 @@ extern "C" { #endif +typedef enum _THREAD_INFORMATION_CLASS +{ + ThreadMemoryPriority, + ThreadAbsoluteCpuPriority, + ThreadDynamicCodePolicy, + ThreadPowerThrottling, + ThreadInformationClassMax +} THREAD_INFORMATION_CLASS; + +typedef struct _MEMORY_PRIORITY_INFORMATION +{ + ULONG MemoryPriority; +} MEMORY_PRIORITY_INFORMATION, *PMEMORY_PRIORITY_INFORMATION; + WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *); WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR); +WINBASEAPI BOOL WINAPI SetThreadInformation(HANDLE,THREAD_INFORMATION_CLASS,LPVOID,DWORD); #ifdef __cplusplus } -- 2.35.1

1 0

winegstream reintroduce parser flushing
by Zlice Z 20 May '22

20 May '22

Sent a patch yesterday that was mediocre and barely helps. commit https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085… removed flushing from parser, which after commit bisecting turns out to be the cause of Fallout 3 radio chugging every new song. - re-introduced parser flushing (self explanatory, commit said it's not worth it but it helps here) - moved some variable initialization in wm_reader.c to after initial conditional returns. these were in a switch-case before in the middle of the function and it seems to be part of the stuttering, wasn't moved in the mentioned commit though - commented out and left my name by some EOS sets. they used to be checked for EOS 'events' but those references have been changed to 'buffer' and idk what the right action is. wine seemed to randomly seg fault on exit with leaving them on though. suspect they incorrectly guess and set 'end of stream' ?

3 3

[PATCH] vbscript: Implement CDate().
by Robert Wilhelm 20 May '22

20 May '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 23 +++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 26 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5280730f19f..a6bab83f3e6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -742,8 +742,27 @@ static HRESULT Global_CByte(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_CDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_DATE); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CDbl(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e5b0ee6d37..b84a1fa060b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1183,6 +1183,32 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDateError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDate(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDate(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDate(Empty) = 0, "CDate(Empty) = " & CDate(Empty)) +Call ok(getVT(CDate(Empty)) = "VT_DATE", "getVT(CDate(Empty)) = " & getVT(CDate(Empty))) +Call ok(CDate(0) = 0, "CDate(0) = " & CDate(0)) +Call ok(getVT(CDate(0)) = "VT_DATE", "getVT(CDate(0)) = " & getVT(CDate(0))) +Call ok(CDate(1) = #1899-12-31#, "CDate(1) = " & CDate(1)) +Call ok(getVT(CDate(1)) = "VT_DATE", "getVT(CDate(1)) = " & getVT(CDate(1))) +Call ok(CDate(-1) = #1899-12-29#, "CDate(-1) = " & CDate(-1)) +Call ok(getVT(CDate(-1)) = "VT_DATE", "getVT(CDate(-1)) = " & getVT(CDate(-1))) +Call ok(CDate(100000) = #2173-10-14#, "CDate(100000) = " & CDate(100000)) +Call ok(getVT(CDate(100000)) = "VT_DATE", "getVT(CDate(100000)) = " & getVT(CDate(100000))) +Call testCDateError("", 13, 13) +Call testCDateError(null, 94, 94) + Sub testCDblError(strings, error_num1, error_num2) on error resume next Dim x -- 2.36.1

2 3

Re: [PATCH v2 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Alexandre Julliard (＠julliard) 20 May '22

20 May '22

Alexandre Julliard (@julliard) commented about dlls/ntdll/unix/signal_x86_64.c: > } > > static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ > +#ifdef __APPLE__ > +static USHORT ds32_sel; /* selector for %ds in 32-bit mode */ > +#endif This doesn't seem to be used for anything, do we need it? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/76#note_1056

1 0

[PATCH 0/2] MR102: d3dx9: Build without -DWINE_NO_LONG_TYPES.
by Matteo Bruni (＠Mystral) 20 May '22

20 May '22

Final two patches of the d3dx9 long types conversion. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/102

2 2

[PATCH] msvcr120: Add tests for _StructuredTaskCollection.
by Torge Matthies 20 May '22

20 May '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 269 +++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index a3161266db41..26b363de6c59 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -162,6 +162,27 @@ typedef struct { Context *ctx; } _Context; +typedef struct _StructuredTaskCollection +{ + void *unk1; + unsigned int unk2; + void *unk3; + Context *context; + volatile LONG count; + volatile LONG finished; + void *unk4; + void *event; +} _StructuredTaskCollection; + +typedef struct _UnrealizedChore +{ + const vtable_ptr *vtable; + void (__cdecl *proc)(struct _UnrealizedChore*); + struct _StructuredTaskCollection *task_collection; + void (__cdecl *proc_wrapper)(struct _UnrealizedChore*); + void *unk[6]; +} _UnrealizedChore; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -225,6 +246,11 @@ static void (__thiscall *p__Condition_variable_notify_all)(_Condition_variable*) static Context* (__cdecl *p_Context_CurrentContext)(void); static _Context* (__cdecl *p__Context__CurrentContext)(_Context*); +static _StructuredTaskCollection* (__thiscall *p__StructuredTaskCollection_ctor)(_StructuredTaskCollection*, void*); +static void (__thiscall *p__StructuredTaskCollection_dtor)(_StructuredTaskCollection*); +static void (__thiscall *p__StructuredTaskCollection__Schedule)(_StructuredTaskCollection*, _UnrealizedChore*); +static int (__stdcall *p__StructuredTaskCollection__RunAndWait)(_StructuredTaskCollection*, _UnrealizedChore*); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -279,6 +305,14 @@ static BOOL init(void) SET(p_towctrans, "towctrans"); SET(p__Context__CurrentContext, "?_CurrentContext@_Context@details@Concurrency@@SA?AV123@XZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p__StructuredTaskCollection_ctor, + "??0_StructuredTaskCollection@details@Concurrency@@QEAA@PEAV_CancellationTokenState@12@@Z"); + SET(p__StructuredTaskCollection_dtor, + "??1_StructuredTaskCollection@details@Concurrency@@QEAA@XZ"); + SET(p__StructuredTaskCollection__Schedule, + "?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z"); + SET(p__StructuredTaskCollection__RunAndWait, + "?_RunAndWait@_StructuredTaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z"); SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); SET(p_critical_section_dtor, @@ -313,6 +347,14 @@ static BOOL init(void) "?CurrentContext@Context@Concurrency@@SAPEAV12@XZ"); } else { #ifdef __arm__ + SET(p__StructuredTaskCollection_ctor, + "??0_StructuredTaskCollection@details@Concurrency@@QAA@PAV_CancellationTokenState@12@@Z"); + SET(p__StructuredTaskCollection_dtor, + "??1_StructuredTaskCollection@details@Concurrency@@QAA@XZ"); + SET(p__StructuredTaskCollection__Schedule, + "?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z"); + SET(p__StructuredTaskCollection__RunAndWait, + "?_RunAndWait@_StructuredTaskCollection@details@Concurrency@@QAA?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z"); SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QAA@XZ"); SET(p_critical_section_dtor, @@ -344,6 +386,14 @@ static BOOL init(void) SET(p__Condition_variable_notify_all, "?notify_all@_Condition_variable@details@Concurrency@@QAAXXZ"); #else + SET(p__StructuredTaskCollection_ctor, + "??0_StructuredTaskCollection@details@Concurrency@@QAE@PAV_CancellationTokenState@12@@Z"); + SET(p__StructuredTaskCollection_dtor, + "??1_StructuredTaskCollection@details@Concurrency@@QAE@XZ"); + SET(p__StructuredTaskCollection__Schedule, + "?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z"); + SET(p__StructuredTaskCollection__RunAndWait, + "?_RunAndWait@_StructuredTaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z"); SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QAE@XZ"); SET(p_critical_section_dtor, @@ -1270,6 +1320,224 @@ static void test_CurrentContext(void) ok(ret == &_ctx, "expected %p, got %p\n", &_ctx, ret); } +static void _UnrealizedChore_ctor(_UnrealizedChore *chore, void (__cdecl *proc)(_UnrealizedChore*)) +{ + memset(chore, 0, sizeof(*chore)); + chore->proc = proc; +} + +struct chore +{ + _UnrealizedChore chore; + BOOL executed; + HANDLE start_event; + HANDLE set_event; + HANDLE wait_event; + DWORD main_tid; +}; + +static void __cdecl chore_proc(_UnrealizedChore *_this) +{ + struct chore *chore = CONTAINING_RECORD(_this, struct chore, chore); + + if (chore->start_event) + { + DWORD ret = WaitForSingleObject(chore->start_event, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + } + + ok(!chore->executed, "Chore was already executed\n"); + + if (chore->main_tid) + { + ok(GetCurrentThreadId() == chore->main_tid, + "Main chore is not running on the main thread: 0x%lx != 0x%lx\n", + GetCurrentThreadId(), chore->main_tid); + } + + if (!chore->wait_event) + chore->executed = TRUE; + + if (chore->set_event) + { + BOOL b = SetEvent(chore->set_event); + ok(b, "SetEvent failed\n"); + } + + if (chore->wait_event) + { + DWORD ret = WaitForSingleObject(chore->wait_event, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + chore->executed = TRUE; + } +} + +static void chore_ctor(struct chore *chore) +{ + memset(chore, 0, sizeof(*chore)); + _UnrealizedChore_ctor(&chore->chore, chore_proc); +} + +static void test_StructuredTaskCollection(void) +{ + HANDLE chore_start_evt, chore_evt1, chore_evt2; + _StructuredTaskCollection task_coll; + struct chore chore1, chore2; + DWORD main_thread_id; + Context *context; + int status; + DWORD ret; + BOOL b; + + main_thread_id = GetCurrentThreadId(); + context = p_Context_CurrentContext(); + + memset(&task_coll, 0x55, sizeof(task_coll)); + if (!call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL)) + { + skip("_StructuredTaskCollection constructor not implemented\n"); + return; + } + ok(task_coll.unk2 == 0x1fffffff, + "_StructuredTaskCollection ctor set wrong unk2: 0x%x != 0x1fffffff\n", task_coll.unk2); + ok(task_coll.unk3 == NULL, + "_StructuredTaskCollection ctor set wrong unk3: %p != NULL\n", task_coll.unk3); + ok(task_coll.context == NULL, + "_StructuredTaskCollection ctor set wrong context: %p != NULL\n", task_coll.context); + ok(task_coll.count == 0, + "_StructuredTaskCollection ctor set wrong count: %ld != 0\n", task_coll.count); + ok(task_coll.finished == LONG_MIN, + "_StructuredTaskCollection ctor set wrong finished: %ld != %ld\n", task_coll.finished, LONG_MIN); + ok(task_coll.unk4 == NULL, + "_StructuredTaskCollection ctor set wrong unk4: %p != NULL\n", task_coll.unk4); + + chore_start_evt = CreateEventW(NULL, TRUE, FALSE, NULL); + ok(chore_start_evt != NULL, "CreateEvent failed: 0x%lx\n", GetLastError()); + chore_evt1 = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(chore_evt1 != NULL, "CreateEvent failed: 0x%lx\n", GetLastError()); + chore_evt2 = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(chore_evt2 != NULL, "CreateEvent failed: 0x%lx\n", GetLastError()); + + /* test running chores (only main) */ + chore_ctor(&chore1); + chore1.main_tid = main_thread_id; + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, &chore1.chore); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Scheduled chore was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test running chores (main + scheduled) */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.start_event = chore_start_evt; + chore_ctor(&chore2); + chore2.main_tid = main_thread_id; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, &chore2.chore); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Scheduled chore was not executed\n"); + ok(chore2.executed, "Main chore was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test that scheduled chores may run in parallel */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.start_event = chore_start_evt; + chore1.set_event = chore_evt2; + chore1.wait_event = chore_evt1; + chore_ctor(&chore2); + chore2.start_event = chore_start_evt; + chore2.set_event = chore_evt1; + chore2.wait_event = chore_evt2; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore2.chore); + ok(chore2.chore.task_collection == &task_coll, "Wrong chore #2 task_collection: expected %p, actual %p\n", + &task_coll, chore2.chore.task_collection); + ok(chore2.chore.proc_wrapper != NULL, "Chore #2 proc_wrapper was not set\n"); + ok(task_coll.count == 2, "Wrong chore count: %ld != 2\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Chore #1 was not executed\n"); + ok(chore2.executed, "Chore #2 was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test that scheduled chores are executed even if _RunAndWait is not called */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore_ctor(&chore1); + chore1.start_event = chore_start_evt; + chore1.set_event = chore_evt1; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + ret = WaitForSingleObject(chore_evt1, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", ret); + ok(chore1.executed, "Chore was not executed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.chore.task_collection == NULL, "Chore's task collection was not reset after execution\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* test that finished chores can be scheduled again */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + ResetEvent(chore_start_evt); + chore1.set_event = NULL; + chore1.executed = FALSE; + + call_func2(p__StructuredTaskCollection__Schedule, &task_coll, &chore1.chore); + ok(chore1.chore.task_collection == &task_coll, "Wrong chore #1 task_collection: expected %p, actual %p\n", + &task_coll, chore1.chore.task_collection); + ok(chore1.chore.proc_wrapper != NULL, "Chore #1 proc_wrapper was not set\n"); + ok(task_coll.count == 1, "Wrong chore count: %ld != 1\n", task_coll.count); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + + b = SetEvent(chore_start_evt); + ok(b, "SetEvent failed\n"); + + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 1, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(chore1.executed, "Chore was not executed\n"); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + CloseHandle(chore_start_evt); + CloseHandle(chore_evt1); + CloseHandle(chore_evt2); +} + START_TEST(msvcr120) { if (!init()) return; @@ -1292,4 +1560,5 @@ START_TEST(msvcr120) test_nexttoward(); test_towctrans(); test_CurrentContext(); + test_StructuredTaskCollection(); } -- 2.36.1

2 1

[PATCH 1/4] wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger 20 May '22

20 May '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/resource.c | 11 ++++++++++- dlls/wined3d/surface.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7fefd516908..fe77923f778 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -616,13 +616,22 @@ void *resource_offset_map_pointer(struct wined3d_resource *resource, unsigned in void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_map_desc *map, const struct wined3d_color *colour, - const struct wined3d_box *box) + const struct wined3d_box *box, bool full_subresource) { const struct wined3d_format *format = resource->format; unsigned int w, h, d, x, y, z, bpp; uint8_t *dst, *dst2; uint32_t c[4]; + /* Fast and simple path for setting everything to zero. The C library's memset is + * more sophisticated than our code below. Also this works for block formats, which + * we still need to zero-initialize for newly created resources. */ + if (full_subresource && !colour->r && !colour->g && !colour->b && !colour->a) + { + memset(map->data, 0, map->slice_pitch * box->back); + return; + } + w = box->right - box->left; h = box->bottom - box->top; d = box->back - box->front; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29bdef9844f..96aacb78e77 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1181,8 +1181,10 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, struct wined3d_context *context; struct wined3d_texture *texture; struct wined3d_bo_address data; + struct wined3d_box level_box; struct wined3d_map_desc map; struct wined3d_range range; + bool full_subresource; unsigned int level; DWORD map_binding; @@ -1208,6 +1210,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, texture = texture_from_resource(view->resource); level = view->sub_resource_idx % texture->level_count; + wined3d_texture_get_level_box(texture_from_resource(view->resource), level, &level_box); + full_subresource = !memcmp(box, &level_box, sizeof(*box)); map_binding = texture->resource.map_binding; if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) @@ -1220,7 +1224,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, range.offset = 0; range.size = texture->sub_resources[view->sub_resource_idx].size; - wined3d_resource_memory_colour_fill(view->resource, &map, colour, box); + wined3d_resource_memory_colour_fill(view->resource, &map, colour, box, full_subresource); wined3d_context_unmap_bo_address(context, &data, 1, &range); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d8bb40cec4..aef0e9341b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4428,7 +4428,7 @@ BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_map_desc *map, const struct wined3d_color *colour, - const struct wined3d_box *box) DECLSPEC_HIDDEN; + const struct wined3d_box *box, bool full_subresource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -- 2.35.1

3 6

[v2 PATCH 5/5] ntdll/tests: Add a basic test for MEM_RESERVE_PLACEHOLDER.
by Nikolay Sivov 20 May '22

20 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fix test failure on some systems dlls/ntdll/tests/virtual.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 74e3facca13..f8bb3e97c86 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -264,6 +264,12 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed %lx\n", status); ok( size == 0x10000, "wrong size %Ix\n", size ); ok( addr2 == addr1, "wrong addr %p\n", addr2 ); + + /* Placeholder functionality */ + size = 0x10000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS); + ok(!!status, "Unexpected status %08lx.\n", status); } static void test_NtAllocateVirtualMemoryEx(void) @@ -298,6 +304,24 @@ static void test_NtAllocateVirtualMemoryEx(void) addr1 = NULL; status = pNtAllocateVirtualMemoryEx(NULL, &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 0); ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx.\n", status); + + /* Placeholder functionality */ + size = 0x10000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (addr1) + { + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } } struct test_stack_size_thread_args -- 2.35.1

1 0

[PATCH 1/5] ntdll/tests: Add a bit more tests for VM functions.
by Nikolay Sivov 20 May '22

20 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 43 +++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index aeef2ed8fb9..74e3facca13 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -264,6 +264,13 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed %lx\n", status); ok( size == 0x10000, "wrong size %Ix\n", size ); ok( addr2 == addr1, "wrong addr %p\n", addr2 ); +} + +static void test_NtAllocateVirtualMemoryEx(void) +{ + void *addr1, *addr2; + NTSTATUS status; + SIZE_T size; if (!pNtAllocateVirtualMemoryEx) { @@ -271,17 +278,26 @@ static void test_NtAllocateVirtualMemory(void) return; } - /* simple allocation should succeed */ size = 0x1000; addr1 = NULL; status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 0); - ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemoryEx returned %08lx\n", status); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); /* specifying a count of >0 with NULL parameters should fail */ status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 1); - ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08lx\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + /* NULL process handle */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx(NULL, &addr1, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE, NULL, 0); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx.\n", status); } struct test_stack_size_thread_args @@ -1279,6 +1295,25 @@ static void test_syscalls(void) UnmapViewOfFile( ptr ); } +static void test_NtFreeVirtualMemory(void) +{ + NTSTATUS status; + void *addr1; + SIZE_T size; + + size = 0x10000; + addr1 = NULL; + status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr1, 0, &size, MEM_RESERVE, PAGE_READWRITE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + size = 0; + status = NtFreeVirtualMemory(NULL, &addr1, &size, MEM_RELEASE); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx.\n", status); + + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); +} + START_TEST(virtual) { HMODULE mod; @@ -1315,6 +1350,8 @@ START_TEST(virtual) if (!pIsWow64Process || !pIsWow64Process(NtCurrentProcess(), &is_wow64)) is_wow64 = FALSE; test_NtAllocateVirtualMemory(); + test_NtAllocateVirtualMemoryEx(); + test_NtFreeVirtualMemory(); test_RtlCreateUserStack(); test_NtMapViewOfSection(); test_NtMapViewOfSectionEx(); -- 2.35.1

2 5

[PATCH 4/5] mshtml: Protect storage with a mutex.
by Hans Leidekker 20 May '22

20 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 993d3f5b207..602d820079b 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -191,9 +191,21 @@ static WCHAR *build_filename(const WCHAR *hostname) return ret; } +static WCHAR *build_mutexname(const WCHAR *filename) +{ + WCHAR *ret, *ptr; + ret = wcsdup(filename); + if(!ret) + return NULL; + for(ptr = ret; *ptr; ptr++) + if(*ptr == '\\') *ptr = '_'; + return ret; +} + struct storage { WCHAR *filename; IXMLDOMDocument *doc; + HANDLE mutex; }; static void close_storage(struct storage *storage) @@ -201,6 +213,8 @@ static void close_storage(struct storage *storage) free(storage->filename); if(storage->doc) IXMLDOMDocument_Release(storage->doc); + ReleaseMutex(storage->mutex); + CloseHandle(storage->mutex); free(storage); } @@ -210,7 +224,7 @@ static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) HRESULT hres = E_OUTOFMEMORY; VARIANT var; VARIANT_BOOL success; - WCHAR *ptr; + WCHAR *mutexname, *ptr; storage = calloc(1, sizeof(*storage)); if(!storage) @@ -220,6 +234,18 @@ static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) if(!storage->filename) goto done; + mutexname = build_mutexname(storage->filename); + if(!mutexname) + goto done; + + storage->mutex = CreateMutexW(NULL, FALSE, mutexname); + free(mutexname); + if(!storage->mutex) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + WaitForSingleObject(storage->mutex, INFINITE); + *(ptr = wcsrchr(storage->filename, '\\')) = 0; if(!create_path(storage->filename)) { hres = E_FAIL; -- 2.30.2

2 1

[PATCH 3/5] mshtml: Implement HTMLStorage_removeItem().
by Hans Leidekker 20 May '22

20 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 59 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index c19eecaf684..993d3f5b207 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -505,11 +505,66 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST return hres; } +static HRESULT remove_item(BSTR hostname, BSTR key) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_removeChild(root, node, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); - return E_NOTIMPL; + BSTR hostname; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + + if(!This->window) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = remove_item(hostname, bstrKey); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) -- 2.30.2

2 1

[PATCH 2/5] mshtml: Implement HTMLStorage_setItem().
by Hans Leidekker 20 May '22

20 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 117 +++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index fb433fa28b9..c19eecaf684 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -385,11 +385,124 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return hres; } +static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value) +{ + BSTR str; + VARIANT var; + HRESULT hres; + + str = SysAllocString(name); + if(!str) + return E_OUTOFMEMORY; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = value; + + hres = IXMLDOMElement_setAttribute(elem, str, var); + + SysFreeString(str); + return hres; +} + +static HRESULT save_storage(struct storage *storage) +{ + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(storage->filename); + if(!V_BSTR(&var)) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_save(storage->doc, var); + SysFreeString(V_BSTR(&var)); + return hres; +} + +static HRESULT set_item(BSTR hostname, BSTR key, BSTR value) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + }else { + BSTR str = SysAllocString(L"item"); + hres = IXMLDOMDocument_createElement(storage->doc, str, &elem); + SysFreeString(str); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"name", key); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + + hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); - return E_NOTIMPL; + BSTR hostname; + HRESULT hres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + + if(!This->window) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = set_item(hostname, bstrKey, bstrValue); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) -- 2.30.2

2 1

[PATCH 1/5] mshtml: Implement HTMLStorage_getItem().
by Hans Leidekker 20 May '22

20 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 244 ++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 242 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 95f7ae5cd16..fb433fa28b9 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "shlobj.h" #include "wine/debug.h" @@ -35,6 +36,7 @@ typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; LONG ref; + HTMLInnerWindow *window; } HTMLStorage; static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) @@ -121,6 +123,151 @@ static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } +static BOOL create_path(const WCHAR *path) +{ + BOOL ret = TRUE; + WCHAR *new_path; + int len; + + new_path = malloc((wcslen(path) + 1) * sizeof(WCHAR)); + if(!new_path) + return FALSE; + wcscpy(new_path, path); + + while((len = wcslen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while(!CreateDirectoryW(new_path, NULL)) { + WCHAR *slash; + DWORD error = GetLastError(); + if(error == ERROR_ALREADY_EXISTS) break; + if(error != ERROR_PATH_NOT_FOUND) { + ret = FALSE; + break; + } + slash = wcsrchr(new_path, '\\'); + if(!slash) { + ret = FALSE; + break; + } + len = slash - new_path; + new_path[len] = 0; + if(!create_path(new_path)) { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + free(new_path); + return ret; +} + +static WCHAR *build_filename(const WCHAR *hostname) +{ + static const WCHAR store[] = L"\\Microsoft\\Internet Explorer\\DOMStore\\"; + WCHAR path[MAX_PATH], *ret; + int len; + + if(!SHGetSpecialFolderPathW(NULL, path, CSIDL_LOCAL_APPDATA, TRUE)) { + ERR("Can't get folder path %lu\n", GetLastError()); + return NULL; + } + + len = wcslen(path); + if(len + ARRAY_SIZE(store) > ARRAY_SIZE(path)) { + ERR("Path too long\n"); + return NULL; + } + memcpy(path + len, store, sizeof(store)); + + len += ARRAY_SIZE(store); + ret = malloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); + if(!ret) + return NULL; + + wcscpy(ret, path); + wcscat(ret, hostname); + wcscat(ret, L".xml"); + return ret; +} + +struct storage { + WCHAR *filename; + IXMLDOMDocument *doc; +}; + +static void close_storage(struct storage *storage) +{ + free(storage->filename); + if(storage->doc) + IXMLDOMDocument_Release(storage->doc); + free(storage); +} + +static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) +{ + struct storage *storage; + HRESULT hres = E_OUTOFMEMORY; + VARIANT var; + VARIANT_BOOL success; + WCHAR *ptr; + + storage = calloc(1, sizeof(*storage)); + if(!storage) + return E_OUTOFMEMORY; + + storage->filename = build_filename(hostname); + if(!storage->filename) + goto done; + + *(ptr = wcsrchr(storage->filename, '\\')) = 0; + if(!create_path(storage->filename)) { + hres = E_FAIL; + goto done; + } + *ptr = '\\'; + + if(GetFileAttributesW(storage->filename) == INVALID_FILE_ATTRIBUTES) { + DWORD count; + HANDLE file = CreateFileW(storage->filename, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if(!WriteFile(file, "<root/>", sizeof("<root/>") - 1, &count, NULL)) { + CloseHandle(file); + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + CloseHandle(file); + } + + hres = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&storage->doc); + if(hres != S_OK) + goto done; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(storage->filename); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMDocument_load(storage->doc, var, &success); + if(hres == S_FALSE || success == VARIANT_FALSE) + hres = E_FAIL; + + SysFreeString(V_BSTR(&var)); + +done: + if(hres != S_OK) + close_storage(storage); + else + *ret = storage; + + return hres; +} + static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); @@ -142,14 +289,100 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +static BSTR build_query(const WCHAR *key) +{ + static const WCHAR fmt[] = L"item[@name='%s']"; + const WCHAR *str = key ? key : L""; + UINT len = ARRAY_SIZE(fmt) + wcslen(str); + BSTR ret = SysAllocStringLen(NULL, len); + + if(ret) swprintf(ret, len, fmt, str); + return ret; +} + +static HRESULT get_root_node(IXMLDOMDocument *doc, IXMLDOMNode **root) +{ + HRESULT hres; + BSTR str; + + str = SysAllocString(L"root"); + if(!str) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_selectSingleNode(doc, str, root); + SysFreeString(str); + return hres; +} + +static HRESULT get_item(BSTR hostname, BSTR key, VARIANT *value) +{ + struct storage *storage; + BSTR query = NULL; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"value", value); + }else { + V_VT(value) = VT_NULL; + hres = S_OK; + } + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + BSTR hostname; + HRESULT hres; - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); - V_VT(p) = VT_NULL; - return S_OK; + if(!value) + return E_POINTER; + + if(!This->window) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = get_item(hostname, bstrKey, value); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) @@ -201,7 +434,7 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) +HRESULT create_html_storage(compat_mode_t compat_mode, HTMLInnerWindow *window, IHTMLStorage **p) { HTMLStorage *storage; @@ -211,6 +444,7 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; + storage->window = window; init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); *p = &storage->IHTMLStorage_iface; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ecd530db7e2..57388ae64a2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,7 +2143,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->session_storage); + NULL, &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->local_storage); + This->inner_window, &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a94f1be1969..0fed06b8aae 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -941,7 +941,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,HTMLInnerWindow*,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 5/5] mshtml/tests: Add HTMLStorage tests.
by Hans Leidekker 20 May '22

20 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/tests/misc.c | 190 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1702a24c804..7526fa997d2 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "optary.h" @@ -106,11 +107,200 @@ static void test_HTMLLoadOptions(void) IHtmlLoadOptions_Release(loadopts); } +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) +{ + BSTR url; + IBindCtx *bc; + IMoniker *url_mon; + IPersistMoniker *persist_mon; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = CreateBindCtx(0, &bc); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); + + url = SysAllocString(start_url); + hres = CreateURLMoniker(NULL, url, &url_mon); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, + (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, + (void**)&persist_mon); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); + + hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, + STGM_SHARE_EXCLUSIVE | STGM_READWRITE); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); + + IPersistMoniker_Release(persist_mon); + IMoniker_Release(url_mon); + IBindCtx_Release(bc); + SysFreeString(url); + return doc; +} + +static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) +{ + IHTMLWindow2 *window; + IHTMLWindow6 *window6; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return hres; + } + + hres = IHTMLWindow6_get_localStorage(window6, storage); + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + + IHTMLWindow6_Release(window6); + return hres; +} + +static void test_HTMLStorage(void) +{ + IHTMLDocument2 *doc, *doc2; + IHTMLStorage *storage, *storage2; + VARIANT var; + BSTR key, value; + HRESULT hres; + + doc = create_doc_from_url(L"http://www.codeweavers.com/"); + doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); + + hres = get_localstorage(doc, &storage); + ok(hres == S_OK, "got: %08lx\n", hres); + + hres = get_localstorage(doc2, &storage2); + ok(hres == S_OK, "got: %08lx\n", hres); + + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + value = SysAllocString(L"null"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + SysFreeString(value); + + key = SysAllocString(L"winetest"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + /* retrieve value from different storage instance */ + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"winetest"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + SysFreeString(value); + + /* item doesn't exist */ + key = SysAllocString(L"nosuch"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + + hres = IHTMLStorage_getItem(storage, NULL, NULL); + ok(hres == E_POINTER, "getItem returned: %08lx\n", hres); + + hres = IHTMLStorage_getItem(storage, key, NULL); + ok(hres == E_POINTER, "getItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, NULL, &var); + ok(hres == S_OK, "getItem returned: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage, NULL, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + key = SysAllocString(L"winetest2"); + hres = IHTMLStorage_setItem(storage, key, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_setItem(storage, NULL, key); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + /* Unicode characters */ + key = SysAllocString(L"winetest"); + value = SysAllocString(L"\x20ac"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + key = SysAllocString(L"\x20ac"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + IHTMLStorage_Release(storage); + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc); + IHTMLDocument2_Release(doc2); +} + START_TEST(misc) { CoInitialize(NULL); test_HTMLLoadOptions(); + test_HTMLStorage(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH 0/4] MR40: mfplat: Consolidate stream and file IMFByteStream methods
by Andrew Eikum (＠aeikum) 20 May '22

20 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/40

3 7

[PATCH v3 1/3] d2d1/tests: Introduce create_factory().
by Ziqing Hui 20 May '22

20 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 49 ++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 035915491fd..663fc150df8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10069,6 +10069,36 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } +static void *create_factory(const GUID *iid, UINT32 *factory_version) +{ + IUnknown *factory, *tmp; + unsigned int i; + + static const GUID *const factory_iid[] = + { + &IID_ID2D1Factory, + &IID_ID2D1Factory1, + &IID_ID2D1Factory2, + &IID_ID2D1Factory3, + }; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, iid, NULL, (void **)&factory))) + return NULL; + + if (factory_version) + { + for (i = 0; i < ARRAY_SIZE(factory_iid); ++i) + { + if (FAILED(IUnknown_QueryInterface(factory, factory_iid[i], (void **)&tmp))) + break; + IUnknown_Release(tmp); + } + *factory_version = i - 1; + } + + return factory; +} + static void test_effect(BOOL d3d11) { unsigned int i, j, min_inputs, max_inputs, str_size, input_count, factory_version; @@ -10077,9 +10107,7 @@ static void test_effect(BOOL d3d11) ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; - ID2D1Factory1 *factory1; - ID2D1Factory2 *factory2; - ID2D1Factory3 *factory3; + ID2D1Factory1 *factory; ID2D1Bitmap *bitmap; ID2D1Effect *effect; D2D1_SIZE_U size; @@ -10109,23 +10137,12 @@ static void test_effect(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory1))) + if (!(factory = create_factory(&IID_ID2D1Factory1, &factory_version))) { win_skip("ID2D1Factory1 is not supported.\n"); release_test_context(&ctx); return; } - factory_version = 1; - if (SUCCEEDED(ID2D1Factory1_QueryInterface(factory1, &IID_ID2D1Factory2, (void **)&factory2))) - { - ID2D1Factory2_Release(factory2); - factory_version = 2; - } - if (SUCCEEDED(ID2D1Factory1_QueryInterface(factory1, &IID_ID2D1Factory3, (void **)&factory3))) - { - ID2D1Factory3_Release(factory3); - factory_version = 3; - } if (factory_version < 3) win_skip("ID2D1Factory%u is not supported.\n", factory_version + 1); @@ -10275,7 +10292,7 @@ static void test_effect(BOOL d3d11) } ID2D1DeviceContext_Release(context); - ID2D1Factory1_Release(factory1); + ID2D1Factory1_Release(factory); release_test_context(&ctx); } -- 2.25.1

3 7

[PATCH v2 0/3] MR95: combase: Try loading WinRT activatable classes from the activation context path.
by Rémi Bernon (＠rbernon) 20 May '22

20 May '22

-- v2: combase: Lookup activatable class library in the activation context. combase: Use CRT memory allocation functions. kernel32/tests: Mark activatableClass wrong xmlns test as broken on w1064v1909. https://gitlab.winehq.org/wine/wine/-/merge_requests/95

3 4

[PATCH 0/6] MR100: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 20 May '22

20 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/100

3 10

[PATCH 1/5] wined3d: Move kernel mode adapter handle from wined3d_output to wined3d_adapter.
by Zhiyi Zhang 20 May '22

20 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 24 +++++++++++++++--------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9a62c6997a..5b65e3b49f9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -103,14 +103,11 @@ HRESULT CDECL wined3d_output_take_ownership(const struct wined3d_output *output, static void wined3d_output_cleanup(const struct wined3d_output *output) { D3DKMT_DESTROYDEVICE destroy_device_desc; - D3DKMT_CLOSEADAPTER close_adapter_desc; TRACE("output %p.\n", output); destroy_device_desc.hDevice = output->kmt_device; D3DKMTDestroyDevice(&destroy_device_desc); - close_adapter_desc.hAdapter = output->kmt_adapter; - D3DKMTCloseAdapter(&close_adapter_desc); } static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int ordinal, @@ -125,20 +122,17 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int o lstrcpyW(open_adapter_desc.DeviceName, device_name); if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc)) return E_INVALIDARG; + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + D3DKMTCloseAdapter(&close_adapter_desc); - create_device_desc.u.hAdapter = open_adapter_desc.hAdapter; + create_device_desc.u.hAdapter = adapter->kmt_adapter; if (D3DKMTCreateDevice(&create_device_desc)) - { - close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; - D3DKMTCloseAdapter(&close_adapter_desc); return E_FAIL; - } output->ordinal = ordinal; lstrcpyW(output->device_name, device_name); output->adapter = adapter; output->screen_format = WINED3DFMT_UNKNOWN; - output->kmt_adapter = open_adapter_desc.hAdapter; output->kmt_device = create_device_desc.hDevice; output->vidpn_source_id = open_adapter_desc.VidPnSourceId; @@ -166,12 +160,15 @@ ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t si void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { + D3DKMT_CLOSEADAPTER close_adapter_desc; unsigned int output_idx; for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) wined3d_output_cleanup(&adapter->outputs[output_idx]); heap_free(adapter->outputs); heap_free(adapter->formats); + close_adapter_desc.hAdapter = adapter->kmt_adapter; + D3DKMTCloseAdapter(&close_adapter_desc); } ULONG CDECL wined3d_incref(struct wined3d *wined3d) @@ -3222,7 +3219,9 @@ static BOOL wined3d_adapter_create_output(struct wined3d_adapter *adapter, const BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const LUID *luid, const struct wined3d_adapter_ops *adapter_ops) { + D3DKMT_OPENADAPTERFROMLUID open_adapter_desc; unsigned int output_idx = 0, primary_idx = 0; + D3DKMT_CLOSEADAPTER close_adapter_desc; DISPLAY_DEVICEW display_device; BOOL ret = FALSE; @@ -3245,6 +3244,11 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, } TRACE("adapter %p LUID %08x:%08x.\n", adapter, adapter->luid.HighPart, adapter->luid.LowPart); + open_adapter_desc.AdapterLuid = adapter->luid; + if (D3DKMTOpenAdapterFromLuid(&open_adapter_desc)) + return FALSE; + adapter->kmt_adapter = open_adapter_desc.hAdapter; + display_device.cb = sizeof(display_device); while (EnumDisplayDevicesW(NULL, output_idx++, &display_device, 0)) { @@ -3282,6 +3286,8 @@ done: for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) wined3d_output_cleanup(&adapter->outputs[output_idx]); heap_free(adapter->outputs); + close_adapter_desc.hAdapter = adapter->kmt_adapter; + D3DKMTCloseAdapter(&close_adapter_desc); } return ret; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d8bb40cec4..00d2cfea8e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3498,7 +3498,6 @@ struct wined3d_output struct wined3d_adapter *adapter; enum wined3d_format_id screen_format; - D3DKMT_HANDLE kmt_adapter; D3DKMT_HANDLE kmt_device; D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; @@ -3521,6 +3520,7 @@ struct wined3d_adapter struct wined3d_driver_info driver_info; struct wined3d_output *outputs; unsigned int output_count; + D3DKMT_HANDLE kmt_adapter; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; -- 2.34.1

2 1

[PATCH 2/5] dxgi: Implement dxgi_adapter_QueryVideoMemoryInfo() with D3DKMTQueryVideoMemoryInfo().
by Zhiyi Zhang 20 May '22

20 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 49 ++++++++++++-------------------- dlls/wined3d/directx.c | 59 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 17 +++++++++++ 4 files changed, 95 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 8962c082c17..20c017eba08 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -21,6 +21,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static void dxgi_video_memory_info_from_wined3d(DXGI_QUERY_VIDEO_MEMORY_INFO *info, + const struct wined3d_video_memory_info *wined3d_info) +{ + info->Budget = wined3d_info->budget; + info->CurrentUsage = wined3d_info->current_usage; + info->CurrentReservation = wined3d_info->current_reservation; + info->AvailableForReservation = wined3d_info->available_reservation; +} + static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface) { return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface); @@ -292,44 +301,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *info) { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - struct wined3d_adapter_identifier adapter_id; - static unsigned int once; + struct wined3d_video_memory_info wined3d_info; HRESULT hr; TRACE("iface %p, node_index %u, segment_group %#x, info %p.\n", iface, node_index, segment_group, info); - if (!once++) - FIXME("Returning fake video memory info.\n"); - - if (node_index) - FIXME("Ignoring node index %u.\n", node_index); - - adapter_id.driver_size = 0; - adapter_id.description_size = 0; - - if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) - return hr; - - switch (segment_group) + if (SUCCEEDED(hr = wined3d_adapter_get_video_memory_info(adapter->wined3d_adapter, node_index, + (enum wined3d_memory_segment_group)segment_group, &wined3d_info))) { - case DXGI_MEMORY_SEGMENT_GROUP_LOCAL: - info->Budget = adapter_id.video_memory; - info->CurrentUsage = 0; - info->AvailableForReservation = adapter_id.video_memory / 2; - info->CurrentReservation = 0; - break; - case DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL: - memset(info, 0, sizeof(*info)); - break; - default: - WARN("Invalid memory segment group %#x.\n", segment_group); - return E_INVALIDARG; - } + dxgi_video_memory_info_from_wined3d(info, &wined3d_info); - TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", - wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), - wine_dbgstr_longlong(info->AvailableForReservation), wine_dbgstr_longlong(info->CurrentReservation)); + TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", + wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), + wine_dbgstr_longlong(info->AvailableForReservation), + wine_dbgstr_longlong(info->CurrentReservation)); + } return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b65e3b49f9..f8a44be0b3e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -987,6 +987,65 @@ unsigned int CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter return adapter->output_count; } +HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, + unsigned int node_idx, enum wined3d_memory_segment_group group, + struct wined3d_video_memory_info *info) +{ + static unsigned int once; + D3DKMT_QUERYVIDEOMEMORYINFO query_memory_info; + struct wined3d_adapter_identifier adapter_id; + NTSTATUS status; + HRESULT hr; + + TRACE("adapter %p, node_idx %u, group %d, info %p.\n", adapter, node_idx, group, info); + + if (group > WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL) + { + WARN("Invalid memory segment group %#x.\n", group); + return E_INVALIDARG; + } + + query_memory_info.hProcess = NULL; + query_memory_info.hAdapter = adapter->kmt_adapter; + query_memory_info.PhysicalAdapterIndex = node_idx; + query_memory_info.MemorySegmentGroup = (D3DKMT_MEMORY_SEGMENT_GROUP)group; + status = D3DKMTQueryVideoMemoryInfo(&query_memory_info); + if (status == STATUS_SUCCESS) + { + info->budget = query_memory_info.Budget; + info->current_usage = query_memory_info.CurrentUsage; + info->current_reservation = query_memory_info.CurrentReservation; + info->available_reservation = query_memory_info.AvailableForReservation; + return WINED3D_OK; + } + + /* D3DKMTQueryVideoMemoryInfo() failed, fallback to fake memory info */ + if (!once++) + FIXME("Returning fake video memory info.\n"); + + if (node_idx) + FIXME("Ignoring node index %u.\n", node_idx); + + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + if (FAILED(hr = wined3d_adapter_get_identifier(adapter, 0, &adapter_id))) + return hr; + + switch (group) + { + case WINED3D_MEMORY_SEGMENT_GROUP_LOCAL: + info->budget = adapter_id.video_memory; + info->current_usage = 0; + info->available_reservation = adapter_id.video_memory / 2; + info->current_reservation = 0; + break; + case WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL: + memset(info, 0, sizeof(*info)); + break; + } + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1b1c82f90bb..845ca0fb170 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -21,6 +21,7 @@ @ cdecl wined3d_adapter_get_identifier(ptr long ptr) @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) +@ cdecl wined3d_adapter_get_video_memory_info(ptr long long ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ee241ab3b1d..2b7a626f751 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -876,6 +876,12 @@ enum wined3d_pipeline WINED3D_PIPELINE_COUNT, }; +enum wined3d_memory_segment_group +{ + WINED3D_MEMORY_SEGMENT_GROUP_LOCAL = 0, + WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1, +}; + #define WINED3DCOLORWRITEENABLE_RED (1u << 0) #define WINED3DCOLORWRITEENABLE_GREEN (1u << 1) #define WINED3DCOLORWRITEENABLE_BLUE (1u << 2) @@ -1765,6 +1771,14 @@ struct wined3d_adapter_identifier SIZE_T shared_system_memory; }; +struct wined3d_video_memory_info +{ + UINT64 budget; + UINT64 current_usage; + UINT64 current_reservation; + UINT64 available_reservation; +}; + struct wined3d_swapchain_desc { struct wined3d_output *output; @@ -2347,6 +2361,9 @@ HRESULT __cdecl wined3d_adapter_get_identifier(const struct wined3d_adapter *ada struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, unsigned int idx); unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); +HRESULT __cdecl wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, + unsigned int node_idx, enum wined3d_memory_segment_group group, + struct wined3d_video_memory_info *info); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.34.1

2 1

[PATCH 4/5] dxgi/tests: Test adapter video memory budget notification.
by Zhiyi Zhang 20 May '22

20 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a199ba486ba..04bba29e8e5 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7514,6 +7514,66 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) DestroyWindow(window); } +static void test_video_memory_budget_notification(void) +{ + DXGI_QUERY_VIDEO_MEMORY_INFO memory_info; + IDXGIAdapter3 *adapter3; + IDXGIAdapter *adapter; + IDXGIDevice *device; + DWORD cookie, ret; + ULONG refcount; + HANDLE event; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter3, (void **)&adapter3); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); + if (hr == E_NOINTERFACE) + goto done; + + hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, NULL, &cookie); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, NULL); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); + + hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, &cookie); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (!memory_info.Budget) + { + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &memory_info); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } + if (memory_info.Budget) + { + ret = WaitForSingleObject(event, 1000); + todo_wine + ok(ret == WAIT_OBJECT_0, "Expected event fired.\n"); + } + + IDXGIAdapter3_UnregisterVideoMemoryBudgetChangeNotification(adapter3, cookie); + IDXGIAdapter3_Release(adapter3); + CloseHandle(event); + +done: + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -7613,6 +7673,7 @@ START_TEST(dxgi) queue_test(test_output_desc); queue_test(test_object_wrapping); queue_test(test_factory_check_feature_support); + queue_test(test_video_memory_budget_notification); run_queued_tests(); -- 2.34.1

3 2

[PATCH 3/5] wined3d: Fill fake adapter video memory usage.
by Zhiyi Zhang 20 May '22

20 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f8a44be0b3e..8c58a346add 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1035,7 +1035,7 @@ HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter { case WINED3D_MEMORY_SEGMENT_GROUP_LOCAL: info->budget = adapter_id.video_memory; - info->current_usage = 0; + info->current_usage = adapter->vram_bytes_used; info->available_reservation = adapter_id.video_memory / 2; info->current_reservation = 0; break; -- 2.34.1

2 1

[PATCH v2] ws2_32: Add stub for SIO_ENABLE_CIRCULAR_QUEUEING in WSAIoctl()
by Julian Klemann 20 May '22

20 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47233 Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- v2: Changed tabs to spaces in sock.c --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d0c2deca35..88089fa8d74 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2371,6 +2371,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_ENABLE_CIRCULAR_QUEUEING: + { + NTSTATUS status = STATUS_SUCCESS; + DWORD ret; + + FIXME( "SIO_ENABLE_CIRCULAR_QUEUEING stub\n" ); + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + SetLastError( ret ); + return ret ? -1 : 0; + } + case SIO_BASE_HANDLE: { NTSTATUS status; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17ffba7a85..bdb683e6796 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5113,6 +5113,19 @@ static void test_base_handle(void) } } +static void test_circular_queueing(void) +{ + SOCKET s; + DWORD size; + int ret; + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ret = WSAIoctl(s, SIO_ENABLE_CIRCULAR_QUEUEING, NULL, 0, NULL, 0, &size, NULL, NULL); + ok(!ret, "expected 0, got %d\n", ret); + + closesocket(s); +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -12578,6 +12591,7 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); test_sioAddressListChange(); test_base_handle(); + test_circular_queueing(); test_unsupported_ioctls(); test_WSASendMsg(); -- 2.36.1

2 1

[PATCH v2 0/4] MR98: Some registry access fixes
by Torge Matthies (＠tmatthies) 19 May '22

19 May '22

I had these in my patch repo for quite a while. Patch 1 shouldn't need explanation. The problem fixed by patch 2 and 3 is that sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger than the actual minimum size required to get all the requested info, because those structs include an array of size 1 as their last member, which is intended to be a variable length array. Fixing these size calculations removes one allocation in wineserver and reduces the amount of data transmitted by 1 - 2 bytes. Patch 4 just reduces the amount of data transmitted from wineserver for each update_display_cache_from_registry call, which is called every time the display device lists are locked. -- v2: win32u: Query basic instead of full key information to get the LastWriteTime. win32u: Calculate buffer sizes from registry structs correctly. ntdll: Calculate buffer sizes from registry structs correctly. ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey. https://gitlab.winehq.org/wine/wine/-/merge_requests/98

2 4

[PATCH v2 0/11] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 19 May '22

19 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v2: wined3d: Rename format base_flags to flags. wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the base flags group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the base flags group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the base flags group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the base flag group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the base flags group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the base flags group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the base flags group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the base flags group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

4 18

Re: [PATCH v2 0/1] MR90: ntdll: Implement idle time query for Mac OS. - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/90

1 0

Re: [PATCH v2 0/6] MR97: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/97

1 0

Re: [PATCH v2 0/4] MR91: d3drm: IDirect3DRMMeshBuilder2 Get/SetQuality - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/91

1 0

Re: [PATCH v2 0/4] MR94: windows.gaming.input: More force feedback effect support. - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/94

1 0

Re: [PATCH v2 0/6] MR96: windows.media.speech: Tests and some refactoring. - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/96

1 0

[PATCH v4 0/1] MR21: include/guiddef.h: use Mingw64's __uuidof when present
by eric pouech (＠epo) 19 May '22

19 May '22

otherwise Wine's and Mingw64's __uuidof() enter in conflict (C++) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v4: include: Use Mingw64's __uuidof when present. https://gitlab.winehq.org/wine/wine/-/merge_requests/21

3 2

Re: [PATCH v2 0/6] MR93: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/93

1 0

Re: [PATCH v2 0/1] MR92: dwmapi: Clear DWM_TIMING_INFO structure before returning - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/92

1 0

[PATCH 0/1] MR99: winevulkan: Propagate access violation from the Unix side.
by Paul Gofman (＠gofman) 19 May '22

19 May '22

It seems like there are no valid reasons to swallow segfaults from native Vulkan side. While returning an out of spec error instead of firing access violation may actually help some games to continue working after driver crash that leads to obscure errors. Also, Vulkan is left in the undefined state. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/99

2 1

[PATCH 0/1] MR90: ntdll: Implement idle time query for Mac OS.
by Chip Davis (＠cdavis5e) 19 May '22

19 May '22

Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/90

3 3

[PATCH] d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation
by Andrew Eikum 19 May '22

19 May '22

The game Planetary Annihilation: TITANS depends on this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- The game does not actually try to Present (though it does create some shaders). I was just curious if it would fail. We can drop that test if it is uninteresting. Note that earlier in the function, we will exit early if create_device fails (e.g. due to missing hardware or something), so it's OK to require it to succeed here. dlls/d3d9/tests/d3d9ex.c | 25 +++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 15 +++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2afe73088c7..fd34b7ed2f8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3473,6 +3473,7 @@ static void test_window_style(void) LONG device_style, device_exstyle, expected_style; LONG focus_style, focus_exstyle; struct device_desc device_desc; + IDirect3DVertexShader9 *shader; LONG style; IDirect3DDevice9Ex *device; HRESULT hr; @@ -3494,6 +3495,17 @@ static void test_window_style(void) }; unsigned int i; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + SetRect(&fullscreen_rect, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -3662,6 +3674,19 @@ static void test_window_style(void) DestroyWindow(device_window); DestroyWindow(focus_window); } + + /* test device with NULL HWND */ + device = create_device(NULL, NULL); + ok(device, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9Ex_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DDevice9Ex_Release(device); } static void test_swapchain_parameters(void) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7abf9ea3df2..53f8a28c910 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5012,6 +5012,7 @@ static void test_window_style(void) LONG device_style, device_exstyle; LONG focus_style, focus_exstyle; struct device_desc device_desc; + IDirect3DVertexShader9 *shader; LONG style, expected_style; IDirect3DDevice9 *device; IDirect3D9 *d3d9; @@ -5156,6 +5157,20 @@ static void test_window_style(void) DestroyWindow(device_window); DestroyWindow(focus_window); } + + /* test device with NULL HWND */ + device = create_device(d3d9, NULL, NULL); + ok(device != NULL, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9Ex_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); } -- 2.36.1

2 2

[PATCH 0/4] MR98: Some registry access fixes
by Torge Matthies (＠tmatthies) 19 May '22

19 May '22

I had these in my patch repo for quite a while. Patch 1 shouldn't need explanation. The problem fixed by patch 2 and 3 is that sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger than the actual minimum size required to get all the requested info, because those structs include an array of size 1 as their last member, which is intended to be a variable length array. Fixing these size calculations removes one allocation in wineserver and reduces the amount of data transmitted by 1 - 2 bytes. Patch 4 just reduces the amount of data transmitted from wineserver for each update_display_cache_from_registry call, which is called every time the display device lists are locked. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/98

2 4

[PATCH] taskmgr: Fix the unit in memory usage graph on performance tab
by Limstash Wong 19 May '22

19 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50948 Signed-off-by: Limstash Wong <limstash.w(a)gmail.com> --- programs/taskmgr/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 12f22145664..4d04017e331 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -253,8 +253,8 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* * Get the memory usage */ - CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); + CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK() << 10; + CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK() << 10; if (CommitChargeTotal < 1024) StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); -- 2.36.1

1 0

[v4 PATCH 1/2] vbscript: Implement Weekday().
by Nikolay Sivov 19 May '22

19 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: use current context locale dlls/vbscript/global.c | 46 +++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 53 +++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1d3929ba249..84d3344918a 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1982,10 +1982,50 @@ static HRESULT Global_Month(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wMonth); } -static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres = S_OK; + int first_day = 0; + SYSTEMTIME st; + + TRACE("(%s)\n", debugstr_variant(args)); + + assert(args_cnt == 1 || args_cnt == 2); + + /* [vbSunday = 1, vbSaturday = 7] -> wDayOfWeek [0, 6] */ + if (args_cnt == 2) + { + if (V_VT(args + 1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args + 1, &first_day); + if (SUCCEEDED(hres)) + { + if (!first_day) + { + /* vbUseSystemDayOfWeek */ + GetLocaleInfoW(This->ctx->lcid, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, + sizeof(&first_day) / sizeof(WCHAR)); + first_day = (first_day + 1) % 7; + } + else if (first_day >= 1 && first_day <= 7) + { + first_day--; + } + else + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + } + + if (FAILED(hres)) + return hres; + + if (V_VT(args) == VT_NULL) + return return_null(res); + + if (FAILED(hres = to_system_time(args, &st))) return hres; + + return return_short(res, 1 + (7 - first_day + st.wDayOfWeek) % 7); } static HRESULT Global_Year(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..d27c373a964 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2036,4 +2036,57 @@ call testDateAdd(DateSerial(2000, 1, 1), "ww", -1, DateSerial(1999, 12, 25)) call testDateAdd(DateSerial(2000, 1, 1), "Ww", -1, DateSerial(1999, 12, 25)) call testDateAddError() +sub testWeekday(d, firstday, wd) + dim x, x2 + x = Weekday(d, firstday) + call ok(x = wd, "weekday = " & x & " expected " & wd) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) + if firstday = vbSunday then + x = Weekday(d) + call ok(x = wd, "weekday = " & x & " expected " & wd) + end if + x = Weekday(d, vbUseSystemDayOfWeek) + x2 = Weekday(d, firstDayOfWeek) + call ok(x = x2, "weekday = " & x & " expected " & x2) +end sub + +sub testWeekdayError() + on error resume next + dim x + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), 10) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + x = Weekday(null, vbSunday) + call ok(Err.number = 0, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_NULL*", "getVT = " & getVT(x)) + call Err.clear() + call Weekday(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, "a") + call ok(Err.number = 13, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), "a") + call ok(Err.number = 13, "Err.number = " & Err.number) +end sub + +call testWeekday(DateSerial(2000, 1, 1), vbSunday, 7) +call testWeekday(DateSerial(2000, 1, 1), vbMonday, 6) +call testWeekday(DateSerial(2000, 1, 1), vbTuesday, 5) +call testWeekday(DateSerial(2000, 1, 1), vbWednesday, 4) +call testWeekday(DateSerial(2000, 1, 1), vbThursday, 3) +call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) +call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) +call testWeekdayError() + Call reportSuccess() -- 2.35.1

2 3

[PATCH] dwrite/opentype: Fix GPOS PairSet array offset.
by Nikolay Sivov 19 May '22

19 May '22

Passed offset already includes subtable offset. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 50e83769715..8e4bd7a62dc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4025,7 +4025,7 @@ static BOOL opentype_layout_apply_gpos_pair_adjustment(struct scriptshaping_cont value_len2 * sizeof(WORD); pairset_offset = subtable_offset + GET_BE_WORD(format1->pairsets[coverage_index]); - pairset = table_read_ensure(table, subtable_offset + pairset_offset, pairvalue_len * pairvalue_count); + pairset = table_read_ensure(table, pairset_offset, pairvalue_len * pairvalue_count); if (!pairset) return FALSE; -- 2.35.1

1 0

[v3 PATCH 1/2] vbscript: Implement Weekday().
by Nikolay Sivov 19 May '22

19 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: improve error handling dlls/vbscript/global.c | 46 +++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 53 +++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1d3929ba249..15625157814 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1982,10 +1982,50 @@ static HRESULT Global_Month(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wMonth); } -static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres = S_OK; + int first_day = 0; + SYSTEMTIME st; + + TRACE("(%s)\n", debugstr_variant(args)); + + assert(args_cnt == 1 || args_cnt == 2); + + /* [vbSunday = 1, vbSaturday = 7] -> wDayOfWeek [0, 6] */ + if (args_cnt == 2) + { + if (V_VT(args + 1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args + 1, &first_day); + if (SUCCEEDED(hres)) + { + if (!first_day) + { + /* vbUseSystemDayOfWeek */ + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, + sizeof(&first_day) / sizeof(WCHAR)); + first_day = (first_day + 1) % 7; + } + else if (first_day >= 1 && first_day <= 7) + { + first_day--; + } + else + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + } + + if (FAILED(hres)) + return hres; + + if (V_VT(args) == VT_NULL) + return return_null(res); + + if (FAILED(hres = to_system_time(args, &st))) return hres; + + return return_short(res, 1 + (7 - first_day + st.wDayOfWeek) % 7); } static HRESULT Global_Year(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..d27c373a964 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2036,4 +2036,57 @@ call testDateAdd(DateSerial(2000, 1, 1), "ww", -1, DateSerial(1999, 12, 25)) call testDateAdd(DateSerial(2000, 1, 1), "Ww", -1, DateSerial(1999, 12, 25)) call testDateAddError() +sub testWeekday(d, firstday, wd) + dim x, x2 + x = Weekday(d, firstday) + call ok(x = wd, "weekday = " & x & " expected " & wd) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) + if firstday = vbSunday then + x = Weekday(d) + call ok(x = wd, "weekday = " & x & " expected " & wd) + end if + x = Weekday(d, vbUseSystemDayOfWeek) + x2 = Weekday(d, firstDayOfWeek) + call ok(x = x2, "weekday = " & x & " expected " & x2) +end sub + +sub testWeekdayError() + on error resume next + dim x + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), 10) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + x = Weekday(null, vbSunday) + call ok(Err.number = 0, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_NULL*", "getVT = " & getVT(x)) + call Err.clear() + call Weekday(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, "a") + call ok(Err.number = 13, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), "a") + call ok(Err.number = 13, "Err.number = " & Err.number) +end sub + +call testWeekday(DateSerial(2000, 1, 1), vbSunday, 7) +call testWeekday(DateSerial(2000, 1, 1), vbMonday, 6) +call testWeekday(DateSerial(2000, 1, 1), vbTuesday, 5) +call testWeekday(DateSerial(2000, 1, 1), vbWednesday, 4) +call testWeekday(DateSerial(2000, 1, 1), vbThursday, 3) +call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) +call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) +call testWeekdayError() + Call reportSuccess() -- 2.35.1

2 3

[tools 1/3] testbot/web: Add support for adding and removing roles.
by Francois Gouget 19 May '22

19 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't forsee a need to add / remove roles but it is useful to at least be able to see which ones exist. In that it's similar to the Branches pages and fills a hole in the website administration interface. These pages are also little more than a 's/Branch/Role/g' of the Branches pages and should not require much maintenance. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 ++ testbot/web/admin/RoleDetails.pl | 42 +++++++++++++++++++++++++ testbot/web/admin/RolesList.pl | 30 ++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 testbot/web/admin/RoleDetails.pl create mode 100644 testbot/web/admin/RolesList.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 0dacbf6dd..3a78a44d4 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -558,6 +558,8 @@ EOF "'>Special Jobs (old)</a></li>\n"; print " <li><a href='", MakeSecureURL("/admin/UsersList.pl"), "'>Users</a></li>\n"; + print " <li><a href='", MakeSecureURL("/admin/RolesList.pl"), + "'>Roles</a></li>\n"; print " <li class='divider'> </li>\n"; print " <li><a href='", MakeSecureURL("/admin/VMsList.pl"), "'>VMs</a></li>\n"; diff --git a/testbot/web/admin/RoleDetails.pl b/testbot/web/admin/RoleDetails.pl new file mode 100644 index 000000000..3f6d02eb8 --- /dev/null +++ b/testbot/web/admin/RoleDetails.pl @@ -0,0 +1,42 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Role details page +# +# Copyright 2010 VMware, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package RoleDetailsPage; + +use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + +use WineTestBot::Roles; + + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole, CreateRoles()); +} + + +package main; + +my $Request = shift; +my $Page = RoleDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/RolesList.pl b/testbot/web/admin/RolesList.pl new file mode 100644 index 000000000..3fb765b0a --- /dev/null +++ b/testbot/web/admin/RolesList.pl @@ -0,0 +1,30 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Role list page +# +# Copyright 2009 Ge van Geldorp +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package main; + +use ObjectModel::CGI::CollectionPage; +use WineTestBot::Roles; + +my $Request = shift; +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateRoles()); +$Page->GeneratePage(); -- 2.30.2

1 2

winegstream fix chug
by Zlice Z 19 May '22

19 May '22

commit https://github.com/wine-mirror/wine/commit/f7a5bf7be1b43ff295723c15c296c943… Moved out of a switch-case with a break and does not return from send_buf() Causes massive chugging in Fallout 3 when the radio ends/begins a new song. Still get (wine:17951): GStreamer-CRITICAL **: 19:23:05.389: gst_segment_do_seek: assertion 'start <= stop' failed on command line though. --- src/dlls/winegstreamer/quartz_parser.c 2022-05-18 18:44:35.638648511 -0400 +++ src/dlls/winegstreamer/quartz_parser.c 2022-05-18 19:07:29.212580858 -0400 @@ -779,6 +779,7 @@ pin->seek.llCurrent, pin->seek.llStop, pin->seek.dRate))) WARN("Failed to deliver new segment, hr %#lx.\n", hr); pin->need_segment = false; + return; } if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx)

2 1

[tools] testbot/orm: Let the Collection Items field pop into existence when needed.
by Francois Gouget 19 May '22

19 May '22

Collections don't check that it exists so all setting it in the constructor does is waste memory. Documenting its existence there is enough. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 4e7a032a3..63d470bbc 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -93,7 +93,8 @@ sub new($$$$$;$$@) MasterKey => ComputeMasterKey($MasterColValues), # Filter => undef by default AllScopeItems => $AllScopeItems || {}, - Items => undef}; + # Items => undef by default + }; if ($AllScopeItems) { # Avoid memory cycles in case Items have Detailref properties: @@ -138,7 +139,8 @@ sub Clone($) MasterKey => $self->{MasterKey}, # Filter => undef by default AllScopeItems => $self->{AllScopeItems}, - Items => undef}; + # Items => undef by default + }; # See Collection::new() weaken($Copy->{AllScopeItems}); -- 2.30.2

1 0

[tools] testbot/orm: Let AddFilter() create the Collection Filter field.
by Francois Gouget 19 May '22

19 May '22

All that initializing Filter in the constructor does is waste memory. Documenting its existence there is enough. Furthermore Clone() shouldn't have been setting it to an empty hashref. Fortunately a typo made this ineffectual. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index bec5b1c5c..4e7a032a3 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -91,7 +91,7 @@ sub new($$$$$;$$@) MasterColNames => $MasterColNames, MasterColValues => $MasterColValues, MasterKey => ComputeMasterKey($MasterColValues), - Filter => undef, + # Filter => undef by default AllScopeItems => $AllScopeItems || {}, Items => undef}; if ($AllScopeItems) @@ -136,7 +136,7 @@ sub Clone($) MasterColNames => $self->{MasterColNames}, MasterColValues => $self->{MasterColValues}, MasterKey => $self->{MasterKey}, - Filters => {}, + # Filter => undef by default AllScopeItems => $self->{AllScopeItems}, Items => undef}; # See Collection::new() -- 2.30.2

1 0

[tools] testbot/orm: Remove the $ColPrefix BuildKeyWhere() parameter.
by Francois Gouget 19 May '22

19 May '22

It is unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 10cc1f3c3..dc527d465 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -132,9 +132,9 @@ sub FromDb($$$) return $Value; } -sub BuildKeyWhere($$$$) +sub BuildKeyWhere($$$) { - my ($self, $PropertyDescriptors, $ColPrefix, $Where) = @_; + my ($self, $PropertyDescriptors, $Where) = @_; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { @@ -146,7 +146,7 @@ sub BuildKeyWhere($$$$) { $Where .= " AND "; } - $Where .= $ColPrefix . $ColName . " = ?"; + $Where .= "$ColName = ?"; } } } @@ -363,8 +363,7 @@ sub LoadItem($$$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), "", - $Where); + $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); push @Data, $Collection->SplitKey($RequestedKey); my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); @@ -480,7 +479,7 @@ sub BuildUpdateStatement($$$$) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; } - $Where = $self->BuildKeyWhere($PropertyDescriptors, "", $Where); + $Where = $self->BuildKeyWhere($PropertyDescriptors, $Where); return "UPDATE $TableName SET $Fields WHERE $Where"; } @@ -606,8 +605,7 @@ sub DeleteItem($$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), "", - $Where); + $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " . -- 2.30.2

1 0

[tools] testbot/cgi: In case of insufficient privileges redirect to the main page.
by Francois Gouget 19 May '22

19 May '22

There is no point asking already logged in users to log in again if they don't have enough privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 3a78a44d4..d68b97289 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -88,12 +88,15 @@ sub new($$$$@) { $self->CheckSecurePage(); my $Session = $self->GetCurrentSession(); - if (! defined($Session) || - ! $Session->User->HasRole($RequiredRole)) + if (!defined $Session) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); exit($self->Redirect(MakeSecureURL($LoginURL))); } + elsif (!$Session->User->HasRole($RequiredRole)) + { + exit($self->Redirect("/")); + } } $self->_initialize(@_); -- 2.30.2

1 0

[PATCH 0/4] MR91: d3drm: IDirect3DRMMeshBuilder2 Get/SetQuality
by Alistair Leslie-Hughes (＠alesliehughes) 19 May '22

19 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/91

4 6

[PATCH 0/6] MR97: win32u: user32 conversion
by Jacek Caban (＠jacek) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/97

3 7

[PATCH] msvcr120: Add missing _StructuredTaskCollection destructor spec file entry.
by Piotr Caban 19 May '22

19 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/msvcr120.spec | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 0/6] MR96: windows.media.speech: Tests and some refactoring.
by Bernhard Kölbl (＠besentv) 19 May '22

19 May '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/96

3 9

[PATCH] d2d1: Make ID2D1Device::CreateImageBrush() accept only bitmap as a source image.
by Dmitry Timoshkov 19 May '22

19 May '22

ID2D1Bitmap derives from ID2D1Image, which in turn derives from ID2D1Resource. That means that ID2D1Device::CreateImageBrush() can't be really passed anything but a ID2D1Bitmap* represented as a ID2D1Image*. I've added QueryInterface+FIXME just in case, probably it could be dropped. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/brush.c | 11 ++++++++++- dlls/d2d1/d2d1_private.h | 1 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..8d4715d429a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1324,10 +1324,19 @@ HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) { + ID2D1Bitmap *bitmap; + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; - d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE, + if (FAILED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return E_FAIL; + } + ID2D1Bitmap_Release(bitmap); + + d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl); if (((*brush)->u.image.image = image)) ID2D1Image_AddRef((*brush)->u.image.image); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 29469f5142e..6183d9d4c99 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -42,7 +42,6 @@ enum d2d_brush_type D2D_BRUSH_TYPE_LINEAR, D2D_BRUSH_TYPE_RADIAL, D2D_BRUSH_TYPE_BITMAP, - D2D_BRUSH_TYPE_IMAGE, D2D_BRUSH_TYPE_COUNT, }; -- 2.36.1

3 5

[PATCH 0/2] MR95: combase: Try loading WinRT activatable classes from the activation context path.
by Rémi Bernon (＠rbernon) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/95

3 3

[PATCH v2] d2d1: Make ID2D1Device::CreateImageBrush() accept only bitmap as a source image.
by Dmitry Timoshkov 19 May '22

19 May '22

ID2D1Bitmap derives from ID2D1Image, which in turn derives from ID2D1Resource. That means that ID2D1Device::CreateImageBrush() can't be really passed anything but a ID2D1Bitmap* represented as a ID2D1Image*. I've added QueryInterface+FIXME just in case, probably it could be dropped. v2: Fix test crashes with image == NULL. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/brush.c | 15 ++++++++++++++- dlls/d2d1/d2d1_private.h | 1 - 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..2632b5892da 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1327,7 +1327,20 @@ HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; - d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE, + if (image) + { + ID2D1Bitmap *bitmap; + + if (FAILED(ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap))) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return E_FAIL; + } + + ID2D1Bitmap_Release(bitmap); + } + + d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl); if (((*brush)->u.image.image = image)) ID2D1Image_AddRef((*brush)->u.image.image); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 29469f5142e..6183d9d4c99 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -42,7 +42,6 @@ enum d2d_brush_type D2D_BRUSH_TYPE_LINEAR, D2D_BRUSH_TYPE_RADIAL, D2D_BRUSH_TYPE_BITMAP, - D2D_BRUSH_TYPE_IMAGE, D2D_BRUSH_TYPE_COUNT, }; -- 2.36.1

2 1

[v2 PATCH 1/2] vbscript: Implement Weekday().
by Nikolay Sivov 19 May '22

19 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed duplicated test call dlls/vbscript/global.c | 43 ++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 47 +++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1d3929ba249..62b41cea39d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1982,10 +1982,47 @@ static HRESULT Global_Month(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wMonth); } -static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int first_day = 0; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(args)); + + assert(args_cnt == 1 || args_cnt == 2); + + /* [vbSunday = 1, vbSaturday = 7] -> wDayOfWeek [0, 6] */ + if (args_cnt == 2) + { + if (V_VT(args + 1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args + 1, &first_day); + if (SUCCEEDED(hres)) + { + if (!first_day) + { + /* vbUseSystemDayOfWeek */ + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, + sizeof(&first_day) / sizeof(WCHAR)); + first_day = (first_day + 1) % 7; + } + else if (first_day >= 1 && first_day <= 7) + { + first_day--; + } + else + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + } + + if (V_VT(args) == VT_NULL) + return return_null(res); + + if (FAILED(hres = to_system_time(args, &st))) return hres; + + return FAILED(hres) ? hres : return_short(res, 1 + (7 - first_day + st.wDayOfWeek) % 7); } static HRESULT Global_Year(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..3429a1bbef5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2036,4 +2036,51 @@ call testDateAdd(DateSerial(2000, 1, 1), "ww", -1, DateSerial(1999, 12, 25)) call testDateAdd(DateSerial(2000, 1, 1), "Ww", -1, DateSerial(1999, 12, 25)) call testDateAddError() +sub testWeekday(d, firstday, wd) + dim x, x2 + x = Weekday(d, firstday) + call ok(x = wd, "weekday = " & x & " expected " & wd) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) + if firstday = vbSunday then + x = Weekday(d) + call ok(x = wd, "weekday = " & x & " expected " & wd) + end if + x = Weekday(d, vbUseSystemDayOfWeek) + x2 = Weekday(d, firstDayOfWeek) + call ok(x = x2, "weekday = " & x & " expected " & x2) +end sub + +sub testWeekdayError() + on error resume next + dim x + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), 10) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + x = Weekday(null, vbSunday) + call ok(Err.number = 0, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_NULL*", "getVT = " & getVT(x)) + call Err.clear() + call Weekday(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub + +call testWeekday(DateSerial(2000, 1, 1), vbSunday, 7) +call testWeekday(DateSerial(2000, 1, 1), vbMonday, 6) +call testWeekday(DateSerial(2000, 1, 1), vbTuesday, 5) +call testWeekday(DateSerial(2000, 1, 1), vbWednesday, 4) +call testWeekday(DateSerial(2000, 1, 1), vbThursday, 3) +call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) +call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) +call testWeekdayError() + Call reportSuccess() -- 2.35.1

2 3

[PATCH] winedump: Add support for dumping UnloadedModuleListStream.
by Nikolay Sivov 19 May '22

19 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/minidumpapiset.h | 16 +++++++++++++++ tools/winedump/minidump.c | 43 +++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/include/minidumpapiset.h b/include/minidumpapiset.h index b3a7737bd13..fed3e4cac03 100644 --- a/include/minidumpapiset.h +++ b/include/minidumpapiset.h @@ -426,6 +426,22 @@ typedef struct _MINIDUMP_THREAD_INFO_LIST ULONG NumberOfEntries; } MINIDUMP_THREAD_INFO_LIST, *PMINIDUMP_THREAD_INFO_LIST; +typedef struct _MINIDUMP_UNLOADED_MODULE +{ + ULONG64 BaseOfImage; + ULONG32 SizeOfImage; + ULONG32 CheckSum; + ULONG32 TimeDateStamp; + RVA ModuleNameRva; +} MINIDUMP_UNLOADED_MODULE, *PMINIDUMP_UNLOADED_MODULE; + +typedef struct _MINIDUMP_UNLOADED_MODULE_LIST +{ + ULONG32 SizeOfHeader; + ULONG32 SizeOfEntry; + ULONG32 NumberOfEntries; +} MINIDUMP_UNLOADED_MODULE_LIST, *PMINIDUMP_UNLOADED_MODULE_LIST; + typedef enum _MINIDUMP_STREAM_TYPE { UnusedStream = 0, diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 734c754e6be..8190df937af 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -83,6 +83,7 @@ void mdmp_dump(void) const MINIDUMP_DIRECTORY* dir; const void* stream; unsigned int i, idx; + const BYTE *ptr; if (!hdr) { @@ -439,17 +440,16 @@ void mdmp_dump(void) case HandleDataStream: { const MINIDUMP_HANDLE_DATA_STREAM *mhd = stream; - const BYTE *desc; printf("Handle data:\n"); printf(" SizeOfHeader: %u\n", mhd->SizeOfHeader); printf(" SizeOfDescriptor: %u\n", mhd->SizeOfDescriptor); printf(" NumberOfDescriptors: %u\n", mhd->NumberOfDescriptors); - desc = (BYTE *)mhd + sizeof(*mhd); + ptr = (BYTE *)mhd + sizeof(*mhd); for (i = 0; i < mhd->NumberOfDescriptors; ++i) { - const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)desc; + const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)ptr; printf(" Handle [%u]:\n", i); print_longlong(" Handle", hd->Handle); @@ -472,24 +472,23 @@ void mdmp_dump(void) printf(" Reserved0: %#x\n", hd->Reserved0); } - desc += mhd->SizeOfDescriptor; + ptr += mhd->SizeOfDescriptor; } } break; case ThreadInfoListStream: { const MINIDUMP_THREAD_INFO_LIST *til = stream; - const BYTE *desc; printf("Thread Info List:\n"); printf(" SizeOfHeader: %u\n", (UINT)til->SizeOfHeader); printf(" SizeOfEntry: %u\n", (UINT)til->SizeOfEntry); printf(" NumberOfEntries: %u\n", (UINT)til->NumberOfEntries); - desc = (BYTE *)til + sizeof(*til); + ptr = (BYTE *)til + sizeof(*til); for (i = 0; i < til->NumberOfEntries; ++i) { - const MINIDUMP_THREAD_INFO *ti = (void *)desc; + const MINIDUMP_THREAD_INFO *ti = (void *)ptr; printf(" Thread [%u]:\n", i); printf(" ThreadId: %u\n", ti->ThreadId); @@ -503,7 +502,35 @@ void mdmp_dump(void) print_longlong(" StartAddress", ti->StartAddress); print_longlong(" Affinity", ti->Affinity); - desc += til->SizeOfEntry; + ptr += til->SizeOfEntry; + } + } + break; + + case UnloadedModuleListStream: + { + const MINIDUMP_UNLOADED_MODULE_LIST *uml = stream; + + printf("Unloaded module list:\n"); + printf(" SizeOfHeader: %u\n", uml->SizeOfHeader); + printf(" SizeOfEntry: %u\n", uml->SizeOfEntry); + printf(" NumberOfEntries: %u\n", uml->NumberOfEntries); + + ptr = (BYTE *)uml + sizeof(*uml); + for (i = 0; i < uml->NumberOfEntries; ++i) + { + const MINIDUMP_UNLOADED_MODULE *mod = (void *)ptr; + + printf(" Module [%u]:\n", i); + print_longlong(" BaseOfImage", mod->BaseOfImage); + printf(" SizeOfImage: %u\n", mod->SizeOfImage); + printf(" CheckSum: %#x\n", mod->CheckSum); + printf(" TimeDateStamp: %s\n", get_time_str(mod->TimeDateStamp)); + printf(" ModuleName: "); + dump_mdmp_string(mod->ModuleNameRva); + printf("\n"); + + ptr += uml->SizeOfEntry; } } break; -- 2.35.1

1 0

[PATCH 0/4] MR94: windows.gaming.input: More force feedback effect support.
by Rémi Bernon (＠rbernon) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/94

2 4

[PATCH 0/6] MR93: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 19 May '22

19 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/93

2 6

[PATCH 0/1] MR92: dwmapi: Clear DWM_TIMING_INFO structure before returning
by Alistair Leslie-Hughes (＠alesliehughes) 19 May '22

19 May '22

Clearing the structure passed in, allows Chromium to calculate a fallback value for the refresh rate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53016 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/92

2 1

[PATCH v3 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 18 May '22

18 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v3: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

2 10

[PATCH v2 0/2] MR66: mf/tests: Move WMA decoder aggregation tests from wmadmod.
by Rémi Bernon (＠rbernon) 18 May '22

18 May '22

-- v2: wmadmod: Remove unnecessary DLL. mf/tests: Move WMA decoder aggregation tests from wmadmod. https://gitlab.winehq.org/wine/wine/-/merge_requests/66

4 4

Re: [PATCH v3 0/8] MR87: windows.gaming.input: More force feedback effect implementation. - approved
by Alexandre Julliard (＠julliard) 18 May '22

18 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/87

1 0

Re: [PATCH v5 0/1] MR46: d3dx10/tests: Fix d3dx10_34 test failures on all Windows versions. - approved
by Alexandre Julliard (＠julliard) 18 May '22

18 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/46

1 0

[PATCH v4 0/1] MR75: kernel32: In WritePrivateProfileStructW prevent null pointer dereference
by Fabian Maurer (＠DarkShadow44) 18 May '22

18 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49285 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> -- v4: kernel32: Prevent null pointer dereference in WritePrivateProfileStructW. https://gitlab.winehq.org/wine/wine/-/merge_requests/75

3 2

Re: [PATCH v3 0/3] MR69: include: Add __WINE_MALLOC attribute and use it for allocation functions. - approved
by Alexandre Julliard (＠julliard) 18 May '22

18 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/69

1 0

Re: [PATCH v2 0/6] MR88: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 18 May '22

18 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/88

1 0

Re: [PATCH v3 0/7] MR86: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 18 May '22

18 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/86

1 0

[PATCH] ws2_32: Add stub for SIO_ENABLE_CIRCULAR_QUEUEING in WSAIoctl()
by Julian Klemann 18 May '22

18 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47233 Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d0c2deca35..88089fa8d74 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2371,6 +2371,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_ENABLE_CIRCULAR_QUEUEING: + { + NTSTATUS status = STATUS_SUCCESS; + DWORD ret; + + FIXME( "SIO_ENABLE_CIRCULAR_QUEUEING stub\n" ); + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + SetLastError( ret ); + return ret ? -1 : 0; + } + case SIO_BASE_HANDLE: { NTSTATUS status; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17ffba7a85..048b2b68ebb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5113,6 +5113,19 @@ static void test_base_handle(void) } } +static void test_circular_queueing(void) +{ + SOCKET s; + DWORD size; + int ret; + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ret = WSAIoctl(s, SIO_ENABLE_CIRCULAR_QUEUEING, NULL, 0, NULL, 0, &size, NULL, NULL); + ok(!ret, "expected 0, got %d\n", ret); + + closesocket(s); +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -12578,6 +12591,7 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); test_sioAddressListChange(); test_base_handle(); + test_circular_queueing(); test_unsupported_ioctls(); test_WSASendMsg(); -- 2.36.1

1 0

[PATCH v4 0/1] MR46: d3dx10/tests: Fix d3dx10_34 test failures on all Windows versions.
by Sven Baars (＠sbaars) 18 May '22

18 May '22

Should fix https://bugs.winehq.org/show_bug.cgi?id=51827 I tested this on a Windows 10 VM. With last=4 it failed about 50% of the time, with last=3 it passed 100 tests without any failures. -- v4: d3dx10/tests: Disable a PreloadGlyphs test for d3dx10_34. https://gitlab.winehq.org/wine/wine/-/merge_requests/46

2 1

[PATCH v3 0/1] MR46: d3dx10/tests: Fix d3dx10_34 test failures on all Windows versions.
by Sven Baars (＠sbaars) 18 May '22

18 May '22

Should fix https://bugs.winehq.org/show_bug.cgi?id=51827 I tested this on a Windows 10 VM. With last=4 it failed about 50% of the time, with last=3 it passed 100 tests without any failures. -- v3: d3dx10/tests: Disable a PreloadGlyphs test for d3dx10_34. https://gitlab.winehq.org/wine/wine/-/merge_requests/46

4 3

[PATCH v2 0/7] MR86: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 18 May '22

18 May '22

Use pthread instead of kernel32. -- v2: winemac: Use pthread_once for wine_vk_init. winemac: Use pthread for window data locking. winemac: Use pthread for synchronization in opengl.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/86

3 8

[PATCH 0/2] MR66: mf/tests: Move WMA decoder aggregation tests from wmadmod.
by Rémi Bernon (＠rbernon) 18 May '22

18 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/66

3 3

[PATCH v7 0/144] MR13: kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes (＠alesliehughes) 18 May '22

18 May '22

Based on patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v7: uiautomationcore: Fix header compatibility with C++. windows.gaming.input: Implement Windows.Gaming.Input.ConditionForceEffect runtimeclass. windows.gaming.input: Implement Windows.Gaming.Input.PeriodicForceEffect runtimeclass. windows.gaming.input: Implement Windows.Gaming.Input.RampForceEffect runtimeclass. dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.ConditionForceEffect tests. dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.RampForceEffect tests. dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect tests. winevulkan: Update to VK spec version 1.3.214. maintainers: Add a Windows Media Format section. maintainers: Add a GStreamer section. oleacc: Add IAccessible refcount tests. oleacc: Store test IAccessible data in structure. oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject. oleacc/tests: Add tests for retrieving an IAccessible contained within a Dynamic Annotation wrapper. mfreadwrite/reader: Propagate resource sharing mode to the sample allocator. gdi32: Implement D3DKMTQueryVideoMemoryInfo(). winex11.drv: Open a Vulkan device for D3DKMTOpenAdapterFromLuid(). gdi32/tests: Add D3DKMTQueryVideoMemoryInfo() tests. include: Add D3DKMTQueryVideoMemoryInfo() definition. iphlpapi: Don't request unused dynamic interface data. nsi: Allocate a small buffer at once in NsiAllocateAndGetTable(). nsiproxy.sys: Update interface table only if LUID is not found in convert_unix_name_to_luid(). nsiproxy.sys: Update interface table only if LUID is not found in convert_luid_to_unix_name(). nsiproxy.sys: Finish search once found in convert_luid_to_unix_name(). nsiproxy.sys: Update interface table only if find_entry_from_{luid|index} fails. win32u: Fix a memory leak. dwmapi: Partially implement DwmGetCompositionTimingInfo(). dwmapi: Use RtlGetVersion() for system version detection instead. quartz/systemclock: Use timeGetTime() to retrieve the current time. dinput: Pass the device instance directly to hid_joystick_device_(try_)open. dinput: Pass a single GUID pointer to hid_joystick_device_open(). maintainers: Add myself to some sections. d3dx9/shader: Use more proper integer types. d3dx9/mesh: Split skin header and weights parse functions. d3dx9/mesh: Make use of more proper types. d3dcompiler/asm: Parse negative numbers with a whitespace after the sign. d3dx9/tests: Test D3DXAssembleShader() with both terminated and not terminated include data. ntdll: Use next_block helper in heap_reallocate. ntdll: Check that ptr is in committed blocks in find_subheap. ntdll: Use next_block helper to iterate in heap_set_debug_flags. ntdll: Use block helpers to iterate blocks in heap_validate. ntdll: Remove unused QUIET/NOISY constants and parameters. winemac: Directly use ntdll for registry access in copy_system_cursor_name. winemac: Directly use ntdll for registry access in create_original_display_mode_descriptor. winemac: Directly use ntdll for registry access in write_display_settings. winemac: Directly use ntdll for registry access in init_original_display_mode. winemac: Directly use ntdll in get_display_device_reg_key. winemac: Directly use ntdll for display device mutex. winemac: Directly use ntdll to write display settings. winemac: Directly use ntdll for querying display settings. winemac: Directly use ntdll in setup_options. rsaenh: Output FIXME when HMAC hash algorithm is not found. rsaenh: Allow importing bigger RC2 keys. rsaenh: Factor out alloc_key() function. rsaenh: Store key state in hash data for _MAC hash algorithm. rsaenh: Factor out block_encrypt() function. rsaenh: Handle uneven hash data updates sizes for CALG_MAC. rsaenh: Use CRT memory allocators. wined3d: Make normalized format handling more generic in wined3d_format_convert_from_float. wined3d: Mark some d3d9 formats as normalized formats. wined3d: Support CPU clear of float16 formats. wined3d: Add support for sysmem-clearing float32 formats. wined3d: Prepare wined3d_format_convert_from_float for > 32bpp formats. d3d11: Implement ID3D11Device1::CreateBlendState1(). d3d11/tests: Test logic op. jscript: Pass undefined 'this' instead of null in ES5 mode. jscript: Handle detached scope objects 'this' in all calls. dinput: Allocate the dinput_device structure in the caller to dinput_device_alloc(). dinput: Rename This to device in dinput_device_alloc. dinput: Return an HRESULT from hid_joystick_device_try_open. dinput: Return E_OUTOFMEMORY on allocation failure in hid_joystick_create_device(). dinput: Rename dinput_device_init() to dinput_device_init_device_format(). dinput: Factor out the dinput_device_init() call into dinput7_CreateDeviceEx(). dinput: Store the user_format field inline in struct dinput_device. dinput: Store the device_format field inline in struct dinput_device. winexinput.sys: Clear the buffer passed to IOCTL_HID_GET_DEVICE_DESCRIPTOR. hidclass.sys: Clear the buffer passed to IOCTL_HID_GET_DEVICE_DESCRIPTOR. vbscript: Implement DateSerial(). ntdll: Simplify validate_free_block. ntdll: Simplify validate_used_block. ntdll: Simplify validate_large_arena. ntdll: Simplify validate_block_pointer. ntdll: Use heap_validate_ptr in validate_block_pointer. msvcrt: Hook up __C_specific_handler and __jump_unwind for arm. user32: Remove no longer used WINPOS_WindowFromPoint. win32u: Handle sys color brushes in fill_rect. shlwapi/tests: Fix a test failure with the UTF-8 code page. mstask/tests: Fix the compare_trigger_state() failure lines. mstask/tests: Ignore the compare_trigger_state() return value. comctl32/tests: Use winetest_push_context() in tooltip:test_customdraw(). shell32: Shelllink: Make the create_lnk() failure messages unique. mfreadwrite/reader: Allocate output samples on read requests. kernelbase: Cache the sortid for each locale. kernelbase: Move get_language_sort() to avoid forward declarations. ntdll: Collect logical processor info at process start. ntdll: Refactor logical processor info manipulation functions. ntdll: Move init_cpu_info() below create_logical_proc_info(). ntdll: Fix allocation size in grow_logical_proc_ex_buf(). windows.gaming.input: Implement IForceFeedbackMotor_TryUnloadEffectAsync. windows.gaming.input: Implement IForceFeedbackMotor_LoadEffectAsync. windows.gaming.input: Add a type parameter to force_feedback_effect_create. windows.gaming.input: Implement IForceFeedbackEffect interface for ConstantForceEffect. windows.gaming.input: Implement and instantiate ConstantForceEffect runtimeclass stubs. dinput/tests: Increase async bool handler wait timeout. shell32/tests: Use 'shellpath' as tmpfile name in PathResolve tests. windows.media.speech: Rename async_operation to async_inspectable. windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed. windows.media.speech/tests: Remove some unreliable ref checks. windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent. windows.media.speech: Add a missing trace to async_operation_create. msi/tests: Fix an intermittent test failure. d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush(). d2d1: Implement ID2D1DeviceContext::CreateImageBrush(). d2d1: Add a stub for ID2D1PathGeometry1. include: Add ID2D1PathGeometry1 definition. include: Constify the RAWINPUTDEVICE pointer parameter to RegisterRawInputDevices(). dbghelp: Set correct basic types definition. dbghelp: Fix conversion of dwarf's basic types into dbghelp's basic types. dbghelp: Let symt_basic be trans-module and nameless. winedbg: Add 'set' command to change data model. winedbg: Introduce struct data_model to describe the various models for base types. ntdll: Rewrite RtlWalkHeap and enumerate large blocks. ntdll: Check subheap sizes for consistency before using them. ntdll: Cleanup HEAP_FindSubHeap and rename it to find_subheap. ntdll: Use block size helpers in heap_size. ntdll: Introduce new block metadata access helpers. nsiproxy.sys: Implement IPv6 ipstats get_all_parameters on Mac OS and BSD. nsiproxy.sys: Implement IPv6 icmpstats get_all_parameters on Mac OS and BSD. configure: Check for struct icmpstat. winevulkan: Enable compilation with long types. wined3d: Separate mapping from data writing in surface_cpu_blt_colour_fill. wined3d: Move clear box clipping to cpu_blitter_clear. winspool: Enable compilation with long types. d3drm/tests: Build without -DWINE_NO_LONG_TYPES. ole32: Remove obsolete -D_OLE32_ from Makefile.in. wined3d: Don't do a full cleanup when waiting for a command buffer. wined3d: Reduce the size of staging BO's for texture uploads. maintainers: Update the Direct2D section. maintainers: Update the Direct3D section. win32u: Allow an out-of-order RECT in RedrawWindow(). user32/tests: Test an out-of-order RECT in RedrawWindow(). dbghelp: Use RtlGetVersion() for system version detection instead. This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/13

1 1

[PATCH v2 0/1] MR46: d3dx10/tests: Fix d3dx10_34 test failures on all Windows versions.
by Sven Baars (＠sbaars) 18 May '22

18 May '22

Should fix https://bugs.winehq.org/show_bug.cgi?id=51827 I tested this on a Windows 10 VM. With last=4 it failed about 50% of the time, with last=3 it passed 100 tests without any failures. -- v2: d3dx10/tests: Disable a PreloadGlyphs test for d3dx10_34. https://gitlab.winehq.org/wine/wine/-/merge_requests/46

3 2

[PATCH v2 0/8] MR87: windows.gaming.input: More force feedback effect implementation.
by Rémi Bernon (＠rbernon) 18 May '22

18 May '22

-- v2: dinput: Make sure converted direction values are always positive. windows.gaming.input: Implement IConditionForceEffect_SetParameters. windows.gaming.input: Implement IPeriodicForceEffect_SetParameters(WithEnvelope). windows.gaming.input: Implement IRampForceEffect_SetParameters(WithEnvelope). windows.gaming.input: Implement IConstantForceEffect_SetParameters(WithEnvelope). windows.gaming.input: Implement IForceFeedbackEffect_(get|put)_Gain. windows.gaming.input: Always assume at least two force feedback axes. dinput/tests: Remove IAsyncOperation reference count checks. https://gitlab.winehq.org/wine/wine/-/merge_requests/87

2 8

[PATCH 0/7] MR87: windows.gaming.input: More force feedback effect implementation.
by Rémi Bernon (＠rbernon) 18 May '22

18 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/87

3 10

[PATCH 0/6] MR88: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 18 May '22

18 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/88

3 7

[PATCH 0/7] MR86: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 18 May '22

18 May '22

Use pthread instead of kernel32. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/86

3 8

Re: [PATCH v4 0/6] MR78: NSI and GetAdaptersInfo() performance improvements
by Huw Davies (＠huw) 18 May '22

18 May '22

On Wed May 18 01:23:07 2022 +0000, Chip Davis wrote: > > (and figure out if there's an equivalent we could do on macOS) > System event sockets (`PF_SYSTEM`, `SYSPROTO_EVENT`) are what you want > here. They have the ability to notify the caller when an interface > appears (`KEV_DL_IF_ATTACHED`), when it is about to disappear > (`KEV_DL_IF_DETACHING`), and when it has vanished (`KEV_DL_IF_DETACHED`). Nice, thanks. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/78#note_969

1 0

[PATCH 1/3] user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.
by Zebediah Figura 18 May '22

18 May '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a014066f988..961efecd075 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -177,7 +177,6 @@ void rawinput_update_device_list(void) SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; DWORD idx; @@ -201,6 +200,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { + const struct hid_preparsed_data *preparsed; + if (!(device = add_device(set, &iface))) continue; @@ -215,12 +216,10 @@ void rawinput_update_device_list(void) if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); + preparsed = (struct hid_preparsed_data *)device->data; - if (!HidP_GetCaps(device->data, &caps)) - WARN("Failed to get caps.\n"); - - device->info.hid.usUsagePage = caps.UsagePage; - device->info.hid.usUsage = caps.Usage; + device->info.hid.usUsagePage = preparsed->usage_page; + device->info.hid.usUsage = preparsed->usage; } SetupDiDestroyDeviceInfoList(set); -- 2.35.1

2 3

[PATCH 0/11] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 18 May '22

18 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/79

4 14

Re: [PATCH v4 0/6] MR78: NSI and GetAdaptersInfo() performance improvements
by Chip Davis (＠cdavis5e) 18 May '22

18 May '22

On Tue May 17 08:19:21 2022 +0000, Huw Davies wrote: > Actually, we don't de-populate the list on interface removals, so this > should be ok. I'll take another look. > (and figure out if there's an equivalent we could do on macOS) System event sockets (`PF_SYSTEM`, `SYSPROTO_EVENT`) are what you want here. They have the ability to notify the caller when an interface appears (`KEV_DL_IF_ATTACHED`), when it is about to disappear (`KEV_DL_IF_DETACHING`), and when it has vanished (`KEV_DL_IF_DETACHED`). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/78#note_966

1 0

[v2 PATCH 1/2] vbscript: Implement DateAdd().
by Nikolay Sivov 18 May '22

18 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52686 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: changed string argument to case-insensitive comparison, improved error handling. dlls/vbscript/global.c | 63 +++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 ++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 18da8e4991f..1d3929ba249 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2205,10 +2205,67 @@ static HRESULT Global_GetObject(BuiltinDisp *This, VARIANT *args, unsigned args_ return hres; } -static HRESULT Global_DateAdd(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_DateAdd(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR interval = NULL; + UDATE ud = {{ 0 }}; + HRESULT hres; + double date; + int count; + + TRACE("\n"); + + assert(args_cnt == 3); + + if (V_VT(args) == VT_NULL || V_VT(args + 1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + if (V_VT(args + 2) == VT_NULL) + return return_null(res); + + hres = to_string(args, &interval); + if (SUCCEEDED(hres)) + hres = to_int(args + 1, &count); + if (SUCCEEDED(hres)) + hres = to_system_time(args + 2, &ud.st); + if (SUCCEEDED(hres)) + { + if (!wcsicmp(interval, L"yyyy")) + ud.st.wYear += count; + else if (!wcsicmp(interval, L"q")) + ud.st.wMonth += 3 * count; + else if (!wcsicmp(interval, L"m")) + ud.st.wMonth += count; + else if (!wcsicmp(interval, L"y") + || !wcsicmp(interval, L"d") + || !wcsicmp(interval, L"w")) + { + ud.st.wDay += count; + } + else if (!wcsicmp(interval, L"ww")) + ud.st.wDay += 7 * count; + else if (!wcsicmp(interval, L"h")) + ud.st.wHour += count; + else if (!wcsicmp(interval, L"n")) + ud.st.wMinute += count; + else if (!wcsicmp(interval, L"s")) + ud.st.wSecond += count; + else + { + WARN("Unrecognized interval %s.\n", debugstr_w(interval)); + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + } + + SysFreeString(interval); + + if (SUCCEEDED(hres)) + hres = VarDateFromUdateEx(&ud, 0, 0, &date); + + if (SUCCEEDED(hres)) + hres = return_date(res, date); + + return hres; } static HRESULT Global_DateDiff(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3bc64d74193..a765eb1fcda 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1988,4 +1988,52 @@ call testDateSerial(2000, 14, 2, 2001, 2, 2) call testDateSerial(9999, 12, 1, 9999, 12, 1) call testDateSerialError() +sub testDateAdd(d, interval, number, expected_date) + dim x + x = DateAdd(interval, number, d) + call ok(Year(x) = Year(expected_date), "year = " & Year(x) & " expected " & Year(expected_date)) + call ok(Month(x) = Month(expected_date), "month = " & Month(x) & " expected " & Month(expected_date)) + call ok(Day(x) = Day(expected_date), "day = " & Day(x) & " expected " & Day(expected_date)) + call ok(getVT(x) = "VT_DATE*", "getVT = " & getVT(x)) +end sub + +sub testDateAddError() + on error resume next + dim x + call Err.clear() + x = DateAdd("k", 1, DateSerial(2000, 2, 1)) + call ok(Err.number = 5, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + call DateAdd(null, 1, DateSerial(2000, 2, 1)) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call DateAdd("q", null, DateSerial(2000, 2, 1)) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + x = DateAdd("q", 1, null) + call ok(getVT(x) = "VT_NULL*", "getVT = " & getVT(x)) + call ok(Err.number = 0, "Err.number = " & Err.number) +end sub + +call testDateAdd(DateSerial(2000, 1, 1), "yyyy", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 1, 1), "yYyy", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 1, 1), "q", 1, DateSerial(2000, 4, 1)) +call testDateAdd(DateSerial(2000, 1, 1), "Q", 1, DateSerial(2000, 4, 1)) +call testDateAdd(DateSerial(2000, 1, 1), "m", -1, DateSerial(1999, 12, 1)) +call testDateAdd(DateSerial(2000, 1, 1), "M", -1, DateSerial(1999, 12, 1)) +call testDateAdd(DateSerial(2000, 12, 31), "y", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 12, 31), "Y", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 12, 31), "d", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 12, 31), "D", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 12, 31), "w", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 12, 31), "W", 1, DateSerial(2001, 1, 1)) +call testDateAdd(DateSerial(2000, 1, 1), "y", -1, DateSerial(1999, 12, 31)) +call testDateAdd(DateSerial(2000, 1, 1), "d", -1, DateSerial(1999, 12, 31)) +call testDateAdd(DateSerial(2000, 1, 1), "w", -1, DateSerial(1999, 12, 31)) +call testDateAdd(DateSerial(2000, 1, 1), "ww", 1, DateSerial(2000, 1, 8)) +call testDateAdd(DateSerial(2000, 1, 1), "ww", -1, DateSerial(1999, 12, 25)) +call testDateAdd(DateSerial(2000, 1, 1), "Ww", -1, DateSerial(1999, 12, 25)) +call testDateAddError() + Call reportSuccess() -- 2.35.1

3 4

[PATCH 0/2] MR85: ntdll: Fix Wow64 crashes when many threads are created.
by Brendan Shanks (＠bshanks) 17 May '22

17 May '22

On both Mac and Linux under Wow64, after ~120 threads are created, the 64-bit stacks start to be allocated above 4GB. This triggered crashes in alloc_fs_sel() and when the result of get_cpu_area() was used. (On Mac the ntdll threadpool tests reproduced this, but on both platforms a test app that created 256 threads also worked). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/85

2 2

Re: [PATCH v2 0/6] MR81: windows.gaming.input: More force feedback effect tests and implementation. - approved
by Alexandre Julliard (＠julliard) 17 May '22

17 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/81

1 0

[PATCH v2 0/1] MR84: winevulkan: Update to VK spec version 1.3.214.
by Georg Lehmann (＠DadSchoorse) 17 May '22

17 May '22

-- v2: winevulkan: Update to VK spec version 1.3.214. https://gitlab.winehq.org/wine/wine/-/merge_requests/84

3 2

Re: [PATCH v4 0/6] MR78: NSI and GetAdaptersInfo() performance improvements - approved
by Alexandre Julliard (＠julliard) 17 May '22

17 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/78

1 0

Re: [PATCH v2 0/5] MR82: d3dx cleanup, preparation for building d3dx9 without -DWINE_NO_LONG_TYPES - approved
by Alexandre Julliard (＠julliard) 17 May '22

17 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/82

1 0

Re: [PATCH v2 0/5] MR80: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 17 May '22

17 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/80

1 0

Re: [PATCH v2 0/9] MR77: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 17 May '22

17 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/77

1 0

[PATCH 1/5] include: Move minidump types to a separate header.
by Nikolay Sivov 17 May '22

17 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dbghelp.h | 388 +----------------------------- include/minidumpapiset.h | 412 ++++++++++++++++++++++++++++++++ programs/winedbg/tgt_minidump.c | 2 +- 3 files changed, 415 insertions(+), 387 deletions(-) create mode 100644 include/minidumpapiset.h diff --git a/include/dbghelp.h b/include/dbghelp.h index 07fa429809a..b34ebd2edab 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -21,6 +21,8 @@ #ifndef __WINE_DBGHELP_H #define __WINE_DBGHELP_H +#include <minidumpapiset.h> + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ @@ -481,392 +483,6 @@ typedef struct _DBGHELP_MODLOAD_DATA DWORD flags; } MODLOAD_DATA, *PMODLOAD_DATA; -/************************* - * MiniDUMP * - *************************/ - -#include <pshpack4.h> -/* DebugHelp */ - -#define MINIDUMP_SIGNATURE 0x504D444D /* 'MDMP' */ -#define MINIDUMP_VERSION (42899) - -typedef DWORD RVA; -typedef ULONG64 RVA64; - -typedef enum _MINIDUMP_TYPE -{ - MiniDumpNormal = 0x0000, - MiniDumpWithDataSegs = 0x0001, - MiniDumpWithFullMemory = 0x0002, - MiniDumpWithHandleData = 0x0004, - MiniDumpFilterMemory = 0x0008, - MiniDumpScanMemory = 0x0010, - MiniDumpWithUnloadedModules = 0x0020, - MiniDumpWithIndirectlyReferencedMemory = 0x0040, - MiniDumpFilterModulePaths = 0x0080, - MiniDumpWithProcessThreadData = 0x0100, - MiniDumpWithPrivateReadWriteMemory = 0x0200, - MiniDumpWithoutOptionalData = 0x0400, - MiniDumpWithFullMemoryInfo = 0x0800, - MiniDumpWithThreadInfo = 0x1000, - MiniDumpWithCodeSegs = 0x2000 -} MINIDUMP_TYPE; - -typedef enum _MINIDUMP_CALLBACK_TYPE -{ - ModuleCallback, - ThreadCallback, - ThreadExCallback, - IncludeThreadCallback, - IncludeModuleCallback, - MemoryCallback, -} MINIDUMP_CALLBACK_TYPE; - -typedef struct _MINIDUMP_THREAD_CALLBACK -{ - ULONG ThreadId; - HANDLE ThreadHandle; -#if defined(__aarch64__) - ULONG Pad; -#endif - CONTEXT Context; - ULONG SizeOfContext; - ULONG64 StackBase; - ULONG64 StackEnd; -} MINIDUMP_THREAD_CALLBACK, *PMINIDUMP_THREAD_CALLBACK; - -typedef struct _MINIDUMP_THREAD_EX_CALLBACK -{ - ULONG ThreadId; - HANDLE ThreadHandle; -#if defined(__aarch64__) - ULONG Pad; -#endif - CONTEXT Context; - ULONG SizeOfContext; - ULONG64 StackBase; - ULONG64 StackEnd; - ULONG64 BackingStoreBase; - ULONG64 BackingStoreEnd; -} MINIDUMP_THREAD_EX_CALLBACK, *PMINIDUMP_THREAD_EX_CALLBACK; - -typedef struct _MINIDUMP_INCLUDE_THREAD_CALLBACK -{ - ULONG ThreadId; -} MINIDUMP_INCLUDE_THREAD_CALLBACK, *PMINIDUMP_INCLUDE_THREAD_CALLBACK; - -typedef enum _THREAD_WRITE_FLAGS -{ - ThreadWriteThread = 0x0001, - ThreadWriteStack = 0x0002, - ThreadWriteContext = 0x0004, - ThreadWriteBackingStore = 0x0008, - ThreadWriteInstructionWindow = 0x0010, - ThreadWriteThreadData = 0x0020, - ThreadWriteThreadInfo = 0x0040 -} THREAD_WRITE_FLAGS; - -typedef struct _MINIDUMP_MODULE_CALLBACK -{ - PWCHAR FullPath; - ULONG64 BaseOfImage; - ULONG SizeOfImage; - ULONG CheckSum; - ULONG TimeDateStamp; - VS_FIXEDFILEINFO VersionInfo; - PVOID CvRecord; - ULONG SizeOfCvRecord; - PVOID MiscRecord; - ULONG SizeOfMiscRecord; -} MINIDUMP_MODULE_CALLBACK, *PMINIDUMP_MODULE_CALLBACK; - -typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK -{ - ULONG64 BaseOfImage; -} MINIDUMP_INCLUDE_MODULE_CALLBACK, *PMINIDUMP_INCLUDE_MODULE_CALLBACK; - -typedef enum _MODULE_WRITE_FLAGS -{ - ModuleWriteModule = 0x0001, - ModuleWriteDataSeg = 0x0002, - ModuleWriteMiscRecord = 0x0004, - ModuleWriteCvRecord = 0x0008, - ModuleReferencedByMemory = 0x0010, - ModuleWriteTlsData = 0x0020, - ModuleWriteCodeSegs = 0x0040, -} MODULE_WRITE_FLAGS; - -typedef struct _MINIDUMP_CALLBACK_INPUT -{ - ULONG ProcessId; - HANDLE ProcessHandle; - ULONG CallbackType; - union - { - MINIDUMP_THREAD_CALLBACK Thread; - MINIDUMP_THREAD_EX_CALLBACK ThreadEx; - MINIDUMP_MODULE_CALLBACK Module; - MINIDUMP_INCLUDE_THREAD_CALLBACK IncludeThread; - MINIDUMP_INCLUDE_MODULE_CALLBACK IncludeModule; - } DUMMYUNIONNAME; -} MINIDUMP_CALLBACK_INPUT, *PMINIDUMP_CALLBACK_INPUT; - -typedef struct _MINIDUMP_CALLBACK_OUTPUT -{ - union - { - ULONG ModuleWriteFlags; - ULONG ThreadWriteFlags; - struct - { - ULONG64 MemoryBase; - ULONG MemorySize; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME; -} MINIDUMP_CALLBACK_OUTPUT, *PMINIDUMP_CALLBACK_OUTPUT; - -typedef BOOL (WINAPI* MINIDUMP_CALLBACK_ROUTINE)(PVOID, const PMINIDUMP_CALLBACK_INPUT, PMINIDUMP_CALLBACK_OUTPUT); - -typedef struct _MINIDUMP_CALLBACK_INFORMATION -{ - MINIDUMP_CALLBACK_ROUTINE CallbackRoutine; - void* CallbackParam; -} MINIDUMP_CALLBACK_INFORMATION, *PMINIDUMP_CALLBACK_INFORMATION; - -typedef struct _MINIDUMP_LOCATION_DESCRIPTOR -{ - ULONG DataSize; - RVA Rva; -} MINIDUMP_LOCATION_DESCRIPTOR; - -typedef struct _MINIDUMP_LOCATION_DESCRIPTOR64 -{ - ULONG64 DataSize; - RVA64 Rva; -} MINIDUMP_LOCATION_DESCRIPTOR64; - -typedef struct _MINIDUMP_DIRECTORY -{ - ULONG StreamType; - MINIDUMP_LOCATION_DESCRIPTOR Location; -} MINIDUMP_DIRECTORY, *PMINIDUMP_DIRECTORY; - -typedef struct _MINIDUMP_EXCEPTION -{ - ULONG ExceptionCode; - ULONG ExceptionFlags; - ULONG64 ExceptionRecord; - ULONG64 ExceptionAddress; - ULONG NumberParameters; - ULONG __unusedAlignment; - ULONG64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; -} MINIDUMP_EXCEPTION, *PMINIDUMP_EXCEPTION; - -typedef struct _MINIDUMP_EXCEPTION_INFORMATION -{ - DWORD ThreadId; - PEXCEPTION_POINTERS ExceptionPointers; - BOOL ClientPointers; -} MINIDUMP_EXCEPTION_INFORMATION, *PMINIDUMP_EXCEPTION_INFORMATION; - -typedef struct MINIDUMP_EXCEPTION_STREAM -{ - ULONG ThreadId; - ULONG __alignment; - MINIDUMP_EXCEPTION ExceptionRecord; - MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; -} MINIDUMP_EXCEPTION_STREAM, *PMINIDUMP_EXCEPTION_STREAM; - -typedef struct _MINIDUMP_HEADER -{ - DWORD Signature; - DWORD Version; - DWORD NumberOfStreams; - RVA StreamDirectoryRva; - DWORD CheckSum; - union - { - DWORD Reserved; - DWORD TimeDateStamp; - } DUMMYUNIONNAME; - ULONG64 Flags; -} MINIDUMP_HEADER, *PMINIDUMP_HEADER; - -typedef struct _MINIDUMP_MEMORY_DESCRIPTOR -{ - ULONG64 StartOfMemoryRange; - MINIDUMP_LOCATION_DESCRIPTOR Memory; -} MINIDUMP_MEMORY_DESCRIPTOR, *PMINIDUMP_MEMORY_DESCRIPTOR; - -typedef struct _MINIDUMP_MEMORY_LIST -{ - ULONG NumberOfMemoryRanges; - MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges[1]; /* FIXME: 0-sized array not supported */ -} MINIDUMP_MEMORY_LIST, *PMINIDUMP_MEMORY_LIST; - -typedef struct _MINIDUMP_MEMORY_DESCRIPTOR64 -{ - ULONG64 StartOfMemoryRange; - ULONG64 DataSize; -} MINIDUMP_MEMORY_DESCRIPTOR64, *PMINIDUMP_MEMORY_DESCRIPTOR64; - -typedef struct _MINIDUMP_MEMORY64_LIST -{ - ULONG64 NumberOfMemoryRanges; - RVA64 BaseRva; - MINIDUMP_MEMORY_DESCRIPTOR64 MemoryRanges[1]; /* FIXME: 0-sized array not supported */ -} MINIDUMP_MEMORY64_LIST, *PMINIDUMP_MEMORY64_LIST; - -#define MINIDUMP_MISC1_PROCESS_ID 0x00000001 -#define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002 - -typedef struct _MINIDUMP_MISC_INFO -{ - ULONG SizeOfInfo; - ULONG Flags1; - ULONG ProcessId; - ULONG ProcessCreateTime; - ULONG ProcessUserTime; - ULONG ProcessKernelTime; -} MINIDUMP_MISC_INFO, *PMINIDUMP_MISC_INFO; - -typedef struct _MINIDUMP_MODULE -{ - ULONG64 BaseOfImage; - ULONG SizeOfImage; - ULONG CheckSum; - ULONG TimeDateStamp; - RVA ModuleNameRva; - VS_FIXEDFILEINFO VersionInfo; - MINIDUMP_LOCATION_DESCRIPTOR CvRecord; - MINIDUMP_LOCATION_DESCRIPTOR MiscRecord; - ULONG64 Reserved0; - ULONG64 Reserved1; -} MINIDUMP_MODULE, *PMINIDUMP_MODULE; - -typedef struct _MINIDUMP_MODULE_LIST -{ - ULONG NumberOfModules; - MINIDUMP_MODULE Modules[1]; /* FIXME: 0-sized array not supported */ -} MINIDUMP_MODULE_LIST, *PMINIDUMP_MODULE_LIST; - -typedef struct _MINIDUMP_STRING -{ - ULONG Length; - WCHAR Buffer[1]; /* FIXME: O-sized array not supported */ -} MINIDUMP_STRING, *PMINIDUMP_STRING; - -typedef struct _MINIDUMP_SYSTEM_INFO -{ - USHORT ProcessorArchitecture; - USHORT ProcessorLevel; - USHORT ProcessorRevision; - union - { - USHORT Reserved0; - struct - { - UCHAR NumberOfProcessors; - UCHAR ProductType; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME; - - ULONG MajorVersion; - ULONG MinorVersion; - ULONG BuildNumber; - ULONG PlatformId; - - RVA CSDVersionRva; - union - { - ULONG Reserved1; - struct - { - USHORT SuiteMask; - USHORT Reserved2; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME1; - union _CPU_INFORMATION - { - struct - { - ULONG VendorId[3]; - ULONG VersionInformation; - ULONG FeatureInformation; - ULONG AMDExtendedCpuFeatures; - } X86CpuInfo; - struct - { - ULONG64 ProcessorFeatures[2]; - } OtherCpuInfo; - } Cpu; - -} MINIDUMP_SYSTEM_INFO, *PMINIDUMP_SYSTEM_INFO; - -typedef struct _MINIDUMP_THREAD -{ - ULONG ThreadId; - ULONG SuspendCount; - ULONG PriorityClass; - ULONG Priority; - ULONG64 Teb; - MINIDUMP_MEMORY_DESCRIPTOR Stack; - MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; -} MINIDUMP_THREAD, *PMINIDUMP_THREAD; - -typedef struct _MINIDUMP_THREAD_LIST -{ - ULONG NumberOfThreads; - MINIDUMP_THREAD Threads[1]; /* FIXME: no support of 0 sized array */ -} MINIDUMP_THREAD_LIST, *PMINIDUMP_THREAD_LIST; - -typedef struct _MINIDUMP_USER_STREAM -{ - ULONG Type; - ULONG BufferSize; - void* Buffer; -} MINIDUMP_USER_STREAM, *PMINIDUMP_USER_STREAM; - -typedef struct _MINIDUMP_USER_STREAM_INFORMATION -{ - ULONG UserStreamCount; - PMINIDUMP_USER_STREAM UserStreamArray; -} MINIDUMP_USER_STREAM_INFORMATION, *PMINIDUMP_USER_STREAM_INFORMATION; - -typedef enum _MINIDUMP_STREAM_TYPE -{ - UnusedStream = 0, - ReservedStream0 = 1, - ReservedStream1 = 2, - ThreadListStream = 3, - ModuleListStream = 4, - MemoryListStream = 5, - ExceptionStream = 6, - SystemInfoStream = 7, - ThreadExListStream = 8, - Memory64ListStream = 9, - CommentStreamA = 10, - CommentStreamW = 11, - HandleDataStream = 12, - FunctionTableStream = 13, - UnloadedModuleListStream = 14, - MiscInfoStream = 15, - MemoryInfoListStream = 16, - ThreadInfoListStream = 17, - - LastReservedStream = 0xffff -} MINIDUMP_STREAM_TYPE; - -BOOL WINAPI MiniDumpWriteDump(HANDLE, DWORD, HANDLE, MINIDUMP_TYPE, - const PMINIDUMP_EXCEPTION_INFORMATION, - const PMINIDUMP_USER_STREAM_INFORMATION, - const PMINIDUMP_CALLBACK_INFORMATION); -BOOL WINAPI MiniDumpReadDumpStream(PVOID, ULONG, PMINIDUMP_DIRECTORY*, PVOID*, - ULONG*); - -#include <poppack.h> - /************************* * MODULE handling * *************************/ diff --git a/include/minidumpapiset.h b/include/minidumpapiset.h new file mode 100644 index 00000000000..5efe948bad7 --- /dev/null +++ b/include/minidumpapiset.h @@ -0,0 +1,412 @@ +/* + * Copyright 2022 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MINIDUMP_H +#define __WINE_MINIDUMP_H + +#include <pshpack4.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define MINIDUMP_SIGNATURE 0x504D444D /* 'MDMP' */ +#define MINIDUMP_VERSION (42899) + +typedef DWORD RVA; +typedef ULONG64 RVA64; + +typedef enum _MINIDUMP_TYPE +{ + MiniDumpNormal = 0x00000000, + MiniDumpWithDataSegs = 0x00000001, + MiniDumpWithFullMemory = 0x00000002, + MiniDumpWithHandleData = 0x00000004, + MiniDumpFilterMemory = 0x00000008, + MiniDumpScanMemory = 0x00000010, + MiniDumpWithUnloadedModules = 0x00000020, + MiniDumpWithIndirectlyReferencedMemory = 0x00000040, + MiniDumpFilterModulePaths = 0x00000080, + MiniDumpWithProcessThreadData = 0x00000100, + MiniDumpWithPrivateReadWriteMemory = 0x00000200, + MiniDumpWithoutOptionalData = 0x00000400, + MiniDumpWithFullMemoryInfo = 0x00000800, + MiniDumpWithThreadInfo = 0x00001000, + MiniDumpWithCodeSegs = 0x00002000, + MiniDumpValidTypeFlags = 0x01ffffff, +} MINIDUMP_TYPE; + +typedef enum _MINIDUMP_CALLBACK_TYPE +{ + ModuleCallback, + ThreadCallback, + ThreadExCallback, + IncludeThreadCallback, + IncludeModuleCallback, + MemoryCallback, +} MINIDUMP_CALLBACK_TYPE; + +typedef struct _MINIDUMP_THREAD_CALLBACK +{ + ULONG ThreadId; + HANDLE ThreadHandle; +#if defined(__aarch64__) + ULONG Pad; +#endif + CONTEXT Context; + ULONG SizeOfContext; + ULONG64 StackBase; + ULONG64 StackEnd; +} MINIDUMP_THREAD_CALLBACK, *PMINIDUMP_THREAD_CALLBACK; + +typedef struct _MINIDUMP_THREAD_EX_CALLBACK +{ + ULONG ThreadId; + HANDLE ThreadHandle; +#if defined(__aarch64__) + ULONG Pad; +#endif + CONTEXT Context; + ULONG SizeOfContext; + ULONG64 StackBase; + ULONG64 StackEnd; + ULONG64 BackingStoreBase; + ULONG64 BackingStoreEnd; +} MINIDUMP_THREAD_EX_CALLBACK, *PMINIDUMP_THREAD_EX_CALLBACK; + +typedef struct _MINIDUMP_INCLUDE_THREAD_CALLBACK +{ + ULONG ThreadId; +} MINIDUMP_INCLUDE_THREAD_CALLBACK, *PMINIDUMP_INCLUDE_THREAD_CALLBACK; + +typedef enum _THREAD_WRITE_FLAGS +{ + ThreadWriteThread = 0x0001, + ThreadWriteStack = 0x0002, + ThreadWriteContext = 0x0004, + ThreadWriteBackingStore = 0x0008, + ThreadWriteInstructionWindow = 0x0010, + ThreadWriteThreadData = 0x0020, + ThreadWriteThreadInfo = 0x0040 +} THREAD_WRITE_FLAGS; + +typedef struct _MINIDUMP_MODULE_CALLBACK +{ + PWCHAR FullPath; + ULONG64 BaseOfImage; + ULONG SizeOfImage; + ULONG CheckSum; + ULONG TimeDateStamp; + VS_FIXEDFILEINFO VersionInfo; + PVOID CvRecord; + ULONG SizeOfCvRecord; + PVOID MiscRecord; + ULONG SizeOfMiscRecord; +} MINIDUMP_MODULE_CALLBACK, *PMINIDUMP_MODULE_CALLBACK; + +typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK +{ + ULONG64 BaseOfImage; +} MINIDUMP_INCLUDE_MODULE_CALLBACK, *PMINIDUMP_INCLUDE_MODULE_CALLBACK; + +typedef enum _MODULE_WRITE_FLAGS +{ + ModuleWriteModule = 0x0001, + ModuleWriteDataSeg = 0x0002, + ModuleWriteMiscRecord = 0x0004, + ModuleWriteCvRecord = 0x0008, + ModuleReferencedByMemory = 0x0010, + ModuleWriteTlsData = 0x0020, + ModuleWriteCodeSegs = 0x0040, +} MODULE_WRITE_FLAGS; + +typedef struct _MINIDUMP_CALLBACK_INPUT +{ + ULONG ProcessId; + HANDLE ProcessHandle; + ULONG CallbackType; + union + { + MINIDUMP_THREAD_CALLBACK Thread; + MINIDUMP_THREAD_EX_CALLBACK ThreadEx; + MINIDUMP_MODULE_CALLBACK Module; + MINIDUMP_INCLUDE_THREAD_CALLBACK IncludeThread; + MINIDUMP_INCLUDE_MODULE_CALLBACK IncludeModule; + } DUMMYUNIONNAME; +} MINIDUMP_CALLBACK_INPUT, *PMINIDUMP_CALLBACK_INPUT; + +typedef struct _MINIDUMP_CALLBACK_OUTPUT +{ + union + { + ULONG ModuleWriteFlags; + ULONG ThreadWriteFlags; + struct + { + ULONG64 MemoryBase; + ULONG MemorySize; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} MINIDUMP_CALLBACK_OUTPUT, *PMINIDUMP_CALLBACK_OUTPUT; + +typedef BOOL (WINAPI* MINIDUMP_CALLBACK_ROUTINE)(PVOID, const PMINIDUMP_CALLBACK_INPUT, PMINIDUMP_CALLBACK_OUTPUT); + +typedef struct _MINIDUMP_CALLBACK_INFORMATION +{ + MINIDUMP_CALLBACK_ROUTINE CallbackRoutine; + void *CallbackParam; +} MINIDUMP_CALLBACK_INFORMATION, *PMINIDUMP_CALLBACK_INFORMATION; + +typedef struct _MINIDUMP_LOCATION_DESCRIPTOR +{ + ULONG32 DataSize; + RVA Rva; +} MINIDUMP_LOCATION_DESCRIPTOR; + +typedef struct _MINIDUMP_LOCATION_DESCRIPTOR64 +{ + ULONG64 DataSize; + RVA64 Rva; +} MINIDUMP_LOCATION_DESCRIPTOR64; + +typedef struct _MINIDUMP_DIRECTORY +{ + ULONG32 StreamType; + MINIDUMP_LOCATION_DESCRIPTOR Location; +} MINIDUMP_DIRECTORY, *PMINIDUMP_DIRECTORY; + +typedef struct _MINIDUMP_EXCEPTION +{ + ULONG32 ExceptionCode; + ULONG32 ExceptionFlags; + ULONG64 ExceptionRecord; + ULONG64 ExceptionAddress; + ULONG32 NumberParameters; + ULONG32 __unusedAlignment; + ULONG64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} MINIDUMP_EXCEPTION, *PMINIDUMP_EXCEPTION; + +typedef struct _MINIDUMP_EXCEPTION_INFORMATION +{ + DWORD ThreadId; + PEXCEPTION_POINTERS ExceptionPointers; + BOOL ClientPointers; +} MINIDUMP_EXCEPTION_INFORMATION, *PMINIDUMP_EXCEPTION_INFORMATION; + +typedef struct MINIDUMP_EXCEPTION_STREAM +{ + ULONG32 ThreadId; + ULONG32 __alignment; + MINIDUMP_EXCEPTION ExceptionRecord; + MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; +} MINIDUMP_EXCEPTION_STREAM, *PMINIDUMP_EXCEPTION_STREAM; + +typedef struct _MINIDUMP_HEADER +{ + ULONG32 Signature; + ULONG32 Version; + ULONG32 NumberOfStreams; + RVA StreamDirectoryRva; + ULONG32 CheckSum; + union + { + ULONG32 Reserved; + ULONG32 TimeDateStamp; + } DUMMYUNIONNAME; + ULONG64 Flags; +} MINIDUMP_HEADER, *PMINIDUMP_HEADER; + +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR +{ + ULONG64 StartOfMemoryRange; + MINIDUMP_LOCATION_DESCRIPTOR Memory; +} MINIDUMP_MEMORY_DESCRIPTOR, *PMINIDUMP_MEMORY_DESCRIPTOR; + +typedef struct _MINIDUMP_MEMORY_LIST +{ + ULONG32 NumberOfMemoryRanges; + MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges[1]; /* FIXME: 0-sized array not supported */ +} MINIDUMP_MEMORY_LIST, *PMINIDUMP_MEMORY_LIST; + +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR64 +{ + ULONG64 StartOfMemoryRange; + ULONG64 DataSize; +} MINIDUMP_MEMORY_DESCRIPTOR64, *PMINIDUMP_MEMORY_DESCRIPTOR64; + +typedef struct _MINIDUMP_MEMORY64_LIST +{ + ULONG64 NumberOfMemoryRanges; + RVA64 BaseRva; + MINIDUMP_MEMORY_DESCRIPTOR64 MemoryRanges[1]; /* FIXME: 0-sized array not supported */ +} MINIDUMP_MEMORY64_LIST, *PMINIDUMP_MEMORY64_LIST; + +#define MINIDUMP_MISC1_PROCESS_ID 0x00000001 +#define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002 + +typedef struct _MINIDUMP_MISC_INFO +{ + ULONG32 SizeOfInfo; + ULONG32 Flags1; + ULONG32 ProcessId; + ULONG32 ProcessCreateTime; + ULONG32 ProcessUserTime; + ULONG32 ProcessKernelTime; +} MINIDUMP_MISC_INFO, *PMINIDUMP_MISC_INFO; + +typedef struct _MINIDUMP_MODULE +{ + ULONG64 BaseOfImage; + ULONG32 SizeOfImage; + ULONG32 CheckSum; + ULONG32 TimeDateStamp; + RVA ModuleNameRva; + VS_FIXEDFILEINFO VersionInfo; + MINIDUMP_LOCATION_DESCRIPTOR CvRecord; + MINIDUMP_LOCATION_DESCRIPTOR MiscRecord; + ULONG64 Reserved0; + ULONG64 Reserved1; +} MINIDUMP_MODULE, *PMINIDUMP_MODULE; + +typedef struct _MINIDUMP_MODULE_LIST +{ + ULONG32 NumberOfModules; + MINIDUMP_MODULE Modules[1]; /* FIXME: 0-sized array not supported */ +} MINIDUMP_MODULE_LIST, *PMINIDUMP_MODULE_LIST; + +typedef struct _MINIDUMP_STRING +{ + ULONG32 Length; + WCHAR Buffer[1]; /* FIXME: O-sized array not supported */ +} MINIDUMP_STRING, *PMINIDUMP_STRING; + +typedef union _CPU_INFORMATION +{ + struct + { + ULONG32 VendorId[3]; + ULONG32 VersionInformation; + ULONG32 FeatureInformation; + ULONG32 AMDExtendedCpuFeatures; + } X86CpuInfo; + struct + { + ULONG64 ProcessorFeatures[2]; + } OtherCpuInfo; +} CPU_INFORMATION, *PCPU_INFORMATION; + +typedef struct _MINIDUMP_SYSTEM_INFO +{ + USHORT ProcessorArchitecture; + USHORT ProcessorLevel; + USHORT ProcessorRevision; + union + { + USHORT Reserved0; + struct + { + UCHAR NumberOfProcessors; + UCHAR ProductType; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + + ULONG32 MajorVersion; + ULONG32 MinorVersion; + ULONG32 BuildNumber; + ULONG32 PlatformId; + + RVA CSDVersionRva; + union + { + ULONG32 Reserved1; + struct + { + USHORT SuiteMask; + USHORT Reserved2; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME1; + CPU_INFORMATION Cpu; +} MINIDUMP_SYSTEM_INFO, *PMINIDUMP_SYSTEM_INFO; + +typedef struct _MINIDUMP_THREAD +{ + ULONG32 ThreadId; + ULONG32 SuspendCount; + ULONG32 PriorityClass; + ULONG32 Priority; + ULONG64 Teb; + MINIDUMP_MEMORY_DESCRIPTOR Stack; + MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; +} MINIDUMP_THREAD, *PMINIDUMP_THREAD; + +typedef struct _MINIDUMP_THREAD_LIST +{ + ULONG32 NumberOfThreads; + MINIDUMP_THREAD Threads[1]; /* FIXME: no support of 0 sized array */ +} MINIDUMP_THREAD_LIST, *PMINIDUMP_THREAD_LIST; + +typedef struct _MINIDUMP_USER_STREAM +{ + ULONG32 Type; + ULONG BufferSize; + void *Buffer; +} MINIDUMP_USER_STREAM, *PMINIDUMP_USER_STREAM; + +typedef struct _MINIDUMP_USER_STREAM_INFORMATION +{ + ULONG UserStreamCount; + PMINIDUMP_USER_STREAM UserStreamArray; +} MINIDUMP_USER_STREAM_INFORMATION, *PMINIDUMP_USER_STREAM_INFORMATION; + +typedef enum _MINIDUMP_STREAM_TYPE +{ + UnusedStream = 0, + ReservedStream0 = 1, + ReservedStream1 = 2, + ThreadListStream = 3, + ModuleListStream = 4, + MemoryListStream = 5, + ExceptionStream = 6, + SystemInfoStream = 7, + ThreadExListStream = 8, + Memory64ListStream = 9, + CommentStreamA = 10, + CommentStreamW = 11, + HandleDataStream = 12, + FunctionTableStream = 13, + UnloadedModuleListStream = 14, + MiscInfoStream = 15, + MemoryInfoListStream = 16, + ThreadInfoListStream = 17, + + LastReservedStream = 0xffff +} MINIDUMP_STREAM_TYPE; + +BOOL WINAPI MiniDumpWriteDump(HANDLE process, DWORD pid, HANDLE hfile, MINIDUMP_TYPE dumptype, + PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, + PMINIDUMP_CALLBACK_INFORMATION CallbackParam); +BOOL WINAPI MiniDumpReadDumpStream(PVOID base, ULONG index, PMINIDUMP_DIRECTORY *dir, void **streamptr, + ULONG *stream_size); + +#ifdef __cplusplus +} +#endif + +#include <poppack.h> + +#endif /* __WINE_MINIDUMP_H */ diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 5fa615bcd45..af39d4af922 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -379,7 +379,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) break; default: str = "???"; break; } - dbg_printf(" on Windows %s (%lu)\n", str, msi->BuildNumber); + dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber); /* FIXME CSD: msi->CSDVersionRva */ if (sizeof(MINIDUMP_SYSTEM_INFO) + 4 > dir->Location.DataSize && -- 2.35.1

1 4

[PATCH vkd3d v2 01/10] tests: Add additional subtests to implicit array initialization.
by Giovanni Mascellani 17 May '22

17 May '22

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v3: - Simplified tests that are expected to fail. - Addeed a tests for implicit arrays in a typedef. - Added a test for an array of complex elements. - Moved all tests not expected to fail to the top. - Removed the 'Implicit array of elements of size 0 with broadcast initialization' test. Replaced with a simple 'Broadcast to an implicit array' test from zf. - Calling 'implicit arrays' as 'implicit size arrays' now. --- ...lsl-initializer-implicit-array.shader_test | 223 +++++++++++++++++- 1 file changed, 222 insertions(+), 1 deletion(-) diff --git a/tests/hlsl-initializer-implicit-array.shader_test b/tests/hlsl-initializer-implicit-array.shader_test index d2b94da4..648825eb 100644 --- a/tests/hlsl-initializer-implicit-array.shader_test +++ b/tests/hlsl-initializer-implicit-array.shader_test @@ -2,6 +2,7 @@ float4 main() : SV_TARGET { float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80}; + return arr[1]; } @@ -10,9 +11,229 @@ todo draw quad todo probe all rgba (50, 60, 70, 80) +[pixel shader] +float4 main() : sv_target +{ + float4 arr1[2] = {1, 2, 3, 4, 5, 6, 7, 8}; + float4 arr2[] = arr1; + + return arr2[1]; +} + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +float4 main() : sv_target +{ + float2 arr[][3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return float4(arr[1][0], arr[1][1]); +} + +[test] +todo draw quad +todo probe all rgba (7.0, 8.0, 9.0, 10.0) + + +[pixel shader] +struct foo +{ + float3 foo1; + float4 foo2; +}; + +struct bar +{ + struct foo aa; + int2 bb; + float4 cc[2]; +}; + +float4 main() : SV_TARGET +{ + struct bar p[] = { + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + }; + return p[0].aa.foo2 + p[1].cc[1]; +} + +[test] +todo draw quad +todo probe all rgba (318.0, 320.0, 322.0, 324.0) + + [pixel shader fail] +// Incompatible number of arguments in implicit size array initializer float4 main() : SV_TARGET { float4 arr[] = {10, 20, 30, 40, 50, 60, 70}; - return arr[0]; + + return 0.0; +} + + +[pixel shader fail] +// Incompatible number of arguments in implicit size array initializer +float4 main() : SV_TARGET +{ + float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80, 90}; + + return 0.0; +} + +[pixel shader fail] +// Implicit size inner array +float4 main() : sv_target +{ + float2 arr[3][] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array without initializer +float4 main() : sv_target +{ + float4 arr[]; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as struct member +struct foobar +{ + int a; + float4 arr[]; +}; + +float4 main() : sv_target +{ + struct foobar s; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as function argument +float4 fun(float4 arr[]) +{ + return 1.0; +} +float4 main() : sv_target +{ + float4 arr[3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; + return fun(arr); +} + + +[pixel shader fail] +// Implicit size array as function return type +// Note: explicit size arrays are not allowed either. +float4[] fun() +{ + float4 ret[2] = {1, 2, 3, 4, 5, 6, 7, 8}; + + return ret; +} + +float4 main() : sv_target +{ fun(); + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as a cast +float4 main() : sv_target +{ + float2 arr1[4] = {1, 2, 3, 4, 5, 6, 7, 8}; + float4 arr2[2] = (float4 []) arr1; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array as a typedef +typedef float4 arrtype[]; + +float4 main() : sv_target +{ + arrtype arr1 = {1, 2, 3, 4, 5, 6, 7, 8}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[] = {1, 2, 3, 4}; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0, without initializer +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[]; + + return 0.0; +} + + +[pixel shader fail] +// Broadcast to an implicit size array +float4 main() : sv_target +{ + int a[4] = (int[]) 0; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array with an initializer of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + float4 arr[] = (struct emp) 42; + + return 0.0; +} + + +[pixel shader fail] +// Implicit size array of elements of size 0 with initializer of size 0 +struct emp +{ +}; + +float4 main() : sv_target +{ + struct emp arr[] = (struct emp) 42; + + return 0.0; } -- 2.36.0

3 29

[PATCH 1/2] maintainers: Add a GStreamer section.
by Zebediah Figura 17 May '22

17 May '22

Assign formal maintainership of the whole DLL to myself. Although there are parts of winegstreamer that fall under the purview of Media Foundation, it is not really possible to separate these logically from the parts which interact with the GStreamer backend. Better to have a dedicated maintainer for the whole DLL, and assign patches to the Media Foundation maintainer as necessary. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- MAINTAINERS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index b012f3c4e09..4f5b8f9af98 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -112,7 +112,6 @@ F: dlls/qcap/ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ -F: dlls/winegstreamer/quartz_parser.c F: libs/strmbase/ DirectWrite @@ -155,6 +154,10 @@ GPhoto Driver M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ +GStreamer multimedia backend +M: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/winegstreamer/ + HID support M: Aric Stewart <aric(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> -- 2.35.1

1 1

[PATCH 0/1] MR84: winevulkan: Update to VK spec version 1.3.214.
by Georg Lehmann (＠DadSchoorse) 17 May '22

17 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/84

2 1

[PATCH v3 0/6] MR78: NSI and GetAdaptersInfo() performance improvements
by Paul Gofman (＠gofman) 17 May '22

17 May '22

This is inspired by Street Fighter V game which performance has regressed in multiplayer mode since iphlpapi reimplementation on top of NSI. Speficically, the game calls GetAdapatersInfo() very often which turnaround time increased dramatically. While I was checking the effect against GetAdapatersInfo() only I hope the patchset might improve the performance of some other iphlpapi functions as well. Here is the patch I used as a top level measure of the effect: https://gist.github.com/gofman/c08e58f15105d60b4576c9ae25bcec9d The table below lists the times of GetAdaptersInfo() in ms measured with this test (this is the time for GetAdapatersInfo(NULL, ...) for estimating the buffer length plus actual data query call. The major difference between Machine 1 and Machine 2 is most likely in the number of ip routing table entries (8 on "Machine 2" and 4 on "Machine 1"). Windows has less interfaces and routes configured so it is probably not suitable for back to back performance comparison this way although the datapoint may still be interesting for very rough comparison. The baseline here is the performance before iphlpapi redesign (which I measured on Proton 6.3). There are maybe more opportunities for optimization but after this patchset GetAdapatersInfo() performance is slightly improved over baseline so I stopped here for now. ``` Machine 1 Machine 2 Windows 0.7 Proton 6.3 2.7 8.7 Current Wine 12.2 99.8 After patch 1 10.0 59.2 After patch 4 5.5 27.2 After patch 5 3.6 20.2 After patch 6 2.4 7.6 ``` -- v3: iphlpapi: Don't request unused dynamic interface data. nsi: Allocate a small buffer at once in NsiAllocateAndGetTable(). nsiproxy.sys: Update interface table only if LUID is not found in convert_unix_name_to_luid(). nsiproxy.sys: Update interface table only if LUID is not found in convert_luid_to_unix_name(). https://gitlab.winehq.org/wine/wine/-/merge_requests/78

3 8

[PATCH v2 0/6] MR78: NSI and GetAdaptersInfo() performance improvements
by Paul Gofman (＠gofman) 17 May '22

17 May '22

This is inspired by Street Fighter V game which performance has regressed in multiplayer mode since iphlpapi reimplementation on top of NSI. Speficically, the game calls GetAdapatersInfo() very often which turnaround time increased dramatically. While I was checking the effect against GetAdapatersInfo() only I hope the patchset might improve the performance of some other iphlpapi functions as well. Here is the patch I used as a top level measure of the effect: https://gist.github.com/gofman/c08e58f15105d60b4576c9ae25bcec9d The table below lists the times of GetAdaptersInfo() in ms measured with this test (this is the time for GetAdapatersInfo(NULL, ...) for estimating the buffer length plus actual data query call. The major difference between Machine 1 and Machine 2 is most likely in the number of ip routing table entries (8 on "Machine 2" and 4 on "Machine 1"). Windows has less interfaces and routes configured so it is probably not suitable for back to back performance comparison this way although the datapoint may still be interesting for very rough comparison. The baseline here is the performance before iphlpapi redesign (which I measured on Proton 6.3). There are maybe more opportunities for optimization but after this patchset GetAdapatersInfo() performance is slightly improved over baseline so I stopped here for now. ``` Machine 1 Machine 2 Windows 0.7 Proton 6.3 2.7 8.7 Current Wine 12.2 99.8 After patch 1 10.0 59.2 After patch 4 5.5 27.2 After patch 5 3.6 20.2 After patch 6 2.4 7.6 ``` -- v2: iphlpapi: Don't request unused dynamic interface data. nsi: Allocate a small buffer at once in NsiAllocateAndGetTable(). nsiproxy.sys: Update interface table only if LUID is not found in convert_unix_name_to_luid(). nsiproxy.sys: Update interface table only if LUID is not found in convert_luid_to_unix_name(). nsiproxy.sys: Finish search once found in convert_luid_to_unix_name(). https://gitlab.winehq.org/wine/wine/-/merge_requests/78

3 8

[PATCH v4 1/2] oleacc/tests: Add tests for retrieving an IAccessible contained within a Dynamic Annotation wrapper.
by Connor McAdams 17 May '22

17 May '22

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v4: Add new tests for getting the IAccessible contained within a Dynamic Annotation IAccessible wrapper. --- dlls/oleacc/tests/main.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7854764ec08..780919c2ab5 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -62,6 +62,8 @@ DEFINE_EXPECT(Accessible_get_accParent); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); + static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); static BOOL init(void) @@ -684,7 +686,8 @@ static void test_AccessibleObjectFromWindow(void) static void test_AccessibleObjectFromEvent(void) { - IAccessible *acc; + IAccessible *acc, *acc2; + IServiceProvider *sp; VARIANT cid; HRESULT hr; HWND hwnd; @@ -720,6 +723,21 @@ static void test_AccessibleObjectFromEvent(void) CHECK_CALLED(Accessible_get_accChild); ok(hr == S_OK, "got %#lx\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); + /* Get &Accessible out of the Dynamic Annotation IAccessible wrapper. */ + if (!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible)) + { + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&sp); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!!sp, "sp == NULL\n"); + + hr = IServiceProvider_QueryService(sp, &SID_AccFromDAWrapper, &IID_IAccessible, + (void**)&acc2); + ok(hr == S_OK, "got %#lx\n", hr); + ok(iface_cmp((IUnknown*)acc2, (IUnknown*)&Accessible), "acc != &Accessible\n"); + IAccessible_Release(acc2); + IServiceProvider_Release(sp); + } + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); ok(V_I4(&cid) == 1, "got %#lx, expected 1\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent); -- 2.25.1

2 3

[PATCH v5 4/4] oleacc: Add IAccessible refcount tests.
by Piotr Caban 17 May '22

17 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH v5 3/4] oleacc: Store test IAccessible data in structure.
by Piotr Caban 17 May '22

17 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 147 ++++++++++++++++++++++++--------------- 1 file changed, 92 insertions(+), 55 deletions(-)

1 0

[PATCH v5 2/4] oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject.
by Piotr Caban 17 May '22

17 May '22

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/main.c | 53 +++++++++++++--- dlls/oleacc/tests/main.c | 129 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 173 insertions(+), 9 deletions(-)

1 0

[PATCH v5 1/4] oleacc/tests: Add tests for retrieving an IAccessible contained within a Dynamic Annotation wrapper.
by Piotr Caban 17 May '22

17 May '22

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v5: - changed WindowFromAccessibleObject behavior when function it calls returns S_FALSE - minor test changes - added patches 3 and 4 dlls/oleacc/tests/main.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH] mfreadwrite/reader: Propagate resource sharing mode to the sample allocator.
by Nikolay Sivov 17 May '22

17 May '22

The issue found by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 32 ++++++- dlls/mfreadwrite/tests/mfplat.c | 145 ++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/resource.rc | 3 + dlls/mfreadwrite/tests/test.mp4 | Bin 0 -> 1554 bytes 4 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 dlls/mfreadwrite/tests/test.mp4 diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 741ef93f367..b1175479dec 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1651,9 +1651,30 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea return type_set ? S_OK : S_FALSE; } +static HRESULT source_reader_create_sample_allocator_attributes(const struct source_reader *reader, + IMFAttributes **attributes) +{ + UINT32 shared = 0, shared_without_mutex = 0; + HRESULT hr; + + if (FAILED(hr = MFCreateAttributes(attributes, 1))) + return hr; + + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED, &shared); + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &shared_without_mutex); + + if (shared_without_mutex) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + else if (shared) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED, TRUE); + + return hr; +} + static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index) { struct media_stream *stream = &reader->streams[index]; + IMFAttributes *attributes = NULL; GUID major = { 0 }; HRESULT hr; @@ -1680,8 +1701,17 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader return hr; } - if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current))) + if (FAILED(hr = source_reader_create_sample_allocator_attributes(reader, &attributes))) + WARN("Failed to create allocator attributes, hr %#lx.\n", hr); + + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, + attributes, stream->current))) + { WARN("Failed to initialize sample allocator, hr %#lx.\n", hr); + } + + if (attributes) + IMFAttributes_Release(attributes); return hr; } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index fcf642859d5..10aa74cd60f 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -26,8 +26,10 @@ #include "winuser.h" #include "winreg.h" +#define D3D11_INIT_GUID #include "initguid.h" #include "ole2.h" +#include "d3d11_4.h" DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -42,6 +44,12 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); #include "wine/test.h" +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); +static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -80,7 +88,33 @@ static IDirect3DDevice9 *create_d3d9_device(IDirect3D9 *d3d9, HWND focus_window) return device; } -static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); +static ID3D11Device *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + unsigned int feature_level_count; + ID3D11Device *device; + + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} static void init_functions(void) { @@ -88,6 +122,12 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateMFByteStreamOnStream); + X(MFCreateDXGIDeviceManager); + + if ((mod = LoadLibraryA("d3d11.dll"))) + { + X(D3D11CreateDevice); + } #undef X } @@ -1225,6 +1265,108 @@ done: DestroyWindow(window); } +static void test_reader_d3d11(void) +{ + D3D11_TEXTURE2D_DESC texture_desc; + IMFDXGIDeviceManager *manager; + IMFDXGIBuffer *dxgi_buffer; + IMFAttributes *attributes; + IMFMediaType *media_type; + ID3D11Texture2D *texture; + IMFSourceReader *reader; + IMFMediaBuffer *buffer; + IMFByteStream *stream; + ID3D11Device *device; + DWORD count, flags; + IMFSample *sample; + HRESULT hr; + UINT token; + + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create device manager, hr %#lx.\n", hr); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); + ok(hr == S_OK, "Failed to set a device, hr %#lx.\n", hr); + + stream = get_resource_stream("test.mp4"); + + hr = MFCreateAttributes(&attributes, 1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_D3D_MANAGER, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, D3D11_BIND_SHADER_RESOURCE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, 2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)4 << 32 | 4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFSourceReader_SetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, NULL, media_type); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (FAILED(hr)) + { + goto done; + } + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, &flags, NULL, &sample); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count == 1, "Unexpected count %lu.\n", count); + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ID3D11Texture2D_GetDesc(texture, &texture_desc); + + ok(texture_desc.BindFlags == (D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET), + "Unexpected bind flags %#x.\n", texture_desc.BindFlags); + ok(texture_desc.MiscFlags == D3D11_RESOURCE_MISC_SHARED, "Unexpected Misc flags %#x.\n", texture_desc.MiscFlags); + + ID3D11Texture2D_Release(texture); + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); + + IMFSample_Release(sample); + +done: + IMFAttributes_Release(attributes); + IMFSourceReader_Release(reader); + + IMFMediaType_Release(media_type); + IMFByteStream_Release(stream); + IMFDXGIDeviceManager_Release(manager); + ID3D11Device_Release(device); +} + START_TEST(mfplat) { HRESULT hr; @@ -1238,6 +1380,7 @@ START_TEST(mfplat) test_source_reader(); test_source_reader_from_media_source(); test_reader_d3d9(); + test_reader_d3d11(); hr = MFShutdown(); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/mfreadwrite/tests/resource.rc b/dlls/mfreadwrite/tests/resource.rc index f54212a8c8f..9cd83ce3217 100644 --- a/dlls/mfreadwrite/tests/resource.rc +++ b/dlls/mfreadwrite/tests/resource.rc @@ -20,3 +20,6 @@ /* @makedep: test.wav */ test.wav RCDATA test.wav + +/* @makedep: test.mp4 */ +test.mp4 RCDATA test.mp4 diff --git a/dlls/mfreadwrite/tests/test.mp4 b/dlls/mfreadwrite/tests/test.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a5bbca6bbf7692eab047050b79b8ccc83516e6b4 GIT binary patch literal 1554 zcmZuxeN0nV6u<3bttg}g3M<<3v4A5C7=;cYskS&=aH+Gw(TQ=|2k#+BpKbac6$q26 zgvfMZE^O--6L1NclR1flh8QLw4%rM5#eGC{R2Jv(j|s9(8MANazOwnmo#gk<x#yhw zyZ4@R-$e*%%DGx+CF@`ik|L}DS&UP!LkKM^chNNX_cIj9Atd<{DdnJiN*lZEK&*TH zLUnilE|&Pi#`t<(V2JeCh0xUFbE~$JpP!3QD)e^to@B05Kdu~jt~KuYz}1=h$wy;^ z-(P&iYuL#r*6qMlmYD;w&8gboiuVmim)E`@VY(w}d_`I2ihOP3>WzsJPV$oN<)LWX zeE-6+iWMz`xA<B45szMa^nqwQ5w>wzrc-v;{3ns3&Hgygab@co_v%sWh^~kxZdgv1 zG$e27=y&X0FwfM)&vJ1wQfF>hX5`>p!|hca@<xwAt#6-gnD>;lG>BPmWrt3nUp`73 z+Yr|+TbnzS=UsV1v;C6gviW|rw)-!S-=bHn;0v1+QGDC}Ia|1D&?ob%jF`h$Wc#Ew zV;vf3`obS*$vM<kEDwCQ`|#nw>4L6xr#4wnKY06wGT*}wdIn7LW=}zVn#?n%4mVMz zS*QG<-xMcs%$)a1n<6jX{=IjfF~joa!xMeyYRwY|Cr0Vm>*3w%uu#*`=0;_WapAn$ zU<`El@AbuA79AjpWMkq|c1;#tZJ#~+J(2cx>Nm%BvdmP*5AP|wGW~$TESZLVhn6a1 ztO^C+GL%><v}DW7eXsQJ-HUG|I!ZcwqEv0#Ya@m<t5KG7N5rlo$2IYtr*eGsbj8h0 z?c@jJ8?GH6PW~!_$shUIcJraKf^47ff8>qKKRQs;^7r5rKP{`hCoZsRD*LTIOV>}^ zv}Z#0Dsy%(f4!(s5zT+wRX-W1@{bU&DxT$gcYNB95Wz4GhZ`=WopD!CphZIb3Y&Tt zN#HB;J~@EE6G4Pb;@qcgDO~ywITu+4q3v9iuqGi&TV#WEm&%fL{&(FFn1q2)5>0U| zXbo*=;Rh207#4X2E~$c{DoKbWFx1ksXMtOViZ2NB(km#tOR(VMuB70{eJoZOI||7? zl%2*olCw<Zo^mi$Zbl##Z##(!#x#_R#yMDUJgnMfPYBwQI+iQ7gFVc0?7t1cIX-wf zaHFt@IfI@MICdeJ7+9Xp2>Ks?)jSUa8_iO<Oo;G!Jey%!2<ZHT2<$>SD4dRa20SkU zV;68rdYYqx<dOt*;hjTh6eXe7GH{(SlkT#Yax=1Y8M;ip4CY9n)kw{9LK`q0-qUjY z7J{U}>4bH`mH}`KUjy7ccnDD_0CJHA@_=3toU_OwXamIR7Gqf9{35_wfE7@%h&<3n zKs;bQARC}!xiSZ6ESNJ5P+CoKB<O7nEod-NqPX>NU0kHoiM#Wkq*n&-SMq0^0~2cD TJ;x-N6hTeOp(eUDP!ruh^$B~# literal 0 HcmV?d00001 -- 2.35.1

3 3

[v2 PATCH] mfreadwrite/reader: Propagate resource sharing mode to the sample allocator.
by Nikolay Sivov 17 May '22

17 May '22

The issue found by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: dropped tests for now, until I figure out why it crashes on win7. dlls/mfreadwrite/reader.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 741ef93f367..b1175479dec 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1651,9 +1651,30 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea return type_set ? S_OK : S_FALSE; } +static HRESULT source_reader_create_sample_allocator_attributes(const struct source_reader *reader, + IMFAttributes **attributes) +{ + UINT32 shared = 0, shared_without_mutex = 0; + HRESULT hr; + + if (FAILED(hr = MFCreateAttributes(attributes, 1))) + return hr; + + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED, &shared); + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &shared_without_mutex); + + if (shared_without_mutex) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + else if (shared) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED, TRUE); + + return hr; +} + static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index) { struct media_stream *stream = &reader->streams[index]; + IMFAttributes *attributes = NULL; GUID major = { 0 }; HRESULT hr; @@ -1680,8 +1701,17 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader return hr; } - if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current))) + if (FAILED(hr = source_reader_create_sample_allocator_attributes(reader, &attributes))) + WARN("Failed to create allocator attributes, hr %#lx.\n", hr); + + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, + attributes, stream->current))) + { WARN("Failed to initialize sample allocator, hr %#lx.\n", hr); + } + + if (attributes) + IMFAttributes_Release(attributes); return hr; } -- 2.35.1

1 0

[PATCH 4/4] gdi32: Implement D3DKMTQueryVideoMemoryInfo().
by Zhiyi Zhang 17 May '22

17 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- dlls/win32u/dibdrv/dc.c | 2 ++ dlls/win32u/driver.c | 37 +++++++++++++++++++++ dlls/win32u/emfdrv.c | 1 + dlls/win32u/font.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/path.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 59 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 1 + include/ntgdi.h | 1 + include/wine/gdi_driver.h | 1 + 18 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index d0ffe827539..d6a0ad90e1e 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -85,6 +85,7 @@ @ stdcall D3DKMTOpenAdapterFromHdc(ptr) win32u.NtGdiDdDDIOpenAdapterFromHdc @ stdcall D3DKMTOpenAdapterFromLuid(ptr) win32u.NtGdiDdDDIOpenAdapterFromLuid @ stdcall D3DKMTQueryStatistics(ptr) win32u.NtGdiDdDDIQueryStatistics +@ stdcall D3DKMTQueryVideoMemoryInfo(ptr) win32u.NtGdiDdDDIQueryVideoMemoryInfo @ stdcall D3DKMTSetQueuedLimit(ptr) win32u.NtGdiDdDDISetQueuedLimit @ stdcall D3DKMTSetVidPnSourceOwner(ptr) win32u.NtGdiDdDDISetVidPnSourceOwner @ stdcall DPtoLP(long ptr long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 5117d34908d..79eedda1241 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -918,7 +918,7 @@ static void test_D3DKMTQueryVideoMemoryInfo(void) if (!pD3DKMTQueryVideoMemoryInfo) { - skip("D3DKMTQueryVideoMemoryInfo() is unavailable.\n"); + win_skip("D3DKMTQueryVideoMemoryInfo() is unavailable.\n"); return; } diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index caa3cc92587..7c60466d9ee 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -711,6 +711,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */ NULL, /* pD3DKMTOpenAdapterFromLuid */ + NULL, /* pD3DKMTQueryVideoMemoryInfo */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_DIB_DRV /* priority */ }; @@ -1267,6 +1268,7 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */ NULL, /* pD3DKMTOpenAdapterFromLuid */ + NULL, /* pD3DKMTQueryVideoMemoryInfo */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_DIB_DRV + 10 /* priority */ }; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 31383330bc4..9185069208a 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -560,6 +560,11 @@ static NTSTATUS CDECL nulldrv_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROML return STATUS_PROCEDURE_NOT_FOUND; } +static NTSTATUS CDECL nulldrv_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) +{ + return STATUS_PROCEDURE_NOT_FOUND; +} + static NTSTATUS CDECL nulldrv_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { return STATUS_PROCEDURE_NOT_FOUND; @@ -659,6 +664,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_D3DKMTCheckVidPnExclusiveOwnership, /* pD3DKMTCheckVidPnExclusiveOwnership */ nulldrv_D3DKMTCloseAdapter, /* pD3DKMTCloseAdapter */ nulldrv_D3DKMTOpenAdapterFromLuid, /* pD3DKMTOpenAdapterFromLuid */ + nulldrv_D3DKMTQueryVideoMemoryInfo, /* pD3DKMTQueryVideoMemoryInfo */ nulldrv_D3DKMTSetVidPnSourceOwner, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_NULL_DRV /* priority */ @@ -1475,6 +1481,37 @@ NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ) return STATUS_SUCCESS; } +/****************************************************************************** + * NtGdiDdDDIQueryVideoMemoryInfo (win32u.@) + */ +NTSTATUS WINAPI NtGdiDdDDIQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) +{ + OBJECT_BASIC_INFORMATION info; + NTSTATUS status; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter || + (desc->MemorySegmentGroup != D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL && + desc->MemorySegmentGroup != D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL)) + return STATUS_INVALID_PARAMETER; + + /* FIXME: Wine currently doesn't support linked adapters */ + if (desc->PhysicalAdapterIndex > 0) + return STATUS_INVALID_PARAMETER; + + status = NtQueryObject(desc->hProcess ? desc->hProcess : GetCurrentProcess(), + ObjectBasicInformation, &info, sizeof(info), NULL); + if (status != STATUS_SUCCESS) + return status; + if (!(info.GrantedAccess & PROCESS_QUERY_INFORMATION)) + return STATUS_ACCESS_DENIED; + + if (!get_display_driver()->pD3DKMTQueryVideoMemoryInfo) + return STATUS_PROCEDURE_NOT_FOUND; + return get_display_driver()->pD3DKMTQueryVideoMemoryInfo(desc); +} + /****************************************************************************** * NtGdiDdDDISetQueuedLimit (win32u.@) */ diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c index fafceb71438..848a5bbaa4b 100644 --- a/dlls/win32u/emfdrv.c +++ b/dlls/win32u/emfdrv.c @@ -525,6 +525,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */ NULL, /* pD3DKMTOpenAdapterFromLuid */ + NULL, /* pD3DKMTQueryVideoMemoryInfo */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ }; diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 6e0207b7bb6..571379976a5 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -4270,6 +4270,7 @@ const struct gdi_dc_funcs font_driver = NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */ NULL, /* pD3DKMTOpenAdapterFromLuid */ + NULL, /* pD3DKMTQueryVideoMemoryInfo */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_FONT_DRV /* priority */ }; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 8d19e231f46..96d52e4d38e 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1053,6 +1053,7 @@ static struct unix_funcs unix_funcs = NtGdiDdDDIEscape, NtGdiDdDDIOpenAdapterFromDeviceName, NtGdiDdDDIOpenAdapterFromLuid, + NtGdiDdDDIQueryVideoMemoryInfo, NtGdiDdDDISetVidPnSourceOwner, NtGdiDeleteObjectApp, NtGdiDoPalette, diff --git a/dlls/win32u/path.c b/dlls/win32u/path.c index 00a1f58e969..0032ee1a5ab 100644 --- a/dlls/win32u/path.c +++ b/dlls/win32u/path.c @@ -2122,6 +2122,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */ NULL, /* pD3DKMTOpenAdapterFromLuid */ + NULL, /* pD3DKMTQueryVideoMemoryInfo */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_PATH_DRV /* priority */ }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 2f0682fe915..1c3cbc59dc2 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -307,7 +307,7 @@ @ stub NtGdiDdDDIQueryResourceInfoFromNtHandle @ stdcall -syscall NtGdiDdDDIQueryStatistics(ptr) @ stub NtGdiDdDDIQueryVidPnExclusiveOwnership -@ stub NtGdiDdDDIQueryVideoMemoryInfo +@ stdcall NtGdiDdDDIQueryVideoMemoryInfo(ptr) @ stub NtGdiDdDDIReclaimAllocations @ stub NtGdiDdDDIReclaimAllocations2 @ stub NtGdiDdDDIReleaseKeyedMutex diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e221dff4d01..02784df64f8 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -65,6 +65,7 @@ struct unix_funcs NTSTATUS (WINAPI *pNtGdiDdDDIEscape)( const D3DKMT_ESCAPE *desc ); NTSTATUS (WINAPI *pNtGdiDdDDIOpenAdapterFromDeviceName)( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ); NTSTATUS (WINAPI *pNtGdiDdDDIOpenAdapterFromLuid)( D3DKMT_OPENADAPTERFROMLUID *desc ); + NTSTATUS (WINAPI *pNtGdiDdDDIQueryVideoMemoryInfo)( D3DKMT_QUERYVIDEOMEMORYINFO *desc ); NTSTATUS (WINAPI *pNtGdiDdDDISetVidPnSourceOwner)( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); BOOL (WINAPI *pNtGdiDeleteObjectApp)( HGDIOBJ obj ); LONG (WINAPI *pNtGdiDoPalette)( HGDIOBJ handle, WORD start, WORD count, void *entries, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 9438660d3ec..4e750e5aea2 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -713,6 +713,12 @@ NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc return unix_funcs->pNtGdiDdDDIOpenAdapterFromLuid( desc ); } +NTSTATUS WINAPI NtGdiDdDDIQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) +{ + if (!unix_funcs) return STATUS_NOT_SUPPORTED; + return unix_funcs->pNtGdiDdDDIQueryVideoMemoryInfo( desc ); +} + NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { if (!unix_funcs) return STATUS_NOT_SUPPORTED; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index d02c2cfc4c2..0d4467b6964 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -859,6 +859,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */ NULL, /* pD3DKMTOpenAdapterFromLuid */ + NULL, /* pD3DKMTQueryVideoMemoryInfo */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ }; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index bff2d9db4c5..fc190805401 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -388,6 +388,7 @@ static const struct user_driver_funcs x11drv_funcs = .dc_funcs.pD3DKMTCheckVidPnExclusiveOwnership = X11DRV_D3DKMTCheckVidPnExclusiveOwnership, .dc_funcs.pD3DKMTCloseAdapter = X11DRV_D3DKMTCloseAdapter, .dc_funcs.pD3DKMTOpenAdapterFromLuid = X11DRV_D3DKMTOpenAdapterFromLuid, + .dc_funcs.pD3DKMTQueryVideoMemoryInfo = X11DRV_D3DKMTQueryVideoMemoryInfo, .dc_funcs.pD3DKMTSetVidPnSourceOwner = X11DRV_D3DKMTSetVidPnSourceOwner, .dc_funcs.priority = GDI_PRIORITY_GRAPHICS_DRV, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a4f93150ed9..9a775215321 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -157,6 +157,7 @@ extern BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT b extern NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 77f1ec87a31..40d0e750d1b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1228,6 +1228,65 @@ done: return status; } +NTSTATUS CDECL X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) +{ + const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); + PFN_vkGetPhysicalDeviceMemoryProperties2KHR pvkGetPhysicalDeviceMemoryProperties2KHR; + VkPhysicalDeviceMemoryBudgetPropertiesEXT budget; + VkPhysicalDeviceMemoryProperties2 properties2; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct x11_d3dkmt_adapter *adapter; + unsigned int i; + + desc->Budget = 0; + desc->CurrentUsage = 0; + desc->CurrentReservation = 0; + desc->AvailableForReservation = 0; + + if (!vulkan_funcs) + { + WARN("Vulkan is unavailable.\n"); + return STATUS_UNSUCCESSFUL; + } + + pthread_mutex_lock(&d3dkmt_mutex); + LIST_FOR_EACH_ENTRY(adapter, &x11_d3dkmt_adapters, struct x11_d3dkmt_adapter, entry) + { + if (adapter->handle != desc->hAdapter) + continue; + + if (!(pvkGetPhysicalDeviceMemoryProperties2KHR = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(adapter->vk_instance, "vkGetPhysicalDeviceMemoryProperties2KHR"))) + { + WARN("Failed to load vkGetPhysicalDeviceMemoryProperties2KHR.\n"); + status = STATUS_UNSUCCESSFUL; + goto done; + } + + memset(&budget, 0, sizeof(budget)); + budget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2; + properties2.pNext = &budget; + pvkGetPhysicalDeviceMemoryProperties2KHR(adapter->vk_device, &properties2); + for (i = 0; i < properties2.memoryProperties.memoryHeapCount; ++i) + { + if ((desc->MemorySegmentGroup == D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL + && properties2.memoryProperties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + || (desc->MemorySegmentGroup == D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL + && !(properties2.memoryProperties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT))) + { + desc->Budget += budget.heapBudget[i]; + desc->CurrentUsage += budget.heapUsage[i]; + } + } + desc->AvailableForReservation = desc->Budget / 2; + status = STATUS_SUCCESS; + break; + } +done: + pthread_mutex_unlock(&d3dkmt_mutex); + return status; +} + NTSTATUS x11drv_client_func( enum x11drv_client_funcs id, const void *params, ULONG size ) { void *ret_ptr; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 697fe0432ae..585299cba9e 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2238,6 +2238,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ NULL, /* pD3DKMTCloseAdapter */ NULL, /* pD3DKMTOpenAdapterFromLuid */ + NULL, /* pD3DKMTQueryVideoMemoryInfo */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_GRAPHICS_DRV + 10 /* priority */ }; diff --git a/include/ntgdi.h b/include/ntgdi.h index 78d0f620be3..5a9d5a798fe 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -472,6 +472,7 @@ NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ); NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); +NTSTATUS WINAPI NtGdiDdDDIQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ); NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index f16b1456483..82bac557c2a 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -160,6 +160,7 @@ struct gdi_dc_funcs NTSTATUS (CDECL *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); NTSTATUS (CDECL *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); NTSTATUS (CDECL *pD3DKMTOpenAdapterFromLuid)(D3DKMT_OPENADAPTERFROMLUID *); + NTSTATUS (CDECL *pD3DKMTQueryVideoMemoryInfo)(D3DKMT_QUERYVIDEOMEMORYINFO *); NTSTATUS (CDECL *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); /* priority order for the driver on the stack */ -- 2.34.1

3 2

[PATCH 3/4] winex11.drv: Open a Vulkan device for D3DKMTOpenAdapterFromLuid().
by Zhiyi Zhang 17 May '22

17 May '22

The Vulkan device is used for querying video memory information for implementing D3DKMTQueryVideoMemoryInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/win32u/dibdrv/dc.c | 4 + dlls/win32u/driver.c | 19 +++ dlls/win32u/emfdrv.c | 2 + dlls/win32u/font.c | 2 + dlls/win32u/gdiobj.c | 3 + dlls/win32u/path.c | 2 + dlls/win32u/syscall.c | 3 - dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/wrappers.c | 18 +++ dlls/wineps.drv/init.c | 2 + dlls/winex11.drv/init.c | 2 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 250 +++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 2 + dlls/wow64win/gdi.c | 34 ----- dlls/wow64win/syscall.h | 3 - include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 2 + 19 files changed, 317 insertions(+), 43 deletions(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index a8fd69fac84..caa3cc92587 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -709,6 +709,8 @@ const struct gdi_dc_funcs dib_driver = dibdrv_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTCloseAdapter */ + NULL, /* pD3DKMTOpenAdapterFromLuid */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_DIB_DRV /* priority */ }; @@ -1263,6 +1265,8 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTCloseAdapter */ + NULL, /* pD3DKMTOpenAdapterFromLuid */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_DIB_DRV + 10 /* priority */ }; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index f3c1d419b1d..31383330bc4 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -550,6 +550,16 @@ static NTSTATUS CDECL nulldrv_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_C return STATUS_PROCEDURE_NOT_FOUND; } +static NTSTATUS CDECL nulldrv_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +{ + return STATUS_PROCEDURE_NOT_FOUND; +} + +static NTSTATUS CDECL nulldrv_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +{ + return STATUS_PROCEDURE_NOT_FOUND; +} + static NTSTATUS CDECL nulldrv_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { return STATUS_PROCEDURE_NOT_FOUND; @@ -647,6 +657,8 @@ const struct gdi_dc_funcs null_driver = nulldrv_StrokePath, /* pStrokePath */ nulldrv_UnrealizePalette, /* pUnrealizePalette */ nulldrv_D3DKMTCheckVidPnExclusiveOwnership, /* pD3DKMTCheckVidPnExclusiveOwnership */ + nulldrv_D3DKMTCloseAdapter, /* pD3DKMTCloseAdapter */ + nulldrv_D3DKMTOpenAdapterFromLuid, /* pD3DKMTOpenAdapterFromLuid */ nulldrv_D3DKMTSetVidPnSourceOwner, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_NULL_DRV /* priority */ @@ -1316,6 +1328,9 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) if (!desc || !desc->hAdapter) return STATUS_INVALID_PARAMETER; + if (get_display_driver()->pD3DKMTCloseAdapter) + get_display_driver()->pD3DKMTCloseAdapter( desc ); + pthread_mutex_lock( &driver_lock ); LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) { @@ -1366,6 +1381,10 @@ NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc desc->hAdapter = adapter->handle = ++handle_start; list_add_tail( &d3dkmt_adapters, &adapter->entry ); pthread_mutex_unlock( &driver_lock ); + + if (get_display_driver()->pD3DKMTOpenAdapterFromLuid) + get_display_driver()->pD3DKMTOpenAdapterFromLuid( desc ); + return STATUS_SUCCESS; } diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c index 81481953288..fafceb71438 100644 --- a/dlls/win32u/emfdrv.c +++ b/dlls/win32u/emfdrv.c @@ -523,6 +523,8 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTCloseAdapter */ + NULL, /* pD3DKMTOpenAdapterFromLuid */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ }; diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 7017ec6614d..6e0207b7bb6 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -4268,6 +4268,8 @@ const struct gdi_dc_funcs font_driver = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTCloseAdapter */ + NULL, /* pD3DKMTOpenAdapterFromLuid */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_FONT_DRV /* priority */ }; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index f6790690188..8d19e231f46 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1046,10 +1046,13 @@ static struct unix_funcs unix_funcs = NtGdiCreateDIBitmapInternal, NtGdiCreateMetafileDC, NtGdiDdDDICheckVidPnExclusiveOwnership, + NtGdiDdDDICloseAdapter, NtGdiDdDDICreateDCFromMemory, NtGdiDdDDIDestroyDCFromMemory, NtGdiDdDDIDestroyDevice, NtGdiDdDDIEscape, + NtGdiDdDDIOpenAdapterFromDeviceName, + NtGdiDdDDIOpenAdapterFromLuid, NtGdiDdDDISetVidPnSourceOwner, NtGdiDeleteObjectApp, NtGdiDoPalette, diff --git a/dlls/win32u/path.c b/dlls/win32u/path.c index 93a124953af..00a1f58e969 100644 --- a/dlls/win32u/path.c +++ b/dlls/win32u/path.c @@ -2120,6 +2120,8 @@ const struct gdi_dc_funcs path_driver = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTCloseAdapter */ + NULL, /* pD3DKMTOpenAdapterFromLuid */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_PATH_DRV /* priority */ }; diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f306ea12d4a..a5ad95cd4b6 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -51,11 +51,8 @@ static void * const syscalls[] = NtGdiCreateRectRgn, NtGdiCreateRoundRectRgn, NtGdiCreateSolidBrush, - NtGdiDdDDICloseAdapter, NtGdiDdDDICreateDevice, - NtGdiDdDDIOpenAdapterFromDeviceName, NtGdiDdDDIOpenAdapterFromHdc, - NtGdiDdDDIOpenAdapterFromLuid, NtGdiDdDDIQueryStatistics, NtGdiDdDDISetQueuedLimit, NtGdiDeleteClientObj, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index a915f89e578..2f0682fe915 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -187,7 +187,7 @@ @ stub NtGdiDdDDICheckOcclusion @ stub NtGdiDdDDICheckSharedResourceAccess @ stdcall NtGdiDdDDICheckVidPnExclusiveOwnership(ptr) -@ stdcall -syscall NtGdiDdDDICloseAdapter(ptr) +@ stdcall NtGdiDdDDICloseAdapter(ptr) @ stub NtGdiDdDDIConfigureSharedResource @ stub NtGdiDdDDICreateAllocation @ stub NtGdiDdDDICreateBundleObject @@ -268,9 +268,9 @@ @ stub NtGdiDdDDINetDispStartMiracastDisplayDevice @ stub NtGdiDdDDINetDispStopMiracastDisplayDevice @ stub NtGdiDdDDIOfferAllocations -@ stdcall -syscall NtGdiDdDDIOpenAdapterFromDeviceName(ptr) +@ stdcall NtGdiDdDDIOpenAdapterFromDeviceName(ptr) @ stdcall -syscall NtGdiDdDDIOpenAdapterFromHdc(ptr) -@ stdcall -syscall NtGdiDdDDIOpenAdapterFromLuid(ptr) +@ stdcall NtGdiDdDDIOpenAdapterFromLuid(ptr) @ stub NtGdiDdDDIOpenBundleObjectNtHandleFromName @ stub NtGdiDdDDIOpenKeyedMutex @ stub NtGdiDdDDIOpenKeyedMutex2 diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d02871a6ad1..e221dff4d01 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -58,10 +58,13 @@ struct unix_funcs ULONG flags, HANDLE xform ); HDC (WINAPI *pNtGdiCreateMetafileDC)( HDC hdc ); NTSTATUS (WINAPI *pNtGdiDdDDICheckVidPnExclusiveOwnership)( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ); + NTSTATUS (WINAPI *pNtGdiDdDDICloseAdapter)( const D3DKMT_CLOSEADAPTER *desc ); NTSTATUS (WINAPI *pNtGdiDdDDICreateDCFromMemory)( D3DKMT_CREATEDCFROMMEMORY *desc ); NTSTATUS (WINAPI *pNtGdiDdDDIDestroyDCFromMemory)( const D3DKMT_DESTROYDCFROMMEMORY *desc ); NTSTATUS (WINAPI *pNtGdiDdDDIDestroyDevice)( const D3DKMT_DESTROYDEVICE *desc ); NTSTATUS (WINAPI *pNtGdiDdDDIEscape)( const D3DKMT_ESCAPE *desc ); + NTSTATUS (WINAPI *pNtGdiDdDDIOpenAdapterFromDeviceName)( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ); + NTSTATUS (WINAPI *pNtGdiDdDDIOpenAdapterFromLuid)( D3DKMT_OPENADAPTERFROMLUID *desc ); NTSTATUS (WINAPI *pNtGdiDdDDISetVidPnSourceOwner)( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); BOOL (WINAPI *pNtGdiDeleteObjectApp)( HGDIOBJ obj ); LONG (WINAPI *pNtGdiDoPalette)( HGDIOBJ handle, WORD start, WORD count, void *entries, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 6219b0fa49c..9438660d3ec 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -671,6 +671,12 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE return unix_funcs->pNtGdiDdDDICheckVidPnExclusiveOwnership( desc ); } +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +{ + if (!unix_funcs) return STATUS_NOT_SUPPORTED; + return unix_funcs->pNtGdiDdDDICloseAdapter( desc ); +} + NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) { if (!unix_funcs) return STATUS_NOT_SUPPORTED; @@ -695,6 +701,18 @@ NTSTATUS WINAPI NtGdiDdDDIEscape( const D3DKMT_ESCAPE *desc ) return unix_funcs->pNtGdiDdDDIEscape( desc ); } +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ) +{ + if (!unix_funcs) return STATUS_NOT_SUPPORTED; + return unix_funcs->pNtGdiDdDDIOpenAdapterFromDeviceName( desc ); +} + +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +{ + if (!unix_funcs) return STATUS_NOT_SUPPORTED; + return unix_funcs->pNtGdiDdDDIOpenAdapterFromLuid( desc ); +} + NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { if (!unix_funcs) return STATUS_NOT_SUPPORTED; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 04b00e82709..d02c2cfc4c2 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -857,6 +857,8 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_StrokePath, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTCloseAdapter */ + NULL, /* pD3DKMTOpenAdapterFromLuid */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ }; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index a1dbfa1ed50..bff2d9db4c5 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -386,6 +386,8 @@ static const struct user_driver_funcs x11drv_funcs = .dc_funcs.pStrokePath = X11DRV_StrokePath, .dc_funcs.pUnrealizePalette = X11DRV_UnrealizePalette, .dc_funcs.pD3DKMTCheckVidPnExclusiveOwnership = X11DRV_D3DKMTCheckVidPnExclusiveOwnership, + .dc_funcs.pD3DKMTCloseAdapter = X11DRV_D3DKMTCloseAdapter, + .dc_funcs.pD3DKMTOpenAdapterFromLuid = X11DRV_D3DKMTOpenAdapterFromLuid, .dc_funcs.pD3DKMTSetVidPnSourceOwner = X11DRV_D3DKMTSetVidPnSourceOwner, .dc_funcs.priority = GDI_PRIORITY_GRAPHICS_DRV, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fd102ea951a..a4f93150ed9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -155,6 +155,8 @@ extern BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, extern BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2742bdbdeb1..77f1ec87a31 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -49,11 +49,16 @@ #include "winbase.h" #include "winreg.h" +#define VK_NO_PROTOTYPES +#define WINE_VK_HOST + #include "x11drv.h" #include "xcomposite.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/list.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); @@ -101,6 +106,14 @@ static WCHAR input_style[20]; static pthread_mutex_t d3dkmt_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t error_mutex = PTHREAD_MUTEX_INITIALIZER; +struct x11_d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + VkInstance vk_instance; /* Vulkan instance */ + VkPhysicalDevice vk_device; /* Vulkan physical device */ + struct list entry; /* List entry */ +}; + struct d3dkmt_vidpn_source { D3DKMT_VIDPNSOURCEOWNER_TYPE type; /* VidPN source owner type */ @@ -109,6 +122,7 @@ struct d3dkmt_vidpn_source struct list entry; /* List entry */ }; +static struct list x11_d3dkmt_adapters = LIST_INIT( x11_d3dkmt_adapters ); static struct list d3dkmt_vidpn_sources = LIST_INIT( d3dkmt_vidpn_sources ); /* VidPN source information list */ #define IS_OPTION_TRUE(ch) \ @@ -837,6 +851,29 @@ BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, return FALSE; /* let user32 handle it */ } +NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +{ + const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); + struct x11_d3dkmt_adapter *adapter; + + if (!vulkan_funcs) + return STATUS_UNSUCCESSFUL; + + pthread_mutex_lock(&d3dkmt_mutex); + LIST_FOR_EACH_ENTRY(adapter, &x11_d3dkmt_adapters, struct x11_d3dkmt_adapter, entry) + { + if (adapter->handle == desc->hAdapter) + { + vulkan_funcs->p_vkDestroyInstance(adapter->vk_instance, NULL); + list_remove(&adapter->entry); + free(adapter); + break; + } + } + pthread_mutex_unlock(&d3dkmt_mutex); + return STATUS_SUCCESS; +} + /********************************************************************** * X11DRV_D3DKMTSetVidPnSourceOwner */ @@ -977,6 +1014,219 @@ NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDP return STATUS_SUCCESS; } +/* Find the Vulkan device UUID corresponding to a LUID */ +static BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid ) +{ + static const WCHAR class_guidW[] = {'C','l','a','s','s','G','U','I','D',0}; + static const WCHAR devpropkey_gpu_vulkan_uuidW[] = + { + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','2','3','3','A','9','E','F','3','-','A','F','C','4','-','4','A','B','D', + '-','B','5','6','4','-','C','3','2','F','2','1','F','1','5','3','5','C','}', + '\\','0','0','0','2' + }; + static const WCHAR devpropkey_gpu_luidW[] = + { + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','6','0','B','1','9','3','C','B','-','5','2','7','6','-','4','D','0','F', + '-','9','6','F','C','-','F','1','7','3','A','B','A','D','3','E','C','6','}', + '\\','0','0','0','2' + }; + static const WCHAR guid_devclass_displayW[] = + {'{','4','D','3','6','E','9','6','8','-','E','3','2','5','-','1','1','C','E','-', + 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; + static const WCHAR pci_keyW[] = + { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','E','n','u','m', + '\\','P','C','I' + }; + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + HKEY subkey, device_key, prop_key, pci_key; + KEY_NODE_INFORMATION *key = (void *)buffer; + DWORD size, i = 0; + HANDLE mutex; + + mutex = get_display_device_init_mutex(); + + pci_key = reg_open_key(NULL, pci_keyW, sizeof(pci_keyW)); + while (!NtEnumerateKey(pci_key, i++, KeyNodeInformation, key, sizeof(buffer), &size)) + { + unsigned int j = 0; + + if (!(subkey = reg_open_key(pci_key, key->Name, key->NameLength))) + continue; + + while (!NtEnumerateKey(subkey, j++, KeyNodeInformation, key, sizeof(buffer), &size)) + { + if (!(device_key = reg_open_key(subkey, key->Name, key->NameLength))) + continue; + + size = query_reg_value(device_key, class_guidW, value, sizeof(buffer)); + if (size != sizeof(guid_devclass_displayW) || + wcscmp((WCHAR *)value->Data, guid_devclass_displayW)) + { + NtClose(device_key); + continue; + } + + if (!(prop_key = reg_open_key(device_key, devpropkey_gpu_luidW, + sizeof(devpropkey_gpu_luidW)))) + { + NtClose(device_key); + continue; + } + + size = query_reg_value(prop_key, NULL, value, sizeof(buffer)); + NtClose(prop_key); + if (size != sizeof(LUID) || memcmp(value->Data, luid, sizeof(LUID))) + { + NtClose(device_key); + continue; + } + + if (!(prop_key = reg_open_key(device_key, devpropkey_gpu_vulkan_uuidW, + sizeof(devpropkey_gpu_vulkan_uuidW)))) + { + NtClose(device_key); + continue; + } + + size = query_reg_value(prop_key, NULL, value, sizeof(buffer)); + NtClose(prop_key); + if (size != sizeof(GUID)) + { + NtClose(device_key); + continue; + } + + *uuid = *(const GUID *)value->Data; + NtClose(device_key); + NtClose(subkey); + NtClose(pci_key); + release_display_device_init_mutex(mutex); + return TRUE; + } + NtClose(subkey); + } + NtClose(pci_key); + + release_display_device_init_mutex(mutex); + return FALSE; +} + +NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +{ + static const char *extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, + }; + const struct vulkan_funcs *vulkan_funcs; + PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; + PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + VkPhysicalDevice *vk_physical_devices = NULL; + VkPhysicalDeviceProperties2 properties2; + NTSTATUS status = STATUS_UNSUCCESSFUL; + DWORD device_count, device_idx = 0; + struct x11_d3dkmt_adapter *adapter; + VkInstanceCreateInfo create_info; + VkPhysicalDeviceIDProperties id; + VkInstance vk_instance = NULL; + VkResult vr; + GUID uuid; + + if (!get_vulkan_uuid_from_luid(&desc->AdapterLuid, &uuid)) + { + WARN("Failed to find Vulkan device with LUID %08x:%08x.\n", desc->AdapterLuid.HighPart, + desc->AdapterLuid.LowPart); + return STATUS_INVALID_PARAMETER; + } + + /* Find the Vulkan device with corresponding UUID */ + if (!(vulkan_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION))) + { + WARN("Vulkan is unavailable.\n"); + return STATUS_UNSUCCESSFUL; + } + + memset(&create_info, 0, sizeof(create_info)); + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.enabledExtensionCount = ARRAY_SIZE(extensions); + create_info.ppEnabledExtensionNames = extensions; + + vr = vulkan_funcs->p_vkCreateInstance(&create_info, NULL, &vk_instance); + if (vr != VK_SUCCESS) + { + WARN("Failed to create a Vulkan instance, vr %d.\n", vr); + goto done; + } + +#define LOAD_VK_FUNC(f) \ + if (!(p##f = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(vk_instance, #f))) \ + { \ + WARN("Failed to load " #f ".\n"); \ + goto done; \ + } + + LOAD_VK_FUNC(vkEnumeratePhysicalDevices) + LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) +#undef LOAD_VK_FUNC + + vr = pvkEnumeratePhysicalDevices(vk_instance, &device_count, NULL); + if (vr != VK_SUCCESS || !device_count) + { + WARN("No Vulkan device found, vr %d, device_count %d.\n", vr, device_count); + goto done; + } + + if (!(vk_physical_devices = calloc(device_count, sizeof(*vk_physical_devices)))) + goto done; + + vr = pvkEnumeratePhysicalDevices(vk_instance, &device_count, vk_physical_devices); + if (vr != VK_SUCCESS) + { + WARN("vkEnumeratePhysicalDevices failed, vr %d.\n", vr); + goto done; + } + + for (device_idx = 0; device_idx < device_count; ++device_idx) + { + memset(&id, 0, sizeof(id)); + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id; + + pvkGetPhysicalDeviceProperties2KHR(vk_physical_devices[device_idx], &properties2); + if (!IsEqualGUID(&uuid, id.deviceUUID)) + continue; + + if (!(adapter = malloc(sizeof(*adapter)))) + { + status = STATUS_NO_MEMORY; + goto done; + } + + adapter->handle = desc->hAdapter; + adapter->vk_instance = vk_instance; + adapter->vk_device = vk_physical_devices[device_idx]; + pthread_mutex_lock(&d3dkmt_mutex); + list_add_head(&x11_d3dkmt_adapters, &adapter->entry); + pthread_mutex_unlock(&d3dkmt_mutex); + free(vk_physical_devices); + return STATUS_SUCCESS; + } + +done: + free(vk_physical_devices); + if (vk_instance) + vulkan_funcs->p_vkDestroyInstance(vk_instance, NULL); + return status; +} NTSTATUS x11drv_client_func( enum x11drv_client_funcs id, const void *params, ULONG size ) { diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index db9e454c317..697fe0432ae 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2236,6 +2236,8 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pStrokePath */ NULL, /* pUnrealizePalette */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTCloseAdapter */ + NULL, /* pD3DKMTOpenAdapterFromLuid */ NULL, /* pD3DKMTSetVidPnSourceOwner */ GDI_PRIORITY_GRAPHICS_DRV + 10 /* priority */ }; diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index ed85754640d..c821b90122e 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -602,13 +602,6 @@ NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) return NtGdiFlush(); } -NTSTATUS WINAPI wow64_NtGdiDdDDICloseAdapter( UINT *args ) -{ - const D3DKMT_CLOSEADAPTER *desc = get_ptr( &args ); - - return NtGdiDdDDICloseAdapter( desc ); -} - NTSTATUS WINAPI wow64_NtGdiDdDDICreateDevice( UINT *args ) { struct @@ -644,26 +637,6 @@ NTSTATUS WINAPI wow64_NtGdiDdDDICreateDevice( UINT *args ) return status; } -NTSTATUS WINAPI wow64_NtGdiDdDDIOpenAdapterFromDeviceName( UINT *args ) -{ - struct - { - ULONG pDeviceName; - D3DKMT_HANDLE hAdapter; - LUID AdapterLuid; - } *desc32 = get_ptr( &args ); - - D3DKMT_OPENADAPTERFROMDEVICENAME desc = { UlongToPtr( desc32->pDeviceName ) }; - NTSTATUS status; - - if (!(status = NtGdiDdDDIOpenAdapterFromDeviceName( &desc ))) - { - desc32->hAdapter = desc.hAdapter; - desc32->AdapterLuid = desc.AdapterLuid; - } - return status; -} - NTSTATUS WINAPI wow64_NtGdiDdDDIOpenAdapterFromHdc( UINT *args ) { struct @@ -686,13 +659,6 @@ NTSTATUS WINAPI wow64_NtGdiDdDDIOpenAdapterFromHdc( UINT *args ) return status; } -NTSTATUS WINAPI wow64_NtGdiDdDDIOpenAdapterFromLuid( UINT *args ) -{ - D3DKMT_OPENADAPTERFROMLUID *desc = get_ptr( &args ); - - return NtGdiDdDDIOpenAdapterFromLuid( desc ); -} - NTSTATUS WINAPI wow64_NtGdiDdDDIQueryStatistics( UINT *args ) { D3DKMT_QUERYSTATISTICS *stats = get_ptr( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 2eb3ac55ff1..fde87498131 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -38,11 +38,8 @@ SYSCALL_ENTRY( NtGdiCreateRectRgn ) \ SYSCALL_ENTRY( NtGdiCreateRoundRectRgn ) \ SYSCALL_ENTRY( NtGdiCreateSolidBrush ) \ - SYSCALL_ENTRY( NtGdiDdDDICloseAdapter ) \ SYSCALL_ENTRY( NtGdiDdDDICreateDevice ) \ - SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromDeviceName ) \ SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromHdc ) \ - SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromLuid ) \ SYSCALL_ENTRY( NtGdiDdDDIQueryStatistics ) \ SYSCALL_ENTRY( NtGdiDdDDISetQueuedLimit ) \ SYSCALL_ENTRY( NtGdiDeleteClientObj ) \ diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index aaebcb39e2e..b65fcb8c9c6 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -681,6 +681,7 @@ NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTEscape( const D3DKMT_ESCAPE *desc ); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); +NTSTATUS WINAPI D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID * desc ); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); NTSTATUS WINAPI D3DKMTQueryVideoMemoryInfo(D3DKMT_QUERYVIDEOMEMORYINFO *desc); NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index a1fe01d2a43..f16b1456483 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -158,6 +158,8 @@ struct gdi_dc_funcs BOOL (CDECL *pStrokePath)(PHYSDEV); BOOL (CDECL *pUnrealizePalette)(HPALETTE); NTSTATUS (CDECL *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); + NTSTATUS (CDECL *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); + NTSTATUS (CDECL *pD3DKMTOpenAdapterFromLuid)(D3DKMT_OPENADAPTERFROMLUID *); NTSTATUS (CDECL *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); /* priority order for the driver on the stack */ -- 2.34.1

2 1

[PATCH 2/4] gdi32/tests: Add D3DKMTQueryVideoMemoryInfo() tests.
by Zhiyi Zhang 17 May '22

17 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 106 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3d25eacacd9..5117d34908d 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -48,8 +48,27 @@ static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFRO static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); +static NTSTATUS (WINAPI *pD3DKMTQueryVideoMemoryInfo)(D3DKMT_QUERYVIDEOMEMORYINFO *); static HRESULT (WINAPI *pDwmEnableComposition)(UINT); +static BOOL get_primary_adapter_name(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD adapter_idx; + + dd.cb = sizeof(dd); + for (adapter_idx = 0; EnumDisplayDevicesW(NULL, adapter_idx, &dd, 0); ++adapter_idx) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; @@ -886,6 +905,91 @@ static void test_D3DKMTOpenAdapterFromDeviceName(void) winetest_pop_context(); } +static void test_D3DKMTQueryVideoMemoryInfo(void) +{ + static const D3DKMT_MEMORY_SEGMENT_GROUP groups[] = {D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL, + D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL}; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; + D3DKMT_QUERYVIDEOMEMORYINFO query_memory_info; + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + unsigned int i; + BOOL ret; + + if (!pD3DKMTQueryVideoMemoryInfo) + { + skip("D3DKMTQueryVideoMemoryInfo() is unavailable.\n"); + return; + } + + ret = get_primary_adapter_name(open_adapter_desc.DeviceName); + ok(ret, "Failed to get primary adapter name.\n"); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + + /* Normal query */ + for (i = 0; i < ARRAY_SIZE(groups); ++i) + { + winetest_push_context("group %d", groups[i]); + + query_memory_info.hProcess = NULL; + query_memory_info.hAdapter = open_adapter_desc.hAdapter; + query_memory_info.PhysicalAdapterIndex = 0; + query_memory_info.MemorySegmentGroup = groups[i]; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + ok(query_memory_info.Budget >= query_memory_info.AvailableForReservation, + "Unexpected budget %I64u and reservation %I64u.\n", query_memory_info.Budget, + query_memory_info.AvailableForReservation); + ok(query_memory_info.CurrentUsage <= query_memory_info.Budget, + "Unexpected current usage %I64u.\n", query_memory_info.CurrentUsage); + ok(query_memory_info.CurrentReservation == 0, + "Unexpected current reservation %I64u.\n", query_memory_info.CurrentReservation); + + winetest_pop_context(); + } + + /* Query using the current process handle */ + query_memory_info.hProcess = GetCurrentProcess(); + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); + + /* Query using a process handle without PROCESS_QUERY_INFORMATION privilege */ + query_memory_info.hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, GetCurrentProcessId()); + ok(!!query_memory_info.hProcess, "OpenProcess failed, error %ld.\n", GetLastError()); + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_ACCESS_DENIED, "Got unexpected return code %#lx.\n", status); + CloseHandle(query_memory_info.hProcess); + query_memory_info.hProcess = NULL; + + /* Query using an invalid process handle */ + query_memory_info.hProcess = (HANDLE)0xdeadbeef; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected return code %#lx.\n", status); + query_memory_info.hProcess = NULL; + + /* Query using an invalid adapter handle */ + query_memory_info.hAdapter = (D3DKMT_HANDLE)0xdeadbeef; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + query_memory_info.hAdapter = open_adapter_desc.hAdapter; + + /* Query using an invalid adapter index */ + query_memory_info.PhysicalAdapterIndex = 99; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + query_memory_info.PhysicalAdapterIndex = 0; + + /* Query using an invalid memory segment group */ + query_memory_info.MemorySegmentGroup = D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL + 1; + status = pD3DKMTQueryVideoMemoryInfo(&query_memory_info); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#lx.\n", status); + + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -900,6 +1004,7 @@ START_TEST(driver) pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); + pD3DKMTQueryVideoMemoryInfo = (void *)GetProcAddress(gdi32, "D3DKMTQueryVideoMemoryInfo"); if (dwmapi) pDwmEnableComposition = (void *)GetProcAddress(dwmapi, "DwmEnableComposition"); @@ -913,6 +1018,7 @@ START_TEST(driver) test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); test_D3DKMTOpenAdapterFromDeviceName(); + test_D3DKMTQueryVideoMemoryInfo(); FreeLibrary(dwmapi); } -- 2.34.1

3 2

[PATCH 1/4] include: Add D3DKMTQueryVideoMemoryInfo() definition.
by Zhiyi Zhang 17 May '22

17 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/ddk/d3dkmthk.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 663a5d31ada..aaebcb39e2e 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -30,6 +30,12 @@ typedef enum _D3DKMT_VIDPNSOURCEOWNER_TYPE D3DKMT_VIDPNSOURCEOWNER_EMULATED = 4 } D3DKMT_VIDPNSOURCEOWNER_TYPE; +typedef enum _D3DKMT_MEMORY_SEGMENT_GROUP +{ + D3DKMT_MEMORY_SEGMENT_GROUP_LOCAL = 0, + D3DKMT_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1 +} D3DKMT_MEMORY_SEGMENT_GROUP; + typedef struct _D3DKMT_CREATEDEVICEFLAGS { UINT LegacyMode : 1; @@ -603,6 +609,18 @@ typedef struct _D3DKMT_QUERYSTATISTICS } DUMMYUNIONNAME; } D3DKMT_QUERYSTATISTICS; +typedef struct _D3DKMT_QUERYVIDEOMEMORYINFO +{ + HANDLE hProcess; + D3DKMT_HANDLE hAdapter; + D3DKMT_MEMORY_SEGMENT_GROUP MemorySegmentGroup; + UINT64 Budget; + UINT64 CurrentUsage; + UINT64 CurrentReservation; + UINT64 AvailableForReservation; + UINT PhysicalAdapterIndex; +} D3DKMT_QUERYVIDEOMEMORYINFO; + typedef enum _D3DKMT_QUEUEDLIMIT_TYPE { D3DKMT_SET_QUEUEDLIMIT_PRESENT = 1, @@ -664,6 +682,7 @@ NTSTATUS WINAPI D3DKMTEscape( const D3DKMT_ESCAPE *desc ); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTQueryVideoMemoryInfo(D3DKMT_QUERYVIDEOMEMORYINFO *desc); NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc); -- 2.34.1

2 1

[PATCH 0/5] MR82: d3dx9/tests: Test D3DXAssembleShader() with both terminated and not terminated include data.
by Matteo Bruni (＠Mystral) 17 May '22

17 May '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix test failure, clean up a bit. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/82

3 6

[PATCH] win32u: Fix a memory leak.
by Zhiyi Zhang 17 May '22

17 May '22

The subkey handle is leaked when deleting a GPU entry succeeded. Also, there is no need to restart the enumeration for the grandparent key hkey. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/win32u/sysparams.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5fec4ade0f8..dd494188121 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -702,7 +702,6 @@ static void cleanup_devices(void) hkey = reg_open_key( enum_key, pciW, sizeof(pciW) ); -restart: while (!NtEnumerateKey( hkey, i++, KeyNodeInformation, key, sizeof(buffer), &size )) { unsigned int j = 0; @@ -735,7 +734,7 @@ restart: NtClose( device_key ); if (!present && reg_delete_tree( subkey, bufferW, lstrlenW( bufferW ) * sizeof(WCHAR) )) - goto restart; + j = 0; } NtClose( subkey ); -- 2.34.1

2 1

[PATCH 0/6] MR78: NSI and GetAdaptersInfo() performance improvements
by Paul Gofman (＠gofman) 17 May '22

17 May '22

This is inspired by Street Fighter V game which performance has regressed in multiplayer mode since iphlpapi reimplementation on top of NSI. Speficically, the game calls GetAdapatersInfo() very often which turnaround time increased dramatically. While I was checking the effect against GetAdapatersInfo() only I hope the patchset might improve the performance of some other iphlpapi functions as well. Here is the patch I used as a top level measure of the effect: https://gist.github.com/gofman/c08e58f15105d60b4576c9ae25bcec9d The table below lists the times of GetAdaptersInfo() in ms measured with this test (this is the time for GetAdapatersInfo(NULL, ...) for estimating the buffer length plus actual data query call. The major difference between Machine 1 and Machine 2 is most likely in the number of ip routing table entries (8 on "Machine 2" and 4 on "Machine 1"). Windows has less interfaces and routes configured so it is probably not suitable for back to back performance comparison this way although the datapoint may still be interesting for very rough comparison. The baseline here is the performance before iphlpapi redesign (which I measured on Proton 6.3). There are maybe more opportunities for optimization but after this patchset GetAdapatersInfo() performance is slightly improved over baseline so I stopped here for now. ``` Machine 1 Machine 2 Windows 0.7 Proton 6.3 2.7 8.7 Current Wine 12.2 99.8 After patch 1 10.0 59.2 After patch 4 5.5 27.2 After patch 5 3.6 20.2 After patch 6 2.4 7.6 ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/78

3 9

[PATCH] shell32/tests: Fix FO_MOVE test when dest directory doesn't exist
by Nipun Garg 17 May '22

17 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38379 Signed-off-by: Nipun Garg <nipung271(a)gmail.com> --- dlls/shell32/tests/shlfileop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 273b09d5005..839254278e9 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2306,14 +2306,15 @@ static void test_move(void) ok(!DeleteFileA("d.txt"), "Expected d.txt to not exist\n"); } - /* FO_MOVE does not create dest directories */ + /* FO_MOVE does create dest directories */ shfo.pFrom = "test2.txt\0"; shfo.pTo = "dir1\\dir2\\test2.txt\0"; retval = SHFileOperationA(&shfo); + todo_wine { + ok(retval == ERROR_SUCCESS || broken(retval == ERROR_CANCELLED) || broken(DE_OPCANCELLED), "Expected ERROR_SUCCESS, got %ld\n", retval); + } if (dir_exists("dir1")) { - /* Vista and W2K8 (broken or new behavior ?) */ - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); ok(DeleteFileA("dir1\\dir2\\test2.txt"), "Expected dir1\\dir2\\test2.txt to exist\n"); RemoveDirectoryA("dir1\\dir2"); RemoveDirectoryA("dir1"); -- 2.25.1

1 0

[PATCH v2 1/2] d2d1/tests: Introduce create_factory().
by Ziqing Hui 17 May '22

17 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Make factroy_iid array "static const GUID *const". dlls/d2d1/tests/d2d1.c | 49 ++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ca80a8e946b..bc879064814 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9955,6 +9955,36 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } +static void *create_factory(const GUID *iid, UINT32 *factory_version) +{ + IUnknown *factory, *tmp; + unsigned int i; + + static const GUID *const factory_iid[] = + { + &IID_ID2D1Factory, + &IID_ID2D1Factory1, + &IID_ID2D1Factory2, + &IID_ID2D1Factory3, + }; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, iid, NULL, (void **)&factory))) + return NULL; + + if (factory_version) + { + for (i = 0; i < ARRAY_SIZE(factory_iid); ++i) + { + if (FAILED(IUnknown_QueryInterface(factory, factory_iid[i], (void **)&tmp))) + break; + IUnknown_Release(tmp); + } + *factory_version = i - 1; + } + + return factory; +} + static void test_effect(BOOL d3d11) { unsigned int i, j, min_inputs, max_inputs, str_size, input_count, factory_version; @@ -9963,9 +9993,7 @@ static void test_effect(BOOL d3d11) ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; - ID2D1Factory1 *factory1; - ID2D1Factory2 *factory2; - ID2D1Factory3 *factory3; + ID2D1Factory1 *factory; ID2D1Bitmap *bitmap; ID2D1Effect *effect; D2D1_SIZE_U size; @@ -9995,23 +10023,12 @@ static void test_effect(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory1))) + if (!(factory = create_factory(&IID_ID2D1Factory1, &factory_version))) { win_skip("ID2D1Factory1 is not supported.\n"); release_test_context(&ctx); return; } - factory_version = 1; - if (SUCCEEDED(ID2D1Factory1_QueryInterface(factory1, &IID_ID2D1Factory2, (void **)&factory2))) - { - ID2D1Factory2_Release(factory2); - factory_version = 2; - } - if (SUCCEEDED(ID2D1Factory1_QueryInterface(factory1, &IID_ID2D1Factory3, (void **)&factory3))) - { - ID2D1Factory3_Release(factory3); - factory_version = 3; - } if (factory_version < 3) win_skip("ID2D1Factory%u is not supported.\n", factory_version + 1); @@ -10161,7 +10178,7 @@ static void test_effect(BOOL d3d11) } ID2D1DeviceContext_Release(context); - ID2D1Factory1_Release(factory1); + ID2D1Factory1_Release(factory); release_test_context(&ctx); } -- 2.25.1

3 3

[PATCH 0/6] MR81: windows.gaming.input: More force feedback effect tests and implementation.
by Rémi Bernon (＠rbernon) 17 May '22

17 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/81

3 7

[PATCH v2 1/2] dinput: Pass a single GUID pointer to hid_joystick_device_open().
by Rémi Bernon 17 May '22

17 May '22

From: Zebediah Figura <zfigura(a)codeweavers.com> We set the instance and product IDs for all joysticks to match the latter parts of hid_joystick_guid and dinput_pidvid_guid, respectively. Therefore there is no need to manually check which one we are matching against. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 235833-235834 dlls/dinput/joystick_hid.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5fdc563054b..70b44c28474 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1564,8 +1564,8 @@ failed: return DIERR_DEVICENOTREG; } -static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, WCHAR *device_path, - HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, +static HRESULT hid_joystick_device_open( int index, const GUID *guid, DIDEVICEINSTANCEW *filter, + WCHAR *device_path, HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DWORD version ) { char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; @@ -1580,8 +1580,7 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W DWORD type; GUID hid; - TRACE( "index %d, product %s, instance %s\n", index, debugstr_guid( &filter->guidProduct ), - debugstr_guid( &filter->guidInstance ) ); + TRACE( "index %d, guid %s\n", index, debugstr_guid( guid ) ); HidD_GetHidGuid( &hid ); @@ -1626,8 +1625,7 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W } /* enumerate device by GUID */ - if (index < 0 && IsEqualGUID( &filter->guidProduct, &instance.guidProduct )) break; - if (index < 0 && IsEqualGUID( &filter->guidInstance, &instance.guidInstance )) break; + if (IsEqualGUID( guid, &instance.guidProduct ) || IsEqualGUID( guid, &instance.guidInstance )) break; /* enumerate all devices */ if (index >= 0 && !index--) break; @@ -1653,13 +1651,14 @@ HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *in HIDD_ATTRIBUTES attrs = {.Size = sizeof(attrs)}; PHIDP_PREPARSED_DATA preparsed; WCHAR device_path[MAX_PATH]; + GUID guid = GUID_NULL; HIDP_CAPS caps; HANDLE device; HRESULT hr; TRACE( "type %#lx, flags %#lx, instance %p, version %#lx, index %d\n", type, flags, instance, version, index ); - hr = hid_joystick_device_open( index, instance, device_path, &device, &preparsed, + hr = hid_joystick_device_open( index, &guid, instance, device_path, &device, &preparsed, &attrs, &caps, version ); if (hr != DI_OK) return hr; @@ -2035,19 +2034,6 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); *out = NULL; - instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; - instance.guidInstance.Data1 = hid_joystick_guid.Data1; - if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) - instance.guidProduct = *guid; - else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) - instance.guidInstance = *guid; - else - { - instance.guidInstance.Data1 = device_path_guid.Data1; - instance.guidInstance.Data2 = device_path_guid.Data2; - instance.guidInstance.Data3 = device_path_guid.Data3; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) return DIERR_DEVICENOTREG; - } if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; dinput_device_init( &impl->base, &hid_joystick_vtbl, guid, dinput ); @@ -2056,8 +2042,8 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.read_event = CreateEventW( NULL, TRUE, FALSE, NULL ); impl->internal_ref = 1; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) - hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, + if (memcmp( device_path_guid.Data4, guid->Data4, sizeof(device_path_guid.Data4) )) + hr = hid_joystick_device_open( -1, guid, &instance, impl->device_path, &impl->device, &impl->preparsed, &attrs, &impl->caps, dinput->dwVersion ); else { -- 2.35.1

1 1

[v2 PATCH 1/2] vbscript: Implement DateSerial().
by Nikolay Sivov 17 May '22

17 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 31 ++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab06db87624..7503f2864ab 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2044,10 +2044,35 @@ static HRESULT Global_TimeValue(BuiltinDisp *This, VARIANT *arg, unsigned args_c return E_NOTIMPL; } -static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int year, month, day; + UDATE ud = { 0 }; + HRESULT hres; + double date; + + TRACE("\n"); + + assert(args_cnt == 3); + + hres = to_int(args, &year); + if (SUCCEEDED(hres)) + hres = to_int(args + 1, &month); + if (SUCCEEDED(hres)) + hres = to_int(args + 2, &day); + + if (SUCCEEDED(hres)) + { + ud.st.wYear = year; + ud.st.wMonth = month; + ud.st.wDay = day; + hres = VarDateFromUdateEx(&ud, 0, 0, &date); + } + + if (SUCCEEDED(hres)) + hres = return_date(res, date); + + return hres; } static HRESULT Global_TimeSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 20798a0aacd..3bc64d74193 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1958,4 +1958,34 @@ sub testErrRaise() end sub call testErrRaise() +sub testDateSerial(yy, mm, dd, yyexp, mmexp, ddexp) + dim x + x = DateSerial(yy, mm, dd) + call ok(Year(x) = yyexp, "year = " & Year(x) & " expected " & yyexp) + call ok(Month(x) = mmexp, "month = " & Month(x) & " expected " & mmexp) + call ok(Day(x) = ddexp, "day = " & Day(x) & " expected " & ddexp) + call ok(Hour(x) = 0, "hour = " & Hour(x)) + call ok(Minute(x) = 0, "minute = " & Minute(x)) + call ok(Second(x) = 0, "second = " & Second(x)) + call ok(getVT(x) = "VT_DATE*", "getVT = " & getVT(x)) +end sub + +sub testDateSerialError() + on error resume next + call Err.clear() + call DateSerial(10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call DateSerial(-10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testDateSerial(100, 2, 1, 100, 2, 1) +call testDateSerial(0, 2, 1, 2000, 2, 1) +call testDateSerial(50, 2, 1, 1950, 2, 1) +call testDateSerial(99, 2, 1, 1999, 2, 1) +call testDateSerial(2000, 14, 2, 2001, 2, 2) +call testDateSerial(9999, 12, 1, 9999, 12, 1) +call testDateSerialError() + Call reportSuccess() -- 2.35.1

2 4

[PATCH 0/9] MR77: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 17 May '22

17 May '22

Avoid using advapi32. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/77

3 10

[PATCH 0/5] MR80: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 17 May '22

17 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/80

2 5

[PATCH] maintainers: Add myself to some sections.
by Zhiyi Zhang 17 May '22

17 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b012f3c4e09..f532c2eb570 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -50,6 +50,7 @@ F: dlls/xaudio*/ Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> +P: Zhiyi Zhang <zzhang(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog @@ -278,6 +279,11 @@ P: Huw Davies <huw(a)codeweavers.com> P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 +Theming +M: Zhiyi Zhang <zzhang(a)codeweavers.com> +F: dlls/light.msstyles/ +F: dlls/uxtheme/ + TWAIN P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ @@ -363,6 +369,7 @@ F: dlls/wpcap/ X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> P: Rémi Bernon <rbernon(a)codeweavers.com> +P: Zhiyi Zhang <zzhang(a)codeweavers.com> F: dlls/winex11.drv/ XML parsing -- 2.34.1

1 0

[PATCH 1/2] dinput: Combine GUID checks into a single if/else block in hid_joystick_create_device().
by Zebediah Figura 17 May '22

17 May '22

I find this clearer, especially with respect to how device_path_guid is handled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5fdc563054b..e54d50f8bfa 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2035,19 +2035,6 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); *out = NULL; - instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; - instance.guidInstance.Data1 = hid_joystick_guid.Data1; - if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) - instance.guidProduct = *guid; - else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) - instance.guidInstance = *guid; - else - { - instance.guidInstance.Data1 = device_path_guid.Data1; - instance.guidInstance.Data2 = device_path_guid.Data2; - instance.guidInstance.Data3 = device_path_guid.Data3; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) return DIERR_DEVICENOTREG; - } if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; dinput_device_init( &impl->base, &hid_joystick_vtbl, guid, dinput ); @@ -2056,15 +2043,31 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.read_event = CreateEventW( NULL, TRUE, FALSE, NULL ); impl->internal_ref = 1; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) + instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; + instance.guidInstance.Data1 = hid_joystick_guid.Data1; + if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) + { + instance.guidProduct = *guid; hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, &attrs, &impl->caps, dinput->dwVersion ); - else + } + else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) + { + instance.guidInstance = *guid; + hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, + &attrs, &impl->caps, dinput->dwVersion ); + } + else if (!memcmp( &device_path_guid.Data4, instance.guidInstance.Data4, sizeof(device_path_guid.Data4) )) { wcscpy( impl->device_path, *(const WCHAR **)guid ); hr = hid_joystick_device_try_open( 0, impl->device_path, &impl->device, &impl->preparsed, &attrs, &impl->caps, &instance, dinput->dwVersion ); } + else + { + hr = DIERR_DEVICENOTREG; + } + if (hr != DI_OK) goto failed; impl->base.instance = instance; -- 2.35.1

1 1

[PATCH 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Brendan Shanks (＠bshanks) 16 May '22

16 May '22

- signal_alloc_thread() and signal_free_thread() mostly match signal_i386.c, but with the difference that first thread’s FS needs to be allocated in signal_init_process(). signal_alloc_thread() is called too early before the Wow TEB is allocated. - The LDT code is copied from signal_i386.c. Would it be worthwhile to move that into a common file? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/76

2 2

[PATCH v3 1/2] jscript: Handle detached scope objects 'this' in all calls.
by Gabriel Ivăncescu 16 May '22

16 May '22

Not just for interpreted functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 33 +++++++++++++++++++++++---------- dlls/jscript/tests/api.js | 2 ++ dlls/jscript/tests/lang.js | 3 +++ dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 73b9d86..7dce4fe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -314,9 +314,13 @@ static HRESULT exprval_propget(script_ctx_t *ctx, exprval_t *ref, jsval_t *r) static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + jsdisp_t *jsdisp; + HRESULT hres; + jsval_t v; + switch(ref->type) { case EXPRVAL_STACK_REF: { - jsval_t v = ctx->stack[ref->u.off]; + v = ctx->stack[ref->u.off]; if(!is_object_instance(v)) { FIXME("invoke %s\n", debugstr_jsval(v)); @@ -326,10 +330,24 @@ static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsig return disp_call_value(ctx, get_object(v), NULL, flags, argc, argv, r); } case EXPRVAL_IDREF: + /* ECMA-262 3rd Edition 11.2.3.7 / ECMA-262 5.1 Edition 11.2.3.6 * + * Don't treat scope object props as PropertyReferences. */ + if((jsdisp = to_jsdisp(ref->u.idref.disp)) && jsdisp->builtin_info->class == JSCLASS_NONE) { + hres = disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, &v); + if(FAILED(hres)) + return hres; + if(!is_object_instance(v)) { + FIXME("invoke %s\n", debugstr_jsval(v)); + hres = E_FAIL; + }else { + hres = disp_call_value(ctx, get_object(v), NULL, flags, argc, argv, r); + } + jsval_release(v); + return hres; + } return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); case EXPRVAL_JSVAL: { IDispatch *obj; - HRESULT hres; hres = to_object(ctx, ref->u.val, &obj); if(SUCCEEDED(hres)) { @@ -3300,16 +3318,11 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } } - /* ECMA-262 3rd Edition 11.2.3.7 */ if(this_obj) { - jsdisp_t *jsthis; + jsdisp_t *jsthis = to_jsdisp(this_obj); - jsthis = iface_to_jsdisp(this_obj); - if(jsthis) { - if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) - this_obj = NULL; - jsdisp_release(jsthis); - } + if(jsthis && jsthis->builtin_info->class == JSCLASS_GLOBAL) + this_obj = NULL; } if(ctx->call_ctx && (flags & EXEC_EVAL)) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e81bbea..1368f39 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2634,6 +2634,8 @@ testException(function() {null.toString();}, "E_OBJECT_EXPECTED"); testException(function() {RegExp.prototype.toString.call(new Object());}, "E_REGEXP_EXPECTED"); testException(function() {/a/.lastIndex();}, "E_NOT_FUNC"); testException(function() {"a".length();}, "E_NOT_FUNC"); +testException(function() {((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())();}, "E_NOT_NUM"); +testException(function() {((function() { var f = Object.prototype.hasOwnProperty; return (function() { return f("f"); }); })())();}, "E_OBJECT_EXPECTED"); testException(function() { return arguments.callee(); }, "E_STACK_OVERFLOW"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index cf08423..67e4576 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -310,6 +310,9 @@ argumentsTest(); ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); })(1,2); +tmp = ((function() { var f = function() {return this}; return (function() { return f(); }); })())(); +ok(tmp === this, "detached scope function call this != global this"); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;"); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 0f9df4c..1916199 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1791,6 +1791,26 @@ sync_test("let scope instances", function() { ok(f() == 2, "f() = " + f()); }); +sync_test("substituted this", function() { + try { + ((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())(); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_NUMBER_EXPECTED, "Number.toString threw " + n); + } + + var r = ((function() { var f = Object.prototype.toString; return (function() { return f(); }); })())(); + todo_wine. + ok(r === "[object Undefined]", "detached scope Object.toString returned " + r); + + var r = (function() { this.f = Object.prototype.toString; return this.f(); })(); + todo_wine. + ok(r === "[object Window]", "Object.toString returned " + r); + + var r = ((function() { return (function() { return this; }); })())(); + ok(r === window, "detached scope this = " + r); +}); + sync_test("functions scope", function() { function f(){ return 1; } function f(){ return 2; } -- 2.34.1

3 5

Re: [PATCH v3 0/7] MR68: rsaenh RC2 bigger keys weirdness support and MAC hashes fixes. - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/68

1 0

Re: [PATCH v2 0/5] MR71: ntdll: Simplify heap validation functions. - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/71

1 0

Re: [PATCH v3 0/1] MR70: msvcrt: Hook up __C_specific_handler and __jump_unwind for arm - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/70

1 0

Re: [PATCH v2 0/2] MR72: win32u: Handle sys color brushes in fill_rect. - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/72

1 0

Re: [PATCH v2 0/4] MR32: ntdll: Collect logical processor info just once at process start. - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/32

1 0

Re: [PATCH v4 0/6] MR62: windows.gaming.input: More force feedback implementation. - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/62

1 0

Re: [PATCH v2 0/1] MR67: shell32/tests: Use 'shellpath' as tmpfile name in PathResolve tests - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/67

1 0

Re: [PATCH v5 0/5] MR34: windows.media.speech: Changes for IAsyncAction. - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/34

1 0

Would implementing UMDF support be useful (or even viable)?
by Mark N 16 May '22

16 May '22

Hello, I was reading about the Windows User Mode Device Framework (aka UMDF) and I was interested in possibly working on adding support for UMDF drivers in Wine. I think there are Windows drivers out there that run entirely in usermode (e.g. some USB drivers) which could be successfully ported to Linux this way. However I'm still new to Wine so I thought I'd ask - has anybody else ever explored doing this? Would this sort of thing be a good fit for Wine in general? Thanks! Mark N

4 4

[PATCH v2 0/3] MR69: include: Add __WINE_MALLOC attribute and use it for allocation functions.
by Brendan Shanks (＠bshanks) 16 May '22

16 May '22

With this patch, lib/wine/x86_64-windows/ ends up 100 KB smaller, and I would expect performance benefits too. >From https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-ma…: Attribute malloc indicates that a function is malloc-like, i.e., that the pointer P returned by the function cannot alias any other pointer valid when the function returns, and moreover no pointers to valid objects occur in any storage addressed by P. In addition, the GCC predicts that a function with the attribute returns non-null in most cases. Using the attribute with no arguments is designed to improve optimization by relying on the aliasing property it implies. Functions like malloc and calloc have this property because they return a pointer to uninitialized or zeroed-out, newly obtained storage. However, functions like realloc do not have this property, as they may return pointers to storage containing pointers to existing objects. Additionally, since all such functions are assumed to return null only infrequently, callers can be optimized based on that assumption. -- v2: crypt32/tests: Fix mismatched deallocation function. include: Add __WINE_DEALLOC attribute and use it for allocation functions. include: Add __WINE_MALLOC attribute and use it for allocation functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/69

2 4

32bit Wine on macOS Catalina
by Eddie Hillenbrand 16 May '22

16 May '22

Hi all, Reading everything I can find about Wine on macOS, seems like there still isn't a good solution for 32bit on Catalina and beyond.[1] I'm currently running Catalina and don't intend to upgrade my Mac or the OS anytime soon. My goal is to compile everything on Catalina and to run 32bit Wine on Catalina. I can compile 64bit Wine without a problem and 32bit Wine compiles against the MacOSX10.13.sdk. I can run 32bit Wine with the `no32exec=0' boot argument and DYLD_ROOT_PATH pointing at a directory containing `/System' & `/usr/lib' from a machine running 10.13. It crashes because of kernel changes that are incompatible with libraries from High Sierra. Specifically, (10.15) libdispatch redefined work queue priorities, so the (10.15) kernel starts the work queue thread with an invalid priority as understood by (10.13) libdispatch. Exception Type: EXC_BAD_INSTRUCTION (SIGILL) Exception Codes: 0x0000000000000001, 0x0000000000000000 Exception Note: EXC_CORPSE_NOTIFY Termination Signal: Illegal instruction: 4 Termination Reason: Namespace SIGNAL, Code 0x4 Terminating Process: exc handler [22976] Application Specific Information: dyld2 mode BUG IN CLIENT OF LIBDISPATCH: Corrupted priority [...] Thread 1 Crashed: 0 libdispatch.dylib 0x0643aef5 _dispatch_worker_thread3 + 180 1 libsystem_pthread.dylib 0x068c3fa5 _pthread_wqthread + 1356 2 libsystem_pthread.dylib 0x068c3a32 start_wqthread + 34 Initially, I thought using DYLD_ROOT_PATH with 10.13 system directories was the way to go. So I modified libdispatch to use the new priority definitions and replaced `/usr/lib/system/libdispatch.dylib' in the DYLD_ROOT_PATH with my modified version. This got past the work queue crash, but a few other crashes emerged that needed to be squashed in libdispatch, eventually I made it to NSApplication initialization. Unfortunately, the application initialization crashes when it tries to initialize the user defaults subsystem. I was hoping I would only have to solve a few crashes in some of the open source libraries. Of course this wasn't the case. Since I had made it past the initial app bootstrapping and into ObjC frameworks I was no longer in open source code. I could have kept playing Whac-A-Mole, as it is especially easy to monkey patch ObjC code with method swizzling. I considered going down this path, but before going there, I decided to try a DYLD_ROOT_PATH with system directories from 10.14. I'm glad I tried using 10.14 dylibs before sinking more time into patching and hacking my way through 10.13 dylibs. The 10.14 dylibs don't crash, instead the WindowServer refuses to allow a connection from a 32bit process. _RegisterApplication(), FAILED TO REGISTER PROCESS WITH CPS/CoreGraphics in WindowServer, err=-304 I suspected this might be an AppKit limitation so I tried using the deprecated Carbon libs and got the same error. Then I tried using private WindowServer APIs directly, which didn't error in the same way, but also didn't draw anything.[2] Compiling the same code for 64bit, however, draws as expected. A way forward for 32bit Wine is possible. Just do drawing in a 64bit process. It might sound like a hack, but drawing or interacting with the WindowServer is already done using IPC—it is just transparent to the developer. I already made a proof of concept, so I know the technique is solid. Additionally, on Catalina at least, this removes the need for the DYLD_ROOT_PATH since the 32bit process would, in theory, only need to link with libSystem and it ships with 32bit binaries. $ sw_vers -productVersion 10.15.7 $ lipo -info /usr/lib/libSystem.dylib Architectures in the fat file: /usr/lib/libSystem.dylib are: x86_64 i386 And by extension, most everything in the umbrella framework `/usr/lib/system/*' also contains 32bit binaries. My intention is to put the winemac.drv in its own 64bit process. I don't really have a question, this is more a statement of intent, but I'd welcome any feedback, thoughts, or concerns. If nothing else this email memorializes the things someone is likely to encounter if they try to make 32bit Wine run on Catalina or anyone that tries to run any 32bit app on Catalina. Eddie [1] I'm aware of CrossOver, etc. [2] I did eventually get one of the private functions to return -304 which is probably significant as it matches the _RegisterApplication() error.

6 8

[PATCH v2 0/7] MR68: rsaenh RC2 bigger keys weirdness support and MAC hashes fixes.
by Paul Gofman (＠gofman) 16 May '22

16 May '22

Part of the fix required Vivox chat server connection in "We Were Here Forever". It is actually patch 5 which is required specifically for the game, the rest are bugs found on the way of testing that functionality. WRT the game, it also seems to depend on certain rsaenh functions clearing last error on success, I am going to send that part once this one is clear. -- v2: rsaenh: Output FIXME when HMAC hash algorithm is not found. rsaenh: Allow importing bigger RC2 keys. rsaenh: Factor out alloc_key() function. rsaenh: Store key state in hash data for _MAC hash algorithm. rsaenh: Factor out block_encrypt() function. rsaenh: Handle uneven hash data updates sizes for CALG_MAC. rsaenh: Use CRT memory allocators. https://gitlab.winehq.org/wine/wine/-/merge_requests/68

3 9

[PATCH v3 1/7] d3d11/tests: Test logic op.
by Zebediah Figura 16 May '22

16 May '22

From: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: fix the clear color... dlls/d3d11/tests/d3d11.c | 166 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6c0ae089f78..99f304e5b68 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34034,6 +34034,171 @@ static void test_user_defined_annotation(void) release_test_context(&test_context); } +static void test_logic_op(void) +{ + D3D11_FEATURE_DATA_D3D11_OPTIONS options; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11RenderTargetView *rtvs[8]; + ID3D11BlendState1 *blend_state; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *rts[8]; + ID3D11Device1 *device1; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out uint4 t0 : SV_Target0, out uint4 t1 : SV_Target1, + out uint4 t2 : SV_Target2, out uint4 t3 : SV_Target3, + out uint4 t4 : SV_Target4, out uint4 t5 : SV_Target5, + out uint4 t6 : SV_Target6, out uint4 t7 : SV_Target7) + { + t0 = t1 = t2 = t3 = t4 = t5 = t6 = t7 = uint4(0x00, 0x00, 0xff, 0xff); + } +#endif + 0x43425844, 0x4ed0bba7, 0x9f7d54c4, 0xba1e3dce, 0xc29634f8, 0x00000001, 0x000002b0, 0x00000003, + 0x0000002c, 0x00000060, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x000000d4, 0x00000008, 0x00000008, 0x000000c8, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x000000c8, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x0000000f, + 0x000000c8, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x0000000f, 0x000000c8, 0x00000003, + 0x00000000, 0x00000001, 0x00000003, 0x0000000f, 0x000000c8, 0x00000004, 0x00000000, 0x00000001, + 0x00000004, 0x0000000f, 0x000000c8, 0x00000005, 0x00000000, 0x00000001, 0x00000005, 0x0000000f, + 0x000000c8, 0x00000006, 0x00000000, 0x00000001, 0x00000006, 0x0000000f, 0x000000c8, 0x00000007, + 0x00000000, 0x00000001, 0x00000007, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, + 0x0000016c, 0x00000040, 0x0000005b, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000003, 0x03000065, + 0x001020f2, 0x00000004, 0x03000065, 0x001020f2, 0x00000005, 0x03000065, 0x001020f2, 0x00000006, + 0x03000065, 0x001020f2, 0x00000007, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000004, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000005, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000006, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000007, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x0100003e + }; + + D3D11_BLEND_DESC1 blend_desc = + { + .IndependentBlendEnable = TRUE, + .RenderTarget = + { + {FALSE, TRUE, D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, + D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, D3D11_LOGIC_OP_CLEAR, + D3D11_COLOR_WRITE_ENABLE_ALL}, + {FALSE, TRUE, D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, + D3D11_BLEND_ZERO, D3D11_BLEND_ONE, D3D11_BLEND_OP_ADD, D3D11_LOGIC_OP_CLEAR, + D3D11_COLOR_WRITE_ENABLE_ALL}, + }, + }; + + static const struct + { + D3D11_LOGIC_OP op; + DWORD color; + } + tests[] = + { + {D3D11_LOGIC_OP_CLEAR, 0x00000000}, + {D3D11_LOGIC_OP_NOR, 0x000000ff}, + {D3D11_LOGIC_OP_AND_INVERTED, 0x0000ff00}, + {D3D11_LOGIC_OP_COPY_INVERTED, 0x0000ffff}, + {D3D11_LOGIC_OP_AND_REVERSE, 0x00ff0000}, + {D3D11_LOGIC_OP_INVERT, 0x00ff00ff}, + {D3D11_LOGIC_OP_XOR, 0x00ffff00}, + {D3D11_LOGIC_OP_NAND, 0x00ffffff}, + {D3D11_LOGIC_OP_AND, 0xff000000}, + {D3D11_LOGIC_OP_EQUIV, 0xff0000ff}, + {D3D11_LOGIC_OP_NOOP, 0xff00ff00}, + {D3D11_LOGIC_OP_OR_INVERTED, 0xff00ffff}, + {D3D11_LOGIC_OP_COPY, 0xffff0000}, + {D3D11_LOGIC_OP_OR_REVERSE, 0xffff00ff}, + {D3D11_LOGIC_OP_OR, 0xffffff00}, + {D3D11_LOGIC_OP_SET, 0xffffffff}, + }; + static const float clear_color[] = {0.0f, 255.0f, 0.0f, 255.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + if (FAILED(hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D11_OPTIONS, &options, sizeof(options))) + || !options.OutputMergerLogicOp) + { + skip("Logic op is not supported.\n"); + release_test_context(&test_context); + return; + } + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11Device1, (void **)&device1); + ok(hr == S_OK, "Failed to get ID3D11Device1 interface, hr %#lx.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + blend_desc.IndependentBlendEnable = FALSE; + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ID3D11BlendState1_Release(blend_state); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UINT; + for (i = 0; i < 8; ++i) + { + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rts[i]); + ok(hr == S_OK, "Failed to create texture %u, hr %#lx.\n", i, hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rts[i], NULL, &rtvs[i]); + ok(hr == S_OK, "Failed to create rendertarget view %u, hr %#lx.\n", i, hr); + } + + ID3D11DeviceContext_OMSetRenderTargets(context, 8, rtvs, NULL); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + blend_desc.RenderTarget[0].LogicOp = tests[i].op; + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#lx.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, (ID3D11BlendState *)blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState1_Release(blend_state); + + for (j = 0; j < 8; ++j) + ID3D11DeviceContext_ClearRenderTargetView(context, rtvs[j], clear_color); + draw_quad(&test_context); + + for (j = 0; j < 8; ++j) + { + get_texture_readback(rts[j], 0, &rb); + color = get_readback_color(&rb, 320, 240, 0); + ok(compare_color(color, tests[i].color, 1), "%u: Got unexpected color 0x%08lx.\n", i, color); + release_resource_readback(&rb); + } + } + + for (i = 0; i < 8; i++) + { + ID3D11Texture2D_Release(rts[i]); + ID3D11RenderTargetView_Release(rtvs[i]); + } + ID3D11PixelShader_Release(ps); + ID3D11Device1_Release(device1); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34214,6 +34379,7 @@ START_TEST(d3d11) queue_test(test_constant_buffer_offset); queue_test(test_dynamic_map_synchronization); queue_test(test_user_defined_annotation); + queue_test(test_logic_op); run_queued_tests(); -- 2.35.1

1 6

[PATCH v2 0/1] MR75: kernel32: In WritePrivateProfileStructW prevent null pointer dereference
by Fabian Maurer (＠DarkShadow44) 16 May '22

16 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49285 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> -- v2: kernel32: In WritePrivateProfileStructW prevent null pointer dereference https://gitlab.winehq.org/wine/wine/-/merge_requests/75

4 3

[PATCH v2 1/7] d3d11/tests: Test logic op.
by Zebediah Figura 16 May '22

16 May '22

From: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: adapt to long type conversion; convert "ops" and "expected_colors" into a single array of structs, some other minor stylistic tweaks. This supersedes 235591. dlls/d3d11/tests/d3d11.c | 166 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6c0ae089f78..d9b0fb2c23f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34034,6 +34034,171 @@ static void test_user_defined_annotation(void) release_test_context(&test_context); } +static void test_logic_op(void) +{ + D3D11_FEATURE_DATA_D3D11_OPTIONS options; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11RenderTargetView *rtvs[8]; + ID3D11BlendState1 *blend_state; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *rts[8]; + ID3D11Device1 *device1; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out uint4 t0 : SV_Target0, out uint4 t1 : SV_Target1, + out uint4 t2 : SV_Target2, out uint4 t3 : SV_Target3, + out uint4 t4 : SV_Target4, out uint4 t5 : SV_Target5, + out uint4 t6 : SV_Target6, out uint4 t7 : SV_Target7) + { + t0 = t1 = t2 = t3 = t4 = t5 = t6 = t7 = uint4(0x00, 0x00, 0xff, 0xff); + } +#endif + 0x43425844, 0x4ed0bba7, 0x9f7d54c4, 0xba1e3dce, 0xc29634f8, 0x00000001, 0x000002b0, 0x00000003, + 0x0000002c, 0x00000060, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x000000d4, 0x00000008, 0x00000008, 0x000000c8, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x000000c8, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x0000000f, + 0x000000c8, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x0000000f, 0x000000c8, 0x00000003, + 0x00000000, 0x00000001, 0x00000003, 0x0000000f, 0x000000c8, 0x00000004, 0x00000000, 0x00000001, + 0x00000004, 0x0000000f, 0x000000c8, 0x00000005, 0x00000000, 0x00000001, 0x00000005, 0x0000000f, + 0x000000c8, 0x00000006, 0x00000000, 0x00000001, 0x00000006, 0x0000000f, 0x000000c8, 0x00000007, + 0x00000000, 0x00000001, 0x00000007, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, + 0x0000016c, 0x00000040, 0x0000005b, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000003, 0x03000065, + 0x001020f2, 0x00000004, 0x03000065, 0x001020f2, 0x00000005, 0x03000065, 0x001020f2, 0x00000006, + 0x03000065, 0x001020f2, 0x00000007, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000004, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000005, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000006, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x08000036, 0x001020f2, 0x00000007, 0x00004002, 0x00000000, + 0x00000000, 0x000000ff, 0x000000ff, 0x0100003e + }; + + D3D11_BLEND_DESC1 blend_desc = + { + .IndependentBlendEnable = TRUE, + .RenderTarget = + { + {FALSE, TRUE, D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, + D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, D3D11_LOGIC_OP_CLEAR, + D3D11_COLOR_WRITE_ENABLE_ALL}, + {FALSE, TRUE, D3D11_BLEND_ONE, D3D11_BLEND_ZERO, D3D11_BLEND_OP_ADD, + D3D11_BLEND_ZERO, D3D11_BLEND_ONE, D3D11_BLEND_OP_ADD, D3D11_LOGIC_OP_CLEAR, + D3D11_COLOR_WRITE_ENABLE_ALL}, + }, + }; + + static const struct + { + D3D11_LOGIC_OP op; + DWORD color; + } + tests[] = + { + {D3D11_LOGIC_OP_CLEAR, 0x00000000}, + {D3D11_LOGIC_OP_NOR, 0x000000ff}, + {D3D11_LOGIC_OP_AND_INVERTED, 0x0000ff00}, + {D3D11_LOGIC_OP_COPY_INVERTED, 0x0000ffff}, + {D3D11_LOGIC_OP_AND_REVERSE, 0x00ff0000}, + {D3D11_LOGIC_OP_INVERT, 0x00ff00ff}, + {D3D11_LOGIC_OP_XOR, 0x00ffff00}, + {D3D11_LOGIC_OP_NAND, 0x00ffffff}, + {D3D11_LOGIC_OP_AND, 0xff000000}, + {D3D11_LOGIC_OP_EQUIV, 0xff0000ff}, + {D3D11_LOGIC_OP_NOOP, 0xff00ff00}, + {D3D11_LOGIC_OP_OR_INVERTED, 0xff00ffff}, + {D3D11_LOGIC_OP_COPY, 0xffff0000}, + {D3D11_LOGIC_OP_OR_REVERSE, 0xffff00ff}, + {D3D11_LOGIC_OP_OR, 0xffffff00}, + {D3D11_LOGIC_OP_SET, 0xffffffff}, + }; + static const float clear_color[] = {0.0f, 1.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + if (FAILED(hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D11_OPTIONS, &options, sizeof(options))) + || !options.OutputMergerLogicOp) + { + skip("Logic op is not supported.\n"); + release_test_context(&test_context); + return; + } + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11Device1, (void **)&device1); + ok(hr == S_OK, "Failed to get ID3D11Device1 interface, hr %#lx.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + blend_desc.IndependentBlendEnable = FALSE; + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ID3D11BlendState1_Release(blend_state); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UINT; + for (i = 0; i < 8; ++i) + { + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rts[i]); + ok(hr == S_OK, "Failed to create texture %u, hr %#lx.\n", i, hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rts[i], NULL, &rtvs[i]); + ok(hr == S_OK, "Failed to create rendertarget view %u, hr %#lx.\n", i, hr); + } + + ID3D11DeviceContext_OMSetRenderTargets(context, 8, rtvs, NULL); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + blend_desc.RenderTarget[0].LogicOp = tests[i].op; + hr = ID3D11Device1_CreateBlendState1(device1, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#lx.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, (ID3D11BlendState *)blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState1_Release(blend_state); + + for (j = 0; j < 8; ++j) + ID3D11DeviceContext_ClearRenderTargetView(context, rtvs[j], clear_color); + draw_quad(&test_context); + + for (j = 0; j < 8; ++j) + { + get_texture_readback(rts[j], 0, &rb); + color = get_readback_color(&rb, 320, 240, 0); + ok(compare_color(color, tests[i].color, 1), "%u: Got unexpected color 0x%08lx.\n", i, color); + release_resource_readback(&rb); + } + } + + for (i = 0; i < 8; i++) + { + ID3D11Texture2D_Release(rts[i]); + ID3D11RenderTargetView_Release(rtvs[i]); + } + ID3D11PixelShader_Release(ps); + ID3D11Device1_Release(device1); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34214,6 +34379,7 @@ START_TEST(d3d11) queue_test(test_constant_buffer_offset); queue_test(test_dynamic_map_synchronization); queue_test(test_user_defined_annotation); + queue_test(test_logic_op); run_queued_tests(); -- 2.35.1

3 9

[PATCH v3 0/1] MR75: kernel32: In WritePrivateProfileStructW prevent null pointer dereference
by Fabian Maurer (＠DarkShadow44) 16 May '22

16 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49285 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> -- v3: kernel32: In WritePrivateProfileStructW prevent null pointer dereference https://gitlab.winehq.org/wine/wine/-/merge_requests/75

2 1

[PATCH 0/1] MR75: kernel32: In WritePrivateProfileStructW prevent null pointer dereference
by Fabian Maurer (＠DarkShadow44) 16 May '22

16 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49285 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/75

2 1

[tools] testbot: Exchange the queued and canceled job colors.
by Francois Gouget 16 May '22

16 May '22

This way the canceled jobs are in black while the runnable (queued) and running jobs are both in blue which is more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 7b6389477..fd6fca359 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -380,14 +380,14 @@ pre .right { float: right; } -.queued { color: black; } +.queued { color: darkblue; } .running { color: blue; } .success { color: green; } .badpatch { color: red; } .badbuild { color: red; } .testfail { color: red; } .boterror { color: #e55600; } -.canceled { color: darkblue; } +.canceled { color: black; } .userrequest { color: #e55600; } .userapproved { color: green; } -- 2.30.2

1 0

[PATCH 0/1] MR74: ntdll: Prevent double free (Coverity)
by Fabian Maurer (＠DarkShadow44) 16 May '22

16 May '22

The fd gets overwritten, therefore we need to close it before doing so. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- Supersedes patch 233975 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/74

2 1

[PATCH v2 0/1] MR70: msvcrt: Hook up __C_specific_handler and __jump_unwind for arm
by Martin Storsjö (＠mstorsjo) 16 May '22

16 May '22

This was set up for arm in ntdll and ucrtbase in 3ef9a04f9181fb7d28832c60b5439337460005b6, but msvcrt was missed. Signed-off-by: Martin Storsjö <martin(a)martin.st> -- v2: msvcrt: Hook up __C_specific_handler and __jump_unwind for arm https://gitlab.winehq.org/wine/wine/-/merge_requests/70

3 5

[PATCH 0/1] MR70: msvcrt: Hook up __C_specific_handler and __jump_unwind for arm
by Martin Storsjö (＠mstorsjo) 16 May '22

16 May '22

This was set up for arm in ntdll and ucrtbase in 3ef9a04f9181fb7d28832c60b5439337460005b6, but msvcrt was missed. Signed-off-by: Martin Storsjö <martin(a)martin.st> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/70

3 2

[PATCH 1/2] jscript: Handle detached scope objects 'this' in Object.toString.
by Gabriel Ivăncescu 16 May '22

16 May '22

Object.prototype.toString is unique in that it's a builtin that accepts any value as 'this', even null or undefined or non-JS objects (and returns [object Object] for them). However, for detached scopes, it returns JS_E_OBJECT_EXPECTED. This is important because it shows that builtins don't follow the path specified in `ECMA-262 3rd Edition 11.2.3.7` (which is handled in exec_source now) which would otherwise replace 'this' with null, and toString can handle null just fine. Without this, the assertion triggers. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Note that ES5 is different (next patch). dlls/jscript/object.c | 3 ++- dlls/jscript/tests/api.js | 2 ++ dlls/jscript/tests/lang.js | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index a675e45..453ea95 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -73,8 +73,9 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns str = L"[object Object]"; }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; + }else if(jsdisp->builtin_info->class == JSCLASS_NONE) { + hres = JS_E_OBJECT_EXPECTED; }else { - assert(jsdisp->builtin_info->class != JSCLASS_NONE); FIXME("jsdisp->builtin_info->class = %d\n", jsdisp->builtin_info->class); hres = E_FAIL; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e81bbea..85677a1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2634,6 +2634,8 @@ testException(function() {null.toString();}, "E_OBJECT_EXPECTED"); testException(function() {RegExp.prototype.toString.call(new Object());}, "E_REGEXP_EXPECTED"); testException(function() {/a/.lastIndex();}, "E_NOT_FUNC"); testException(function() {"a".length();}, "E_NOT_FUNC"); +testException(function() {((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())();}, "E_NOT_NUM"); +testException(function() {((function() { var f = Object.prototype.toString; return (function() { return f(); }); })())();}, "E_OBJECT_EXPECTED"); testException(function() { return arguments.callee(); }, "E_STACK_OVERFLOW"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index cf08423..67e4576 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -310,6 +310,9 @@ argumentsTest(); ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); })(1,2); +tmp = ((function() { var f = function() {return this}; return (function() { return f(); }); })())(); +ok(tmp === this, "detached scope function call this != global this"); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;"); -- 2.34.1

3 16

[PATCH 0/6] MR73: Improvement in PDB's types record handling
by eric pouech (＠epo) 16 May '22

16 May '22

This serie tackles several issues encountered while loading PDB files through dbghelp. It happens that PDB allows to have several type records for user defined types (struct / enums) with the same name. This seems to be generated by a) compiler (when modifying a structure definition between several compilation phases), b) the incremental linker (likely an optimisation of previous case, but not 100% certain when it's triggered). Wine's dbghelp ended up not picking the right record, hence generating errneous outputs. This series: - cleans up some PDB related code - update winedump to display the PDB hash table internals - fixes dbghelp to preserve in Wine's dbghelp hash table the partial order between type records of same name. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/73

2 6

[PATCH v3] oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject.
by Connor McAdams 16 May '22

16 May '22

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/main.c | 51 ++++++++++++++--- dlls/oleacc/tests/main.c | 121 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 10 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index dced84be7b5..1128b6c9b44 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -398,6 +398,22 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } +#define NAVDIR_INTERNAL_HWND 10 +static HWND get_hwnd_from_acc_nav(IAccessible *acc) +{ + HWND hwnd = NULL; + VARIANT v, cid; + HRESULT hr; + + VariantInit(&v); + variant_init_i4(&cid, CHILDID_SELF); + hr = IAccessible_accNavigate(acc, NAVDIR_INTERNAL_HWND, cid, &v); + if(SUCCEEDED(hr) && V_VT(&v) == VT_I4) + hwnd = IntToPtr(V_I4(&v)); + + return hwnd; +} + HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) { IDispatch *parent; @@ -406,29 +422,46 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) TRACE("%p %p\n", acc, phwnd); - IAccessible_AddRef(acc); - while(1) { - hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + *phwnd = NULL; + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); if(SUCCEEDED(hres)) { - hres = IOleWindow_GetWindow(ow, phwnd); - IOleWindow_Release(ow); - IAccessible_Release(acc); + if(!*phwnd) + *phwnd = get_hwnd_from_acc_nav(acc); + return hres; } + } + + *phwnd = get_hwnd_from_acc_nav(acc); + if(*phwnd) + return S_OK; + IAccessible_AddRef(acc); + while(1) { hres = IAccessible_get_accParent(acc, &parent); IAccessible_Release(acc); if(FAILED(hres)) return hres; - if(hres!=S_OK || !parent) { - *phwnd = NULL; + if(hres!=S_OK || !parent) return hres; - } hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); IDispatch_Release(parent); if(FAILED(hres)) return hres; + + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + if(SUCCEEDED(hres)) { + IAccessible_Release(acc); + return hres; + } + } } } diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7854764ec08..70b66d82ca1 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -59,8 +59,10 @@ DEFINE_EXPECT(Accessible_get_accChildCount); DEFINE_EXPECT(Accessible_get_accChild); DEFINE_EXPECT(Accessible_get_accName); DEFINE_EXPECT(Accessible_get_accParent); +DEFINE_EXPECT(Accessible_accNavigate); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_EXPECT(Accessible_child_accNavigate); static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); @@ -91,7 +93,11 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } +static IAccessible Accessible; static IAccessible Accessible_child; +static IOleWindow OleWindow; +static HWND Accessible_accnav_hwnd; +static HWND OleWindow_hwnd; static HRESULT WINAPI Accessible_QueryInterface( IAccessible *iface, REFIID riid, void **ppvObject) @@ -104,6 +110,12 @@ static HRESULT WINAPI Accessible_QueryInterface( return S_OK; } + if(IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) { + *ppvObject = &OleWindow; + IAccessible_AddRef(iface); + return S_OK; + } + if(IsEqualIID(riid, &IID_IEnumVARIANT)) { CHECK_EXPECT(Accessible_QI_IEnumVARIANT); return E_NOINTERFACE; @@ -155,7 +167,12 @@ static HRESULT WINAPI Accessible_get_accParent( IAccessible *iface, IDispatch **ppdispParent) { if(iface == &Accessible_child) + { CHECK_EXPECT(Accessible_child_get_accParent); + if (OleWindow_hwnd) + return IAccessible_QueryInterface(&Accessible, &IID_IDispatch, + (void **)ppdispParent); + } else CHECK_EXPECT(Accessible_get_accParent); @@ -292,10 +309,25 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft, return E_NOTIMPL; } +#define NAVDIR_INTERNAL_HWND 10 static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface, LONG navDir, VARIANT varStart, VARIANT *pvarEnd) { - ok(0, "unexpected call\n"); + if(iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_accNavigate); + else + CHECK_EXPECT(Accessible_accNavigate); + + /* + * Magic number value for retrieving an HWND. Used by DynamicAnnotation + * IAccessible wrapper. + */ + if(navDir == NAVDIR_INTERNAL_HWND) { + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = HandleToULong(Accessible_accnav_hwnd); + return S_OK; + } + return E_NOTIMPL; } @@ -358,8 +390,44 @@ static IAccessibleVtbl AccessibleVtbl = { Accessible_put_accValue }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **obj) +{ + return IAccessible_QueryInterface(&Accessible, riid, obj); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + return IAccessible_AddRef(&Accessible); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + return IAccessible_Release(&Accessible); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) +{ + *hwnd = OleWindow_hwnd; + return S_OK; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = { + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + static IAccessible Accessible = {&AccessibleVtbl}; static IAccessible Accessible_child = {&AccessibleVtbl}; +static IOleWindow OleWindow = {&OleWindowVtbl}; static void test_getroletext(void) { @@ -1826,6 +1894,56 @@ static void test_default_edit_accessible_object(void) DestroyWindow(hwnd); } +static void test_WindowFromAccessibleObject(void) +{ + HRESULT hr; + HWND hwnd; + + /* Successfully retrieve an HWND from the IOleWindow interface. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + + /* Successfully retrieve an HWND from IAccessible::accNavigate. */ + Accessible_accnav_hwnd = (HWND)0xdeadf00d; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + /* This value gets sign-extended on 64-bit. */ + ok(hwnd == IntToPtr(0xdeadf00d), "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_accNavigate); + + /* Return a NULL HWND from both methods, no accParent call. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(!hwnd, "hwnd %p\n", hwnd); + CHECK_CALLED(Accessible_accNavigate); + + /* Successfully retrieve an HWND from a parent IAccessible's IOleWindow interface. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_child_accNavigate); + SET_EXPECT(Accessible_child_get_accParent); + hr = WindowFromAccessibleObject(&Accessible_child, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_child_accNavigate); + CHECK_CALLED(Accessible_child_get_accParent); + + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = NULL; +} + START_TEST(main) { int argc; @@ -1867,6 +1985,7 @@ START_TEST(main) test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object(); + test_WindowFromAccessibleObject(); unregister_window_class(); CoUninitialize(); -- 2.25.1

3 8

[PATCH 1/2] vbscript: Implement DateSerial().
by Nikolay Sivov 16 May '22

16 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 35 ++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 28 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab06db87624..da3da1f04d8 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2044,10 +2044,39 @@ static HRESULT Global_TimeValue(BuiltinDisp *This, VARIANT *arg, unsigned args_c return E_NOTIMPL; } -static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int year, month, day; + SYSTEMTIME lt; + HRESULT hres; + double date; + UDATE ud; + + TRACE("\n"); + + assert(args_cnt == 3); + + hres = to_int(args, &year); + if (SUCCEEDED(hres)) + hres = to_int(args + 1, &month); + if (SUCCEEDED(hres)) + hres = to_int(args + 2, &day); + + if (SUCCEEDED(hres)) + { + lt.wYear = year; + lt.wMonth = month; + lt.wDay = day; + + ud.st = lt; + ud.wDayOfYear = 0; + hres = VarDateFromUdateEx(&ud, 0, 0, &date); + } + + if (SUCCEEDED(hres)) + hres = return_date(res, date); + + return hres; } static HRESULT Global_TimeSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 20798a0aacd..f65789184e0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1958,4 +1958,32 @@ sub testErrRaise() end sub call testErrRaise() +sub testDateSerial(yy, mm, dd, yyexp, mmexp, ddexp) + dim x + x = DateSerial(yy, mm, dd) + call ok(Year(x) = yyexp, "year = " & Year(x) & " expected " & yyexp) + call ok(Month(x) = mmexp, "month = " & Month(x) & " expected " & mmexp) + call ok(Day(x) = ddexp, "day = " & Day(x) & " expected " & ddexp) + call ok(getVT(x) = "VT_DATE*", "getVT = " & getVT(x)) +end sub + +sub testDateSerialError() + on error resume next + call Err.clear() + call DateSerial(10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call DateSerial(-10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testDateSerial(100, 2, 1, 100, 2, 1) +call testDateSerial(0, 2, 1, 2000, 2, 1) +call testDateSerial(49, 2, 1, 2049, 2, 1) +call testDateSerial(50, 2, 1, 1950, 2, 1) +call testDateSerial(99, 2, 1, 1999, 2, 1) +call testDateSerial(2000, 14, 2, 2001, 2, 2) +call testDateSerial(9999, 12, 1, 9999, 12, 1) +call testDateSerialError() + Call reportSuccess() -- 2.35.1

4 6

[PATCH 0/2] MR72: win32u: Handle sys color brushes in fill_rect.
by Jacek Caban (＠jacek) 16 May '22

16 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/72

3 3

[PATCH 0/6] MR68: rsaenh RC2 bigger keys weirdness support and MAC hashes fixes.
by Paul Gofman (＠gofman) 16 May '22

16 May '22

Part of the fix required Vivox chat server connection in "We Were Here Forever". It is actually patch 5 which is required specifically for the game, the rest are bugs found on the way of testing that functionality. WRT the game, it also seems to depend on certain rsaenh functions clearing last error on success, I am going to send that part once this one is clear. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/68

4 8

[PATCH 0/5] MR71: ntdll: Simplify heap validation functions.
by Rémi Bernon (＠rbernon) 16 May '22

16 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/71

2 5

[PATCH v2 1/8] dinput: Store the device_format field inline in struct dinput_device.
by Rémi Bernon 16 May '22

16 May '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 235664-235668 dlls/dinput/device.c | 35 +++++++++++++---------------------- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_hid.c | 4 ++-- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d881669c06f..a23398ac794 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -244,7 +244,7 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD return NULL; } -static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, +static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj, DWORD version ) { DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType ); @@ -276,11 +276,10 @@ static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DIDATAFORMAT *format ) { - DIDATAFORMAT *user_format, *device_format = impl->device_format; + DIDATAFORMAT *user_format, *device_format = &impl->device_format; DIOBJECTDATAFORMAT *user_obj, *match_obj; DWORD i; - if (!device_format) return DIERR_INVALIDPARAM; if (!(user_format = malloc( sizeof(DIDATAFORMAT) ))) return DIERR_OUTOFMEMORY; *user_format = *device_format; user_format->dwFlags = format->dwFlags; @@ -322,12 +321,12 @@ failed: static int id_to_offset( struct dinput_device *impl, int id ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + DIDATAFORMAT *user_format = impl->user_format; DIOBJECTDATAFORMAT *user_obj; if (!user_format) return -1; - user_obj = user_format->rgodf + device_format->dwNumObjs; + user_obj = user_format->rgodf + impl->device_format.dwNumObjs; while (user_obj-- > user_format->rgodf) { if (!user_obj->dwType) continue; @@ -346,9 +345,9 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic ) DWORD instance; int i; - for (i = 0; i < This->device_format->dwNumObjs && !found; i++) + for (i = 0; i < This->device_format.dwNumObjs && !found; i++) { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( This->device_format, i ); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( &This->device_format, i ); if (byofs && value != odf->dwOfs) continue; if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue; @@ -751,8 +750,7 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) free( This->data_queue ); /* Free data format */ - free( This->device_format->rgodf ); - free( This->device_format ); + free( This->device_format.rgodf ); dinput_device_release_user_format( This ); /* Free action mapping */ @@ -889,7 +887,7 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + DIDATAFORMAT *device_format = &impl->device_format, *user_format = impl->user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; @@ -1535,7 +1533,7 @@ static HRESULT WINAPI dinput_device_GetObjectInfo( IDirectInputDevice8W *iface, static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *device_format = impl->device_format, *user_format; + DIDATAFORMAT *device_format = &impl->device_format, *user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; BYTE *user_state = data; DIPROPHEADER filter = @@ -1924,7 +1922,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, break; default: devMask = DIGENRE_ANY; - df = impl->device_format; + df = &impl->device_format; break; } @@ -2013,7 +2011,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D df = &c_dfDIMouse2; break; default: - df = impl->device_format; + df = &impl->device_format; break; } @@ -2158,14 +2156,8 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, struct dinput *dinput, void **out ) { struct dinput_device *This; - DIDATAFORMAT *format; if (!(This = calloc( 1, size ))) return DIERR_OUTOFMEMORY; - if (!(format = calloc( 1, sizeof(*format) ))) - { - free( This ); - return DIERR_OUTOFMEMORY; - } This->IDirectInputDevice8A_iface.lpVtbl = &dinput_device_a_vtbl; This->IDirectInputDevice8W_iface.lpVtbl = &dinput_device_w_vtbl; @@ -2174,7 +2166,6 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->caps.dwSize = sizeof(DIDEVCAPS); This->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; - This->device_format = format; This->device_gain = 10000; This->force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; InitializeCriticalSection( &This->crit ); @@ -2204,7 +2195,7 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; DIOBJECTDATAFORMAT *obj_format; if (!format->rgodf) @@ -2240,7 +2231,7 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 4e76d1ba738..2936e8ccb37 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -103,7 +103,7 @@ struct dinput_device BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ DWORD buffersize; /* size of the queue - set in 'SetProperty' */ - DIDATAFORMAT *device_format; + DIDATAFORMAT device_format; DIDATAFORMAT *user_format; /* Action mapping */ diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c97588d8a07..f0b243091b9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1224,7 +1224,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, index, count, report_len = impl->caps.InputReportByteLength; - DIDATAFORMAT *format = impl->base.device_format; + DIDATAFORMAT *format = &impl->base.device_format; char *report_buf = impl->input_report_buf; struct parse_device_state_params params; struct hid_joystick_effect *effect; @@ -2300,7 +2300,7 @@ static BOOL get_parameters_object_id( struct hid_joystick *impl, struct hid_valu static BOOL get_parameters_object_ofs( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - DIDATAFORMAT *device_format = impl->base.device_format, *user_format = impl->base.user_format; + DIDATAFORMAT *device_format = &impl->base.device_format, *user_format = impl->base.user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (!user_format) return DIENUM_CONTINUE; -- 2.35.1

1 7

[PATCH 1/2] hidclass.sys: Clear the buffer passed to IOCTL_HID_GET_DEVICE_DESCRIPTOR.
by Rémi Bernon 16 May '22

16 May '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Somehow the "ok( !desc->bLength, "got size %u\n", desc->bLength );" test at driver_bus.c:1042 managed to pass all this time, and is now failing for me locally. dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index fec51af40a9..cc4e3b96c82 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -192,8 +192,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) { BASE_DEVICE_EXTENSION *fdo_ext = fdo->DeviceExtension, *pdo_ext; HID_DEVICE_ATTRIBUTES attr = {0}; + HID_DESCRIPTOR descriptor = {0}; HIDP_COLLECTION_DESC *desc; - HID_DESCRIPTOR descriptor; DEVICE_OBJECT *child_pdo; BYTE *reportDescriptor; UNICODE_STRING string; -- 2.35.1

1 1

[PATCH 1/5] wined3d: Prepare wined3d_format_convert_from_float for > 32bpp formats (v3).
by Stefan Dösinger 16 May '22

16 May '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 3: Remove traces that might read beyond the input buffer, add a comment on the input size. Version 2: Don't insist on a 16 byte output buffer. --- dlls/wined3d/device.c | 4 +-- dlls/wined3d/resource.c | 16 ++++----- dlls/wined3d/utils.c | 60 ++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 54 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8937c7fc0fc..d39634c49fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3689,7 +3689,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO diffuse_colour = material_diffuse; } wined3d_color_clamp(&diffuse_colour, &diffuse_colour, 0.0f, 1.0f); - *((DWORD *)dest_ptr) = wined3d_format_convert_from_float(output_colour_format, &diffuse_colour); + wined3d_format_convert_from_float(output_colour_format, &diffuse_colour, dest_ptr); dest_ptr += sizeof(DWORD); } @@ -3713,7 +3713,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO } update_fog_factor(&specular_colour.a, &ls); wined3d_color_clamp(&specular_colour, &specular_colour, 0.0f, 1.0f); - *((DWORD *)dest_ptr) = wined3d_format_convert_from_float(output_colour_format, &specular_colour); + wined3d_format_convert_from_float(output_colour_format, &specular_colour, dest_ptr); dest_ptr += sizeof(DWORD); } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7587a6455a4..073bc5b5834 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -621,7 +621,7 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_format *format = resource->format; unsigned int w, h, d, x, y, z, bpp; uint8_t *dst, *dst2; - uint32_t c; + uint32_t c[4]; w = box->right - box->left; h = box->bottom - box->top; @@ -632,7 +632,7 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, + ((box->top / format->block_height) * map->row_pitch) + ((box->left / format->block_width) * format->block_byte_count); - c = wined3d_format_convert_from_float(format, colour); + wined3d_format_convert_from_float(format, colour, c); bpp = format->byte_count; switch (bpp) @@ -640,14 +640,14 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, case 1: for (x = 0; x < w; ++x) { - dst[x] = c; + dst[x] = c[0]; } break; case 2: for (x = 0; x < w; ++x) { - ((uint16_t *)dst)[x] = c; + ((uint16_t *)dst)[x] = c[0]; } break; @@ -656,16 +656,16 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, dst2 = dst; for (x = 0; x < w; ++x, dst2 += 3) { - dst2[0] = (c ) & 0xff; - dst2[1] = (c >> 8) & 0xff; - dst2[2] = (c >> 16) & 0xff; + dst2[0] = (c[0] ) & 0xff; + dst2[1] = (c[0] >> 8) & 0xff; + dst2[2] = (c[0] >> 16) & 0xff; } break; } case 4: for (x = 0; x < w; ++x) { - ((uint32_t *)dst)[x] = c; + ((uint32_t *)dst)[x] = c[0]; } break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 401d815a365..26698b1ab04 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6000,8 +6000,14 @@ uint32_t wined3d_format_pack(const struct wined3d_format *format, const struct w /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values - * in the range 0.0f -> 1.0f. */ -DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) + * in the range 0.0f -> 1.0f. + * + * The code below assumes that no component crosses the 32 bit boundary (like + * e.g. a hypothetical, and totally braindead, B30G30R4 format would). + * This function writes at least sizeof(uint32_t) bytes, or format->byte_count, + * whichever is larger. */ +void wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color, + void *ret) { static const struct { @@ -6044,10 +6050,11 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con }; enum wined3d_format_id format_id = format->id; struct wined3d_color colour_srgb; + struct wined3d_uvec4 idx, shift; unsigned int i; - DWORD ret; TRACE("Converting colour %s to format %s.\n", debug_color(color), debug_d3dformat(format_id)); + memset(ret, 0, max(sizeof(uint32_t), format->byte_count)); for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) { @@ -6062,37 +6069,54 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con for (i = 0; i < ARRAY_SIZE(float_conv); ++i) { + uint32_t *ret_i = ret; + if (format_id != float_conv[i].format_id) continue; - ret = ((DWORD)((color->r * float_conv[i].mul.x) + 0.5f)) << float_conv[i].shift.x; - ret |= ((DWORD)((color->g * float_conv[i].mul.y) + 0.5f)) << float_conv[i].shift.y; - ret |= ((DWORD)((color->b * float_conv[i].mul.z) + 0.5f)) << float_conv[i].shift.z; - ret |= ((DWORD)((color->a * float_conv[i].mul.w) + 0.5f)) << float_conv[i].shift.w; + idx.x = float_conv[i].shift.x / 32; + idx.y = float_conv[i].shift.y / 32; + idx.z = float_conv[i].shift.z / 32; + idx.w = float_conv[i].shift.w / 32; + shift.x = float_conv[i].shift.x % 32; + shift.y = float_conv[i].shift.y % 32; + shift.z = float_conv[i].shift.z % 32; + shift.w = float_conv[i].shift.w % 32; - TRACE("Returning 0x%08x.\n", ret); + ret_i[idx.x] = ((uint32_t)((color->r * float_conv[i].mul.x) + 0.5f)) << shift.x; + ret_i[idx.y] |= ((uint32_t)((color->g * float_conv[i].mul.y) + 0.5f)) << shift.y; + ret_i[idx.z] |= ((uint32_t)((color->b * float_conv[i].mul.z) + 0.5f)) << shift.z; + ret_i[idx.w] |= ((uint32_t)((color->a * float_conv[i].mul.w) + 0.5f)) << shift.w; - return ret; + return; } for (i = 0; i < ARRAY_SIZE(double_conv); ++i) { + uint32_t *ret_i; + if (format_id != double_conv[i].format_id) continue; - ret = ((DWORD)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; - ret |= ((DWORD)((color->g * double_conv[i].mul.y) + 0.5)) << double_conv[i].shift.y; - ret |= ((DWORD)((color->b * double_conv[i].mul.z) + 0.5)) << double_conv[i].shift.z; - ret |= ((DWORD)((color->a * double_conv[i].mul.w) + 0.5)) << double_conv[i].shift.w; + idx.x = float_conv[i].shift.x / 32; + idx.y = float_conv[i].shift.y / 32; + idx.z = float_conv[i].shift.z / 32; + idx.w = float_conv[i].shift.w / 32; + shift.x = float_conv[i].shift.x % 32; + shift.y = float_conv[i].shift.y % 32; + shift.z = float_conv[i].shift.z % 32; + shift.w = float_conv[i].shift.w % 32; + + ret_i = ret; + ret_i[idx.x] = ((uint32_t)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; + ret_i[idx.y] |= ((uint32_t)((color->g * double_conv[i].mul.y) + 0.5)) << double_conv[i].shift.y; + ret_i[idx.z] |= ((uint32_t)((color->b * double_conv[i].mul.z) + 0.5)) << double_conv[i].shift.z; + ret_i[idx.w] |= ((uint32_t)((color->a * double_conv[i].mul.w) + 0.5)) << double_conv[i].shift.w; - TRACE("Returning 0x%08x.\n", ret); - - return ret; + return; } FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format_id)); - - return 0; } static float color_to_float(DWORD color, DWORD size, DWORD offset) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba1dc2169b0..37cec7dd2c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6150,8 +6150,8 @@ void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigne unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; -DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, - const struct wined3d_color *color) DECLSPEC_HIDDEN; +void wined3d_format_convert_from_float(const struct wined3d_format *format, + const struct wined3d_color *color, void *ret) DECLSPEC_HIDDEN; void wined3d_format_copy_data(const struct wined3d_format *format, const uint8_t *src, unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN; -- 2.35.1

3 7

[v7 PATCH 1/2] d2d1: Implement ID2D1DeviceContext::CreateImageBrush().
by Nikolay Sivov 16 May '22

16 May '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: Add missing AddRef() to ::SetImage(). Thanks Nikolay. v4: Fix a typo in ::GetImage implementation. v5: Specify correct brush type, add a FIXME for D2D1_IMAGE_BRUSH_PROPERTIES.sourceRectangle, drop d2d_brush_bind_image() helper. Thanks Henri. v6: Add some tests. v7: Image brush description is a required argument dlls/d2d1/brush.c | 243 ++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 12 ++ dlls/d2d1/device.c | 14 ++- 3 files changed, 265 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 14d9cb54e92..b9a673fe54c 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1101,6 +1101,246 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, return S_OK; } +static inline struct d2d_brush *impl_from_ID2D1ImageBrush(ID2D1ImageBrush *iface) +{ + return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_image_brush_QueryInterface(ID2D1ImageBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1ImageBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1ImageBrush_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_image_brush_AddRef(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_image_brush_Release(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + if (brush->u.image.image) + ID2D1Image_Release(brush->u.image.image); + d2d_brush_destroy(brush); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetFactory(ID2D1ImageBrush *iface, + ID2D1Factory **factory) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = brush->factory); +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetOpacity(ID2D1ImageBrush *iface, float opacity) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetTransform(ID2D1ImageBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + brush->transform = *transform; +} + +static float STDMETHODCALLTYPE d2d_image_brush_GetOpacity(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->opacity; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetTransform(ID2D1ImageBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + *transform = brush->transform; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, ID2D1Image *image) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, image %p.\n", iface, image); + + if (image) + ID2D1Image_AddRef(image); + if (brush->u.image.image) + ID2D1Image_Release(brush->u.image.image); + brush->u.image.image = image; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeX(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.image.extend_mode_x = mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeY(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.image.extend_mode_y = mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetInterpolationMode(ID2D1ImageBrush *iface, + D2D1_INTERPOLATION_MODE mode) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.image.interpolation_mode = mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetSourceRectangle(ID2D1ImageBrush *iface, const D2D1_RECT_F *rect) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, rect %s.\n", iface, debug_d2d_rect_f(rect)); + + brush->u.image.source_rect = *rect; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, ID2D1Image **image) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, image %p.\n", iface, image); + + if ((*image = (ID2D1Image *)brush->u.image.image)) + ID2D1Image_AddRef(*image); +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeX(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->u.image.extend_mode_x; +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeY(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->u.image.extend_mode_y; +} + +static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_image_brush_GetInterpolationMode(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->u.image.interpolation_mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetSourceRectangle(ID2D1ImageBrush *iface, D2D1_RECT_F *rect) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, rect %p.\n", iface, rect); + + *rect = brush->u.image.source_rect; +} + +static const struct ID2D1ImageBrushVtbl d2d_image_brush_vtbl = +{ + d2d_image_brush_QueryInterface, + d2d_image_brush_AddRef, + d2d_image_brush_Release, + d2d_image_brush_GetFactory, + d2d_image_brush_SetOpacity, + d2d_image_brush_SetTransform, + d2d_image_brush_GetOpacity, + d2d_image_brush_GetTransform, + d2d_image_brush_SetImage, + d2d_image_brush_SetExtendModeX, + d2d_image_brush_SetExtendModeY, + d2d_image_brush_SetInterpolationMode, + d2d_image_brush_SetSourceRectangle, + d2d_image_brush_GetImage, + d2d_image_brush_GetExtendModeX, + d2d_image_brush_GetExtendModeY, + d2d_image_brush_GetInterpolationMode, + d2d_image_brush_GetSourceRectangle +}; + +HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, + const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + struct d2d_brush **brush) +{ + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) + return E_OUTOFMEMORY; + + d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE, + brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl); + if (((*brush)->u.image.image = image)) + ID2D1Image_AddRef((*brush)->u.image.image); + + (*brush)->u.image.source_rect = image_brush_desc->sourceRectangle; + (*brush)->u.image.extend_mode_x = image_brush_desc->extendModeX; + (*brush)->u.image.extend_mode_y = image_brush_desc->extendModeY; + (*brush)->u.image.interpolation_mode = image_brush_desc->interpolationMode; + + TRACE("Created brush %p.\n", *brush); + return S_OK; +} + struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) { if (!iface) @@ -1108,7 +1348,8 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl - || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_image_brush_vtbl); return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b7e1a12b3b8..29469f5142e 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -42,6 +42,7 @@ enum d2d_brush_type D2D_BRUSH_TYPE_LINEAR, D2D_BRUSH_TYPE_RADIAL, D2D_BRUSH_TYPE_BITMAP, + D2D_BRUSH_TYPE_IMAGE, D2D_BRUSH_TYPE_COUNT, }; @@ -319,6 +320,14 @@ struct d2d_brush D2D1_EXTEND_MODE extend_mode_y; D2D1_INTERPOLATION_MODE interpolation_mode; } bitmap; + struct + { + ID2D1Image *image; + D2D1_EXTEND_MODE extend_mode_x; + D2D1_EXTEND_MODE extend_mode_y; + D2D1_INTERPOLATION_MODE interpolation_mode; + D2D1_RECT_F source_rect; + } image; } u; }; @@ -333,6 +342,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; +HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, + const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + struct d2d_brush **brush) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) DECLSPEC_HIDDEN; BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 80badcddaac..eb0c1935ebb 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1923,10 +1923,18 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush) { - FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n", - iface, image, image_brush_desc, brush_desc, brush); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + struct d2d_brush *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc, + brush_desc, brush); + + if (SUCCEEDED(hr = d2d_image_brush_create(context->factory, image, image_brush_desc, + brush_desc, &object))) + *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface, -- 2.35.1

2 2

[PATCH 1/2] include: Add ID2D1PathGeometry1 definition.
by Nikolay Sivov 16 May '22

16 May '22

From: James McDonnell <topgamer7(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_1.idl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index fdec8ae5f9c..b8af40cc9a8 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -20,7 +20,6 @@ import "d2d1.idl"; import "d2d1effects.idl"; interface ID2D1DeviceContext; -interface ID2D1PathGeometry1; interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; @@ -349,6 +348,22 @@ interface ID2D1GdiMetafile : ID2D1Resource ); } +[ + object, + uuid(62baa2d2-ab54-41b7-b872-787e0106a421), + local, +] +interface ID2D1PathGeometry1 : ID2D1PathGeometry +{ + HRESULT ComputePointAndSegmentAtLength( + [in] float length, + [in] UINT32 start_segment, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] D2D1_POINT_DESCRIPTION *point_desc + ); +} + [ object, uuid(483473d7-cd46-4f9d-9d3a-3112aa80159d), -- 2.35.1

1 1

[PATCH vkd3d 1/4] vkd3d: Always destroy created objects on d3d12_fence_init() failure.
by Conor McCarthy 16 May '22

16 May '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55e6be58..b187c65b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1247,6 +1247,7 @@ static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkResult vr; HRESULT hr; int rc; @@ -1266,8 +1267,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if ((rc = vkd3d_cond_init(&fence->null_event_cond))) { ERR("Failed to initialize cond variable, error %d.\n", rc); - vkd3d_mutex_destroy(&fence->mutex); - return hresult_from_errno(rc); + hr = hresult_from_errno(rc); + goto fail_destroy_mutex; } if (flags) @@ -1282,7 +1283,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * &fence->timeline_semaphore)) < 0) { WARN("Failed to create timeline semaphore, vr %d.\n", vr); - return hresult_from_vk_result(vr); + hr = hresult_from_vk_result(vr); + goto fail_destroy_null_cond; } fence->pending_timeline_value = initial_value; fence->gpu_wait_count = 0; @@ -1295,14 +1297,21 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { - vkd3d_mutex_destroy(&fence->mutex); - vkd3d_cond_destroy(&fence->null_event_cond); - return hr; + goto fail_destroy_timeline_semaphore; } d3d12_device_add_ref(fence->device = device); return S_OK; + +fail_destroy_timeline_semaphore: + VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL)); +fail_destroy_null_cond: + vkd3d_cond_destroy(&fence->null_event_cond); +fail_destroy_mutex: + vkd3d_mutex_destroy(&fence->mutex); + + return hr; } HRESULT d3d12_fence_create(struct d3d12_device *device, -- 2.35.1

3 6

[PATCH 0/1] MR69: include: Add __WINE_MALLOC attribute and use it for allocation functions.
by Brendan Shanks (＠bshanks) 16 May '22

16 May '22

With this patch, lib/wine/x86_64-windows/ ends up 100 KB smaller, and I would expect performance benefits too. >From https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-ma…: Attribute malloc indicates that a function is malloc-like, i.e., that the pointer P returned by the function cannot alias any other pointer valid when the function returns, and moreover no pointers to valid objects occur in any storage addressed by P. In addition, the GCC predicts that a function with the attribute returns non-null in most cases. Using the attribute with no arguments is designed to improve optimization by relying on the aliasing property it implies. Functions like malloc and calloc have this property because they return a pointer to uninitialized or zeroed-out, newly obtained storage. However, functions like realloc do not have this property, as they may return pointers to storage containing pointers to existing objects. Additionally, since all such functions are assumed to return null only infrequently, callers can be optimized based on that assumption. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/69

7 7

[PATCH 1/5] dinput: Store the device_format field inline in struct dinput_device.
by Zebediah Figura 16 May '22

16 May '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dinput/device.c | 38 +++++++++++++++--------------------- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_hid.c | 5 +++-- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d881669c06f..76214d73ece 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -244,7 +244,7 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD return NULL; } -static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, +static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj, DWORD version ) { DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType ); @@ -276,11 +276,11 @@ static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DIDATAFORMAT *format ) { - DIDATAFORMAT *user_format, *device_format = impl->device_format; + const DIDATAFORMAT *device_format = &impl->device_format; DIOBJECTDATAFORMAT *user_obj, *match_obj; + DIDATAFORMAT *user_format; DWORD i; - if (!device_format) return DIERR_INVALIDPARAM; if (!(user_format = malloc( sizeof(DIDATAFORMAT) ))) return DIERR_OUTOFMEMORY; *user_format = *device_format; user_format->dwFlags = format->dwFlags; @@ -322,12 +322,12 @@ failed: static int id_to_offset( struct dinput_device *impl, int id ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + DIDATAFORMAT *user_format = impl->user_format; DIOBJECTDATAFORMAT *user_obj; if (!user_format) return -1; - user_obj = user_format->rgodf + device_format->dwNumObjs; + user_obj = user_format->rgodf + impl->device_format.dwNumObjs; while (user_obj-- > user_format->rgodf) { if (!user_obj->dwType) continue; @@ -346,9 +346,9 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic ) DWORD instance; int i; - for (i = 0; i < This->device_format->dwNumObjs && !found; i++) + for (i = 0; i < This->device_format.dwNumObjs && !found; i++) { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( This->device_format, i ); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( &This->device_format, i ); if (byofs && value != odf->dwOfs) continue; if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue; @@ -751,8 +751,7 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) free( This->data_queue ); /* Free data format */ - free( This->device_format->rgodf ); - free( This->device_format ); + free( This->device_format.rgodf ); dinput_device_release_user_format( This ); /* Free action mapping */ @@ -889,7 +888,8 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + const DIDATAFORMAT *device_format = &impl->device_format; + DIDATAFORMAT *user_format = impl->user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; @@ -1535,8 +1535,9 @@ static HRESULT WINAPI dinput_device_GetObjectInfo( IDirectInputDevice8W *iface, static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *device_format = impl->device_format, *user_format; + const DIDATAFORMAT *device_format = &impl->device_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; + DIDATAFORMAT *user_format; BYTE *user_state = data; DIPROPHEADER filter = { @@ -1924,7 +1925,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, break; default: devMask = DIGENRE_ANY; - df = impl->device_format; + df = &impl->device_format; break; } @@ -2013,7 +2014,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D df = &c_dfDIMouse2; break; default: - df = impl->device_format; + df = &impl->device_format; break; } @@ -2158,14 +2159,8 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, struct dinput *dinput, void **out ) { struct dinput_device *This; - DIDATAFORMAT *format; if (!(This = calloc( 1, size ))) return DIERR_OUTOFMEMORY; - if (!(format = calloc( 1, sizeof(*format) ))) - { - free( This ); - return DIERR_OUTOFMEMORY; - } This->IDirectInputDevice8A_iface.lpVtbl = &dinput_device_a_vtbl; This->IDirectInputDevice8W_iface.lpVtbl = &dinput_device_w_vtbl; @@ -2174,7 +2169,6 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->caps.dwSize = sizeof(DIDEVCAPS); This->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; - This->device_format = format; This->device_gain = 10000; This->force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; InitializeCriticalSection( &This->crit ); @@ -2204,7 +2198,7 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; DIOBJECTDATAFORMAT *obj_format; if (!format->rgodf) @@ -2240,7 +2234,7 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 4e76d1ba738..2936e8ccb37 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -103,7 +103,7 @@ struct dinput_device BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ DWORD buffersize; /* size of the queue - set in 'SetProperty' */ - DIDATAFORMAT *device_format; + DIDATAFORMAT device_format; DIDATAFORMAT *user_format; /* Action mapping */ diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c97588d8a07..ef6cbfba65f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1224,7 +1224,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, index, count, report_len = impl->caps.InputReportByteLength; - DIDATAFORMAT *format = impl->base.device_format; + const DIDATAFORMAT *format = &impl->base.device_format; char *report_buf = impl->input_report_buf; struct parse_device_state_params params; struct hid_joystick_effect *effect; @@ -2300,7 +2300,8 @@ static BOOL get_parameters_object_id( struct hid_joystick *impl, struct hid_valu static BOOL get_parameters_object_ofs( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - DIDATAFORMAT *device_format = impl->base.device_format, *user_format = impl->base.user_format; + const DIDATAFORMAT *device_format = &impl->base.device_format; + DIDATAFORMAT *user_format = impl->base.user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (!user_format) return DIENUM_CONTINUE; -- 2.35.1

1 4

[PATCH] include: Consitfy the RAWINPUTDEVICE pointer parameter to RegisterRawInputDevices().
by Zebediah Figura 16 May '22

16 May '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index fd947bea83e..d83d694a474 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -385,7 +385,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun /*********************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, UINT device_count, UINT size) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(const RAWINPUTDEVICE *devices, UINT device_count, UINT size) { struct rawinput_device *d; BOOL ret; diff --git a/include/winuser.h b/include/winuser.h index a227b912e0e..fd3ea879731 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4120,7 +4120,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); -WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterRawInputDevices(const RAWINPUTDEVICE *,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); -- 2.35.1

2 1

[PATCH] ddraw/tests: Test D3DRENDERSTATE_ROP2.
by Chip Davis 15 May '22

15 May '22

I don't expect d3d7 to work. But I don't have real hardware that exposes D3DPRASTERCAPS_ROP2 to verify that. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 139 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 117 ++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 112 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 102 ++++++++++++++++++++++++++++ 4 files changed, 470 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b87b7903289..1e528b79380 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -15091,6 +15091,144 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DTLVERTEX tquad[] = + { + {{ 0.0f}, {480.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC hal_caps, hel_caps; + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + UINT inst_length; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + void *ptr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirect3DDevice_GetCaps(device, &hal_caps, &hel_caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x\n", hr); + if (!(hal_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2) && + !(hel_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + background = create_diffuse_material(device, 0.667f, 0.0f, 0.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + memcpy(exec_desc.lpData, tquad, sizeof(tquad)); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(tquad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); + emit_set_rs(&ptr, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_ROP2, tests[i].rop2); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + inst_length -= sizeof(tquad); + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface_Release(rt); + } + + destroy_viewport(device, viewport); + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_material(background); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -15209,4 +15347,5 @@ START_TEST(ddraw1) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index eea87f4bac2..5f5008799fe 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -16031,6 +16031,122 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DTLVERTEX tquad[] = + { + {{ 0.0f}, {480.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC hal_caps, hel_caps; + IDirect3DMaterial2 *background; + IDirect3DViewport2 *viewport; + IDirect3DDevice2 *device; + IDirectDrawSurface *rt; + IDirectDraw2 *ddraw; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + IDirect3DDevice2_GetCaps(device, &hal_caps, &hel_caps); + if (!(hal_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2) && + !(hel_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice2_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + background = create_diffuse_material(device, 0.667f, 0.0f, 0.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ROP2, tests[i].rop2); + ok(SUCCEEDED(hr), "Failed to set raster op, hr %#x.\n", hr); + + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice2_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_TLVERTEX, tquad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface_Release(rt); + } + + destroy_viewport(device, viewport); + destroy_material(background); + IDirect3DDevice2_Release(device); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(&IID_IDirect3DHALDevice); @@ -16161,4 +16277,5 @@ START_TEST(ddraw2) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 136cf90fa60..7b3216001cd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -19089,6 +19089,117 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xffccff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xffccff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xffccff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xffccff00} + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC hal_caps, hel_caps; + IDirect3DViewport3 *viewport; + IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + IDirect3DDevice3_GetCaps(device, &hal_caps, &hel_caps); + if (!(hal_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2) && + !(hel_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice3_Release(device); + DestroyWindow(window); + return; + } + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ROP2, tests[i].rop2); + ok(SUCCEEDED(hr), "Failed to set raster op, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffaa0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, tquad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface4_Release(rt); + } + + destroy_viewport(device, viewport); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -19229,4 +19340,5 @@ START_TEST(ddraw4) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 711eac2a6d6..a22e3942f39 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -19324,6 +19324,107 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xffccff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xffccff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xffccff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xffccff00} + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC7 caps; + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + IDirect3DDevice7_GetCaps(device, &caps); + if (!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice7_Release(device); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ROP2, tests[i].rop2); + ok(SUCCEEDED(hr), "Failed to set raster op, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffaa0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, tquad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface7_Release(rt); + } + + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(hw_device_guid); @@ -19502,4 +19603,5 @@ START_TEST(ddraw7) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } -- 2.34.1

5 6

[PATCH] shlwapi/tests: Fix a test failure with the UTF-8 code page.
by Zebediah Figura 14 May '22

14 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52870 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 36951ef5a83..3162d55896f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -480,10 +480,10 @@ static void test_UrlGetPart(void) /* All characters, other than those with special meaning, are allowed. */ {"http://foo:bar@google.*.com:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, 0, S_OK, "google.*.com"}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass@host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, - {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff@host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, - {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}:pass@host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, + {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}@host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, + {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:"}, @@ -661,6 +661,15 @@ static void test_UrlGetPart(void) winetest_pop_context(); } + + /* Test non-ASCII characters. */ + + size = ARRAY_SIZE(bufferW); + wcscpy(bufferW, L"x"); + hr = UrlGetPartW(L"http://\x01\x7f\x80\xff:pass@host", bufferW, &size, URL_PART_USERNAME, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size == wcslen(bufferW), "Got size %lu.\n", size); + ok(!wcscmp(bufferW, L"\x01\x7f\x80\xff"), "Got result %s.\n", debugstr_w(bufferW)); } /* ########################### */ -- 2.35.1

1 0

[PATCH v2] quartz/systemclock: Use timeGetTime() to retrieve the current time.
by Zebediah Figura 14 May '22

14 May '22

There is no evidence that the extra overhead should matter, and this allows us to be consistent, and potentially change timeGetTime() without having to worry about quartz. On Windows, timeGetTime() has identical resolution to the interrupt time [i.e. the "InterruptTime" member of the shared user data, or QueryInterruptTime()]. Like those sources, it approximately measures the boot time. However, the values are not identical; timeGetTime() lags behind QueryInterruptTime() anywhere from 1 to 12 ms (regardless of timer period) on my Windows 10 virtual machine. The actual lag is consistent within a process but varies between runs. I have not been able to account for this lag—it's not the suspend bias, nor is it an attempt to match the tick count more closely. In short, timeGetTime() seems to be idiosyncratic to winmm. Since quartz has been shown to follow winmm exactly on Windows, let's follow it on Wine as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53005 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix integer promotion; actually test this time... dlls/quartz/Makefile.in | 2 +- dlls/quartz/systemclock.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index e7e1b43da79..7854a87e846 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 729122fec46..01a8e9fa1ee 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -45,7 +45,6 @@ struct system_clock LONG thread_created; BOOL thread_stopped; HANDLE thread; - LARGE_INTEGER frequency; REFERENCE_TIME last_time; CRITICAL_SECTION cs; CONDITION_VARIABLE cv; @@ -53,12 +52,9 @@ struct system_clock struct list sinks; }; -static REFERENCE_TIME get_current_time(const struct system_clock *clock) +static REFERENCE_TIME get_current_time(void) { - LARGE_INTEGER time; - - QueryPerformanceCounter(&time); - return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000; + return (REFERENCE_TIME)timeGetTime() * 10000; } static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) @@ -155,7 +151,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) EnterCriticalSection(&clock->cs); - current_time = get_current_time(clock); + current_time = get_current_time(); LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) { @@ -250,7 +246,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return E_POINTER; } - ret = get_current_time(clock); + ret = get_current_time(); EnterCriticalSection(&clock->cs); @@ -346,7 +342,6 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); - QueryPerformanceFrequency(&object->frequency); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; -- 2.35.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel