- Wine-Commits - list.winehq.org

Esme Povirk : mscoree: Update Wine Mono to 8.1.0.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 9c1ffb545f350743e71cdfcc0dae5e98324d10ee URL: https://gitlab.winehq.org/wine/wine/-/commit/9c1ffb545f350743e71cdfcc0dae5e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Oct 23 10:06:17 2023 -0500 mscoree: Update Wine Mono to 8.1.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index bcf92efdb80..a2957c3040a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -56,10 +56,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "8.0.0" +#define MONO_VERSION "8.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "75b3f45dca1dc89857fe9e932da78710f64cc6d49ef1ab0c723a177085b4711b" +#define MONO_SHA "0ed3ec533aef79b2f312155931cf7b1080009ac0c5b4c2bcfeb678ac948e0810" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 50ed656a656..dcbb531770b 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "8.0.0" +#define WINE_MONO_VERSION "8.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 0df6a6029f9..aaae5671843 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.4 - MONO_VER: 8.0.0 + MONO_VER: 8.1.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0

Akihiro Sagawa : cmd: Reset totals after trailer output.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 30e0deb70e7d3cda36a46b3462c1135aeec266d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/30e0deb70e7d3cda36a46b3462c113… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 23 22:09:18 2023 +0900 cmd: Reset totals after trailer output. Otherwise, sums are inherited between drives. For instance, dir /s z:\tmp c:\windows\system32\drivers\etc shows an incorrect summary for drive c. --- programs/cmd/directory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 4d3ae3f9c7d..709bbb52287 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -937,6 +937,7 @@ void WCMD_directory (WCHAR *args) if (lastDrive != '?') { trailerReqd = FALSE; WCMD_dir_trailer(prevEntry->dirName); + byte_total = file_total = dir_total = 0; } lastDrive = towupper(thisEntry->dirName[0]);

1 0

Zebediah Figura : d3d10core/tests: Avoid POINT sampling exactly halfway between two mip levels.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: e50b5ce778052d29021ca17e192d7db947c0d36e URL: https://gitlab.winehq.org/wine/wine/-/commit/e50b5ce778052d29021ca17e192d7d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 23 20:41:53 2023 -0500 d3d10core/tests: Avoid POINT sampling exactly halfway between two mip levels. This gives different results on llvmpipe. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53213 --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b337c05f056..a8283da9c18 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -7448,10 +7448,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.5f, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.6f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.4f, level_1_colors}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.5f, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.6f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 4.0f, level_2_colors},

1 0

Zebediah Figura : d3d11/tests: Avoid POINT sampling exactly halfway between two mip levels.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 552a46ea78cc8bedc3d012040bfc70ce8d6f4666 URL: https://gitlab.winehq.org/wine/wine/-/commit/552a46ea78cc8bedc3d012040bfc70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 23 20:42:23 2023 -0500 d3d11/tests: Avoid POINT sampling exactly halfway between two mip levels. This gives different results on llvmpipe. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53213 --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3bf3fa44d97..1b33664befd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9830,10 +9830,10 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.4f, rgba_level_0}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.5f, level_1_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.6f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.0f, level_1_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.4f, level_1_colors}, - {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.5f, level_2_colors}, + {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 1.6f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 2.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 3.0f, level_2_colors}, {&ps_sample_l, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 4.0f, level_2_colors},

1 0

Jinoh Kang : ntdll/tests: Use win_skip() for missing APIs in test_query_process_debug_port_custom_dacl.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 4a7bba9087302102129daff4df987b2cc67f4917 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a7bba9087302102129daff4df987b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 21 20:30:28 2023 +0900 ntdll/tests: Use win_skip() for missing APIs in test_query_process_debug_port_custom_dacl. A missing API is a todo in Wine. --- dlls/ntdll/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 3b9bad56ea4..3cedca0d6ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2228,13 +2228,13 @@ static void test_query_process_debug_port_custom_dacl(int argc, char **argv) if (!pDbgUiSetThreadDebugObject) { - skip("DbgUiGetThreadDebugObject not found\n"); + win_skip("DbgUiGetThreadDebugObject not found\n"); return; } if (!pDbgUiGetThreadDebugObject) { - skip("DbgUiSetThreadDebugObject not found\n"); + win_skip("DbgUiSetThreadDebugObject not found\n"); return; }

1 0

Jacek Caban : wined3d: Use return type to return result from read_dword.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 947060bfcc381d41843348652623b0e4350a9462 URL: https://gitlab.winehq.org/wine/wine/-/commit/947060bfcc381d41843348652623b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 22:36:58 2023 +0200 wined3d: Use return type to return result from read_dword. Avoid implicit casts from enum pointers. --- dlls/wined3d/shader_sm4.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f76bd693b3b..4af1a5b43ba 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1853,10 +1853,12 @@ struct aon9_header unsigned int byte_code_offset; }; -static void read_dword(const char **ptr, unsigned int *d) +static unsigned int read_dword(const char **ptr) { - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); + unsigned int ret; + memcpy(&ret, *ptr, sizeof(ret)); + *ptr += sizeof(ret); + return ret; } static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) @@ -1872,7 +1874,7 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { - read_dword(ptr, &d); + d = read_dword(ptr); WARN("\t0x%08x\n", d); } } @@ -1906,7 +1908,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int return E_INVALIDARG; } - read_dword(&ptr, &count); + count = read_dword(&ptr); TRACE("%u elements.\n", count); skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */ @@ -1931,24 +1933,24 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int unsigned int name_offset; if (has_stream_index) - read_dword(&ptr, &e[i].stream_idx); + e[i].stream_idx = read_dword(&ptr); else e[i].stream_idx = 0; - read_dword(&ptr, &name_offset); + name_offset = read_dword(&ptr); if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) { WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); heap_free(e); return E_INVALIDARG; } - read_dword(&ptr, &e[i].semantic_idx); - read_dword(&ptr, &e[i].sysval_semantic); - read_dword(&ptr, &e[i].component_type); - read_dword(&ptr, &e[i].register_idx); - read_dword(&ptr, &e[i].mask); + e[i].semantic_idx = read_dword(&ptr); + e[i].sysval_semantic = read_dword(&ptr); + e[i].component_type = read_dword(&ptr); + e[i].register_idx = read_dword(&ptr); + e[i].mask = read_dword(&ptr); if (has_min_precision) - read_dword(&ptr, &e[i].min_precision); + e[i].min_precision = read_dword(&ptr); else e[i].min_precision = 0;

1 0

Gabriel Ivăncescu : mshtml: Set outer window to uninitialized page when document obj is released.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 110dad9ca562fb3952dd78f6f08e7bf00c2e3e48 URL: https://gitlab.winehq.org/wine/wine/-/commit/110dad9ca562fb3952dd78f6f08e7b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 20 22:24:51 2023 +0300 mshtml: Set outer window to uninitialized page when document obj is released. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 12 ++-- dlls/mshtml/navigate.c | 5 +- dlls/mshtml/nsevents.c | 6 +- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/oleobj.c | 72 +++++++++++++++++++-- dlls/mshtml/tests/events.c | 148 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 36 ++++++++++- dlls/mshtml/tests/script.c | 17 +++++ 9 files changed, 283 insertions(+), 17 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Return proper errors when navigating with no browser.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: 4418f928affdc9fc0637adf4fdaa9cc76927b20c URL: https://gitlab.winehq.org/wine/wine/-/commit/4418f928affdc9fc0637adf4fdaa9c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 20 22:24:51 2023 +0300 mshtml: Return proper errors when navigating with no browser. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 3 +++ dlls/mshtml/tests/events.c | 21 ++++++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 80d23ecc12d..47e65472c01 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2832,7 +2832,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, FIXME("unimplemented flags %lx\n", flags & ~2); if(!window || !window->browser) - return E_UNEXPECTED; + return E_FAIL; if(window->browser->doc->hostui) { hres = IDocHostUIHandler_TranslateUrl(window->browser->doc->hostui, 0, url, &translated_url); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8af2de6705c..373cfa03585 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2679,6 +2679,9 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u BSTR display_uri; HRESULT hres; + if(!window->browser) + return E_UNEXPECTED; + if(new_url && base_uri) hres = CoInternetCombineUrlEx(base_uri, new_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &nav_uri, 0); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 56b62aa418c..7d139ccafe1 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -6003,12 +6003,13 @@ static void test_document_close(void) { IHTMLPrivateWindow *priv_window; IHTMLDocument2 *doc, *doc_node; + IHTMLLocation *location; IHTMLDocument3 *doc3; IHTMLElement *elem; DWORD cookie; + BSTR bstr, bstr2; HRESULT hres; VARIANT v; - BSTR bstr; LONG ref; MSG msg; @@ -6091,6 +6092,24 @@ static void test_document_close(void) IHTMLDocument2_Release(doc_node); IHTMLDocument2_Release(doc); + + bstr = SysAllocString(L"about:blank"); + hres = IHTMLWindow2_get_location(window, &location); + ok(hres == S_OK, "get_location failed: %08lx\n", hres); + hres = IHTMLLocation_put_href(location, bstr); + ok(hres == E_UNEXPECTED || broken(hres == E_ABORT), "put_href returned: %08lx\n", hres); + IHTMLLocation_Release(location); + + V_VT(&v) = VT_EMPTY; + bstr2 = SysAllocString(L""); + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLPrivateWindow, (void**)&priv_window); + ok(hres == S_OK, "Could not get IHTMLPrivateWindow) interface: %08lx\n", hres); + hres = IHTMLPrivateWindow_SuperNavigate(priv_window, bstr, bstr2, NULL, NULL, &v, &v, 0); + ok(hres == E_FAIL, "SuperNavigate returned: %08lx\n", hres); + IHTMLPrivateWindow_Release(priv_window); + SysFreeString(bstr2); + SysFreeString(bstr); + IHTMLWindow2_Release(window); window = NULL;

1 0

Nikolay Sivov : d3d10_1/tests: Add some more tests for fx_4_1 blend states.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: wine Branch: master Commit: 9afcf7c8e0c406907f6ce3a9dc9fe3892b8a322d URL: https://gitlab.winehq.org/wine/wine/-/commit/9afcf7c8e0c406907f6ce3a9dc9fe3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 10:38:47 2023 +0200 d3d10_1/tests: Add some more tests for fx_4_1 blend states. --- dlls/d3d10_1/tests/d3d10_1.c | 124 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 107 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 5db4ded0413..75b01c89903 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -779,13 +779,19 @@ BlendState blend_state srcblend[0] = zero; }; +BlendState blend_state2 +{ + blendenable = true; + srcblend = src_color; +}; + BlendState default_blend_state {}; #endif static DWORD fx_4_1_test_blend_state[] = { - 0x43425844, 0x9e1570b0, 0x0ed82fb4, 0x16300839, 0x88b70426, 0x00000001, 0x000002b3, 0x00000001, - 0x00000024, 0x30315846, 0x00000287, 0xfeff1011, 0x00000000, 0x00000000, 0x00000002, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0000010b, 0x00000000, 0x00000000, 0x00000000, 0x00000002, + 0x43425844, 0x93b3fe48, 0xee555ce6, 0xc07d00df, 0x616889d5, 0x00000001, 0x000003d4, 0x00000001, + 0x00000024, 0x30315846, 0x000003a8, 0xfeff1011, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000184, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6e656c42, 0x61745364, 0x04006574, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x62000000, 0x646e656c, 0x6174735f, 0x01006574, 0x04000000, 0x01000000, 0x01000000, 0x04000000, @@ -794,22 +800,32 @@ static DWORD fx_4_1_test_blend_state[] = 0x01000000, 0x04000000, 0x01000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, 0x01000000, 0x02000000, 0x02000000, - 0x01000000, 0x02000000, 0x01000000, 0x64000000, 0x75616665, 0x625f746c, 0x646e656c, 0x6174735f, - 0x2b006574, 0x0f000000, 0x00000000, 0xff000000, 0x10ffffff, 0x25000000, 0x00000000, 0x01000000, - 0x37000000, 0x25000000, 0x01000000, 0x01000000, 0x43000000, 0x25000000, 0x02000000, 0x01000000, - 0x4f000000, 0x25000000, 0x03000000, 0x01000000, 0x5b000000, 0x25000000, 0x04000000, 0x01000000, - 0x67000000, 0x25000000, 0x05000000, 0x01000000, 0x73000000, 0x25000000, 0x06000000, 0x01000000, - 0x7f000000, 0x25000000, 0x07000000, 0x01000000, 0x8b000000, 0x26000000, 0x01000000, 0x01000000, - 0x97000000, 0x26000000, 0x02000000, 0x01000000, 0xa3000000, 0x26000000, 0x03000000, 0x01000000, - 0xaf000000, 0x26000000, 0x04000000, 0x01000000, 0xbb000000, 0x26000000, 0x05000000, 0x01000000, - 0xc7000000, 0x26000000, 0x06000000, 0x01000000, 0xd3000000, 0x26000000, 0x07000000, 0x01000000, - 0xdf000000, 0x26000000, 0x00000000, 0x01000000, 0xeb000000, 0x00000000, 0xf7000000, 0x0f000000, - 0x00000000, 0xff000000, 0x00ffffff, 0x00000000, 0x00000000, + 0x01000000, 0x02000000, 0x01000000, 0x62000000, 0x646e656c, 0x6174735f, 0x00326574, 0x00000001, + 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000003, + 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, + 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000001, + 0x00000002, 0x00000003, 0x61666564, 0x5f746c75, 0x6e656c62, 0x74735f64, 0x00657461, 0x0000002b, + 0x0000000f, 0x00000000, 0xffffffff, 0x00000010, 0x00000025, 0x00000000, 0x00000001, 0x00000037, + 0x00000025, 0x00000001, 0x00000001, 0x00000043, 0x00000025, 0x00000002, 0x00000001, 0x0000004f, + 0x00000025, 0x00000003, 0x00000001, 0x0000005b, 0x00000025, 0x00000004, 0x00000001, 0x00000067, + 0x00000025, 0x00000005, 0x00000001, 0x00000073, 0x00000025, 0x00000006, 0x00000001, 0x0000007f, + 0x00000025, 0x00000007, 0x00000001, 0x0000008b, 0x00000026, 0x00000001, 0x00000001, 0x00000097, + 0x00000026, 0x00000002, 0x00000001, 0x000000a3, 0x00000026, 0x00000003, 0x00000001, 0x000000af, + 0x00000026, 0x00000004, 0x00000001, 0x000000bb, 0x00000026, 0x00000005, 0x00000001, 0x000000c7, + 0x00000026, 0x00000006, 0x00000001, 0x000000d3, 0x00000026, 0x00000007, 0x00000001, 0x000000df, + 0x00000026, 0x00000000, 0x00000001, 0x000000eb, 0x00000000, 0x000000f7, 0x0000000f, 0x00000000, + 0xffffffff, 0x00000009, 0x00000025, 0x00000000, 0x00000001, 0x00000104, 0x00000026, 0x00000000, + 0x00000001, 0x00000110, 0x00000026, 0x00000001, 0x00000001, 0x0000011c, 0x00000026, 0x00000002, + 0x00000001, 0x00000128, 0x00000026, 0x00000003, 0x00000001, 0x00000134, 0x00000026, 0x00000004, + 0x00000001, 0x00000140, 0x00000026, 0x00000005, 0x00000001, 0x0000014c, 0x00000026, 0x00000006, + 0x00000001, 0x00000158, 0x00000026, 0x00000007, 0x00000001, 0x00000164, 0x00000000, 0x00000170, + 0x0000000f, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, }; static void test_fx_4_1_blend_state(void) { ID3D10EffectBlendVariable *blend; + struct device_desc device_desc; ID3D10EffectVariable *v; D3D10_BLEND_DESC1 desc1; ID3D10BlendState1 *bs1; @@ -830,7 +846,11 @@ static void test_fx_4_1_blend_state(void) hr = create_effect(fx_4_1_test_blend_state, 0, device, NULL, &effect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (FAILED(hr)) goto done; + if (FAILED(hr)) + { + ID3D10Device1_Release(device); + return; + } v = effect->lpVtbl->GetVariableByName(effect, "blend_state"); ok(v->lpVtbl->IsValid(v), "Invalid variable.\n"); @@ -942,9 +962,79 @@ static void test_fx_4_1_blend_state(void) ID3D10BlendState1_Release(bs1); ID3D10BlendState_Release(bs); - effect->lpVtbl->Release(effect); + refcount = effect->lpVtbl->Release(effect); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); + + /* Using feature level 10.0 device. */ + device_desc.flags = 0; + device_desc.feature_level = D3D10_FEATURE_LEVEL_10_0; + + device = create_device(&device_desc); + ok(!!device, "Failed to create device.\n"); + + hr = create_effect(fx_4_1_test_blend_state, 0, device, NULL, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + v = effect->lpVtbl->GetVariableByName(effect, "blend_state"); + ok(!v->lpVtbl->IsValid(v), "Unexpected variable.\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "blend_state2"); + ok(v->lpVtbl->IsValid(v), "Unexpected variable.\n"); + blend = v->lpVtbl->AsBlend(v); + ok(blend->lpVtbl->IsValid(blend), "Invalid variable.\n"); + + memset(&desc, 0, sizeof(desc)); + hr = blend->lpVtbl->GetBackingStore(blend, 0, &desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!desc.AlphaToCoverageEnable, "Unexpected value %#x.\n", desc.AlphaToCoverageEnable); + ok(desc.BlendEnable[0], "Unexpected value %#x.\n", desc.BlendEnable[0]); + for (i = 1; i < ARRAY_SIZE(desc.BlendEnable); ++i) + ok(!desc.BlendEnable[i], "Unexpected value[%u] %#x.\n", i, desc.BlendEnable[i]); + ok(desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Unexpected value %u.\n", desc.SrcBlend); + ok(desc.DestBlend == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlend); + ok(desc.BlendOp == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOp); + ok(desc.SrcBlendAlpha == D3D10_BLEND_ONE, "Unexpected value %u.\n", desc.SrcBlendAlpha); + ok(desc.DestBlendAlpha == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlendAlpha); + ok(desc.BlendOpAlpha == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOpAlpha); + for (i = 0; i < ARRAY_SIZE(desc.RenderTargetWriteMask); ++i) + ok(desc.RenderTargetWriteMask[i] == D3D10_COLOR_WRITE_ENABLE_ALL, "Unexpected value[%u] %#x.\n", + i, desc.RenderTargetWriteMask[i]); + + /* Default state. */ + v = effect->lpVtbl->GetVariableByName(effect, "default_blend_state"); + ok(v->lpVtbl->IsValid(v), "Invalid variable.\n"); + blend = v->lpVtbl->AsBlend(v); + ok(blend->lpVtbl->IsValid(blend), "Invalid variable.\n"); + + memset(&desc, 0, sizeof(desc)); + hr = blend->lpVtbl->GetBackingStore(blend, 0, &desc); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!desc.AlphaToCoverageEnable, "Unexpected value %#x.\n", desc1.AlphaToCoverageEnable); + for (i = 0; i < ARRAY_SIZE(desc.BlendEnable); ++i) + ok(!desc.BlendEnable[i], "Unexpected value[%u] %#x.\n", i, desc.BlendEnable[i]); + ok(desc.SrcBlend == D3D10_BLEND_ONE, "Unexpected value %u.\n", desc.SrcBlend); + ok(desc.DestBlend == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlend); + ok(desc.BlendOp == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOp); + ok(desc.SrcBlendAlpha == D3D10_BLEND_ONE, "Unexpected value %u.\n", desc.SrcBlendAlpha); + ok(desc.DestBlendAlpha == D3D10_BLEND_ZERO, "Unexpected value %u.\n", desc.DestBlendAlpha); + ok(desc.BlendOpAlpha == D3D10_BLEND_OP_ADD, "Unexpected value %u.\n", desc.BlendOpAlpha); + for (i = 0; i < ARRAY_SIZE(desc.RenderTargetWriteMask); ++i) + ok(desc.RenderTargetWriteMask[i] == D3D10_COLOR_WRITE_ENABLE_ALL, "Unexpected value[%u] %#x.\n", + i, desc.RenderTargetWriteMask[i]); + + hr = blend->lpVtbl->GetBlendState(blend, 0, &bs); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID3D10BlendState_QueryInterface(bs, &IID_ID3D10BlendState1, (void **)&bs1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D10BlendState1_Release(bs1); + ID3D10BlendState_Release(bs); + + refcount = effect->lpVtbl->Release(effect); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); -done: refcount = ID3D10Device1_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Connor McAdams : uiautomationcore: Don't return failure from ::get_FragmentRoot stub on the default BaseHwnd provider.
by Alexandre Julliard Oct. 20, 2023

Oct. 20, 2023

Module: wine Branch: master Commit: 4863992e84502812a099fe1f423758b9f53c6cc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4863992e84502812a099fe1f423758… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 26 12:18:58 2023 -0400 uiautomationcore: Don't return failure from ::get_FragmentRoot stub on the default BaseHwnd provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 917d21d8a82..4ecef2a4752 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1897,7 +1897,7 @@ static HRESULT WINAPI base_hwnd_fragment_get_FragmentRoot(IRawElementProviderFra { FIXME("%p, %p: stub!\n", iface, ret_val); *ret_val = NULL; - return E_NOTIMPL; + return S_OK; } static const IRawElementProviderFragmentVtbl base_hwnd_fragment_vtbl = {

1 0