wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Huw Davies : iphlpapi: Mark non-loopback, non-linklocal addresses as dns eligible.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: fade7a5862a31d26c7368818824cce6c4988a1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fade7a5862a31d26c7368818… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 9 10:06:27 2021 +0100 iphlpapi: Mark non-loopback, non-linklocal addresses as dns eligible. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dbe4a12afe8..22e17e06757 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1036,6 +1036,37 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } +static BOOL sockaddr_is_loopback( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET) + { + SOCKADDR_IN *sin = (SOCKADDR_IN *)sock; + return (sin->sin_addr.WS_s_addr & 0xff) == 127; + } + else if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL sockaddr_is_linklocal( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL unicast_is_dns_eligible( IP_ADAPTER_UNICAST_ADDRESS *uni ) +{ + return !sockaddr_is_loopback( uni->Address.lpSockaddr ) && + !sockaddr_is_linklocal( uni->Address.lpSockaddr ); +} + static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) { /* Actually this information should be read somewhere from the system @@ -1059,6 +1090,8 @@ static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ ua->ValidLifetime = 60000; ua->PreferredLifetime = 60000; ua->LeaseLifetime = 60000; + + if (unicast_is_dns_eligible( ua )) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; } static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, @@ -1186,8 +1219,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - if (num_v4_gateways) - ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET;

1 0

Huw Davies : iphlpapi: Rewrite GetAdaptersAddresses() to first alloc and then copy the info.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: 3bace8862f1b49e40574d1c9647e6984f10d026f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bace8862f1b49e40574d1c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 9 10:06:26 2021 +0100 iphlpapi: Rewrite GetAdaptersAddresses() to first alloc and then copy the info. This refractoring is necessary to simplify implementing it on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 502 +++++++++++++++++++++++++----------------- 1 file changed, 300 insertions(+), 202 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bace8862f1b49e40574…

1 0

Huw Davies : dnsapi: Return ERROR_MORE_DATA on insufficient buffer.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: 734de3bef82ff5456b27cca663f9e91e939f0c29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=734de3bef82ff5456b27cca6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 9 10:06:25 2021 +0100 dnsapi: Return ERROR_MORE_DATA on insufficient buffer. This was already done correctly in the res_getservers() case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/tests/query.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 7e545cf36fb..864c517333d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -414,7 +414,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW if (!addrs || *len < needed) { *len = needed; - return !addrs ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; } *len = needed; memset( addrs, 0, needed ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 5fb47d89782..e691822a46a 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -155,6 +155,10 @@ static void test_DnsQueryConfig( void ) err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, NULL, &size ); if (err) continue; ipv4 = malloc( size ); + size--; + err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + size++; err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); ok( !err, "got %d\n", err );

1 0

Zhiyi Zhang : uxtheme: Fix a typo in comment.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: 6414726f579989b314600461665223a64fed49de URL: https://source.winehq.org/git/wine.git/?a=commit;h=6414726f579989b314600461… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 9 15:03:10 2021 +0800 uxtheme: Fix a typo in comment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 8c3c4ae2218..b8196b09966 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -523,7 +523,7 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, } /*********************************************************************** - * UXTHEME_DrawImageGlyph + * UXTHEME_DrawGlyph * * Draw glyph on top of background, if appropriate */

1 0

Zhiyi Zhang : user32: Load uxtheme when theming is active.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: eedad8a8eec0c0d817d463241c1d3fc4e7ecce86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eedad8a8eec0c0d817d46324… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 9 15:00:19 2021 +0800 user32: Load uxtheme when theming is active. In comctl32 DllMain(), IsThemeActive() is a delay-loaded function and shouldn't be called in DllMain(). Instead, tests showed that uxtheme should be loaded by user32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51540 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/commctrl.c | 3 --- dlls/user32/class.c | 16 ++++++++++++++++ dlls/user32/tests/class.c | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1c7718e2400..b457bdcb8be 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -208,9 +208,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACKBAR_Register (); TREEVIEW_Register (); UPDOWN_Register (); - - /* Call IsThemeActive() so that delay-loaded uxtheme.dll is loaded for hooking user32 */ - IsThemeActive(); break; case DLL_PROCESS_DETACH: diff --git a/dlls/user32/class.c b/dlls/user32/class.c index c17a612c5b9..cef52883988 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -539,6 +539,19 @@ static void register_builtin( const struct builtin_class_descr *descr ) release_class_ptr( classPtr ); } +static void load_uxtheme(void) +{ + BOOL (WINAPI * pIsThemeActive)(void); + HMODULE uxtheme; + + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + if (!pIsThemeActive || !pIsThemeActive()) + FreeLibrary(uxtheme); + } +} /*********************************************************************** * register_builtins @@ -557,6 +570,9 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); register_builtin( &IME_builtin_class ); + + /* Load uxtheme.dll so that standard scrollbars and dialogs are hooked for theming support */ + load_uxtheme(); return TRUE; } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 0f4fd1cf90e..e6762032107 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1511,6 +1511,7 @@ static void test_uxtheme(void) dll_loaded = !!GetModuleHandleA("comctl32.dll"); ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + todo_wine_if(dll_loaded) ok(!dll_loaded, "Expected uxtheme.dll not loaded.\n"); /* Creating a window triggers uxtheme load when theming is active */ @@ -1531,7 +1532,6 @@ static void test_uxtheme(void) is_theme_active = pIsThemeActive(); FreeLibrary(uxtheme); - todo_wine_if(is_theme_active) ok(dll_loaded == is_theme_active, "Expected uxtheme %s when theming is %s.\n", is_theme_active ? "loaded" : "not loaded", is_theme_active ? "active" : "inactive");

1 0

Zhiyi Zhang : user32/tests: Test that user32 loads uxtheme.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: cbf7bdce2877645fa2c5c847f48f6a4ffcaeef03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf7bdce2877645fa2c5c847… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 9 15:00:06 2021 +0800 user32/tests: Test that user32 loads uxtheme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 94dd8105a50..0f4fd1cf90e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1490,6 +1490,55 @@ static void test_actctx_classes(void) ReleaseActCtx(context); } +static void test_uxtheme(void) +{ + static const CHAR *class_name = "test_uxtheme_class"; + BOOL (WINAPI * pIsThemeActive)(void); + BOOL dll_loaded, is_theme_active; + WNDCLASSEXA class; + HMODULE uxtheme; + ATOM atom; + HWND hwnd; + + memset(&class, 0, sizeof(class)); + class.cbSize = sizeof(class); + class.lpfnWndProc = DefWindowProcA; + class.hInstance = GetModuleHandleA(NULL); + class.lpszClassName = class_name; + atom = RegisterClassExA(&class); + ok(atom, "RegisterClassExA failed, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + ok(!dll_loaded, "Expected uxtheme.dll not loaded.\n"); + + /* Creating a window triggers uxtheme load when theming is active */ + hwnd = CreateWindowA(class_name, "Test", WS_POPUP, 0, 0, 1, 1, NULL, NULL, + GetModuleHandleA(NULL), NULL); + ok(!!hwnd, "Failed to create a test window, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + + /* Uxtheme is loaded when theming is active */ + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + + uxtheme = LoadLibraryA("uxtheme.dll"); + ok(!!uxtheme, "Failed to load uxtheme.dll, error %u.\n", GetLastError()); + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %u.\n", GetLastError()); + is_theme_active = pIsThemeActive(); + FreeLibrary(uxtheme); + + todo_wine_if(is_theme_active) + ok(dll_loaded == is_theme_active, "Expected uxtheme %s when theming is %s.\n", + is_theme_active ? "loaded" : "not loaded", is_theme_active ? "active" : "inactive"); + + DestroyWindow(hwnd); + UnregisterClassA(class_name, GetModuleHandleA(NULL)); +} + START_TEST(class) { char **argv; @@ -1502,6 +1551,7 @@ START_TEST(class) return; } + test_uxtheme(); test_IME(); test_GetClassInfo(); test_extra_values();

1 0

Esme Povirk : mscoree: Only override Microsoft.Xna.Framework version 4.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: 78108f7411e19f2b4d6af2755f2127a620069f0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78108f7411e19f2b4d6af275… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Aug 8 09:32:34 2021 -0500 mscoree: Only override Microsoft.Xna.Framework version 4. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index acefb2887ca..b3816600214 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -89,6 +89,7 @@ MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname); const char* (CDECL *mono_assembly_name_get_culture)(MonoAssemblyName *aname); +WORD (CDECL *mono_assembly_name_get_version)(MonoAssemblyName *aname, WORD *minor, WORD *build, WORD *revision); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); @@ -199,6 +200,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_name_get_name); LOAD_MONO_FUNCTION(mono_assembly_name_get_culture); + LOAD_MONO_FUNCTION(mono_assembly_name_get_version); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); @@ -1553,8 +1555,9 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a return reg_entry.flags; } - if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0) - /* XNA redist is broken in Wine Mono, use FNA instead. */ + if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0 && + mono_assembly_name_get_version(aname, NULL, NULL, NULL) == 4) + /* Use FNA as a replacement for XNA4. */ return 0; return ASSEMBLY_SEARCH_UNDEFINED;

1 0

Piotr Caban : msvcrt: Fix x87 FPU status register assignment detection.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: wine Branch: master Commit: 62d2693701c1756264fdf975578cb7f6abd5c1b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d2693701c1756264fdf975… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 9 00:28:08 2021 +0200 msvcrt: Fix x87 FPU status register assignment detection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51568 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51579 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bb450fad01c..efdde8e4afb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -35,6 +35,7 @@ * ==================================================== */ +#include <assert.h> #include <complex.h> #include <stdio.h> #include <fenv.h> @@ -5321,7 +5322,7 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, if (*cw & _IC_AFFINE) newcw |= 0x1000; } - if (oldsw != newsw && newsw) + if (oldsw != newsw && (newsw & 0x3f)) { struct { WORD control_word; @@ -5338,6 +5339,8 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, WORD unused5; } fenv; + assert(cw); + __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); fenv.control_word = newcw; fenv.status_word = newsw;

1 0

Conor McCarthy : vkd3d-shader: Implement DFMA instruction.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: vkd3d Branch: master Commit: 242261bc5238f6be27ccde646349dc4f1d2bc3be URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=242261bc5238f6be27ccde6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 10 01:12:31 2021 +1000 vkd3d-shader: Implement DFMA instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f9be52d..de55d78 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -809,6 +809,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, + {VKD3D_SM5_OP_DFMA, VKD3DSIH_DFMA, "d", "ddd"}, }; static const enum vkd3d_shader_register_type register_type_table[] = diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index c9a389e..d9f6189 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -328,6 +328,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, + VKD3D_SM5_OP_DFMA = 0xd3, }; enum vkd3d_sm4_instruction_modifier diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1b0051e..08709e4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6843,6 +6843,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( } glsl_insts[] = { + {VKD3DSIH_DFMA, GLSLstd450Fma}, {VKD3DSIH_DMAX, GLSLstd450NMax}, {VKD3DSIH_DMIN, GLSLstd450NMin}, {VKD3DSIH_EXP, GLSLstd450Exp2}, @@ -9534,6 +9535,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_XOR: vkd3d_dxbc_compiler_emit_alu_instruction(compiler, instruction); break; + case VKD3DSIH_DFMA: case VKD3DSIH_DMAX: case VKD3DSIH_DMIN: case VKD3DSIH_EXP: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b0a2298..d0aaa0f 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFB */ "defb", /* VKD3DSIH_DEFI */ "defi", /* VKD3DSIH_DEQ */ "deq", + /* VKD3DSIH_DFMA */ "dfma", /* VKD3DSIH_DGE */ "dge", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DLT */ "dlt", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f3aadfc..b64c4b1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -194,6 +194,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFB, VKD3DSIH_DEFI, VKD3DSIH_DEQ, + VKD3DSIH_DFMA, VKD3DSIH_DGE, VKD3DSIH_DIV, VKD3DSIH_DLT, diff --git a/tests/d3d12.c b/tests/d3d12.c index 9854af3..aaf4bfc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9960,7 +9960,7 @@ static void test_shader_instructions(void) {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true}, {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true}, {&ps_dfma, {.d = {{1.0000002433080226, 2.000000481493771}}}, - {.d = {1.0000002433080226 * 2.000000481493771 + 1.0000002433080226}}, true, true}, + {.d = {1.0000002433080226 * 2.000000481493771 + 1.0000002433080226}}, true}, {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true}, {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true}, {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true},

1 0

Conor McCarthy : tests: Add a test for the shader DFMA instruction.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: vkd3d Branch: master Commit: ca82a379f51a38e9545abaf2ed8b864fe270980b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ca82a379f51a38e9545abaf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 10 01:12:30 2021 +1000 tests: Add a test for the shader DFMA instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 12dab50..9854af3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9157,6 +9157,29 @@ static void test_shader_instructions(void) 0x30494653, 0x00000008, 0x00000001, 0x00000000, }; static struct named_shader ps_dmin_dmax = {"dmin_dmax", ps_dmin_dmax_code, sizeof(ps_dmin_dmax_code)}; + static const DWORD ps_dfma_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(fma(src0.x, src0.y, 1.0000002433080226l), dst.x, dst.y); + dst.zw = 0; + } +#endif + 0x43425844, 0xde5b55c7, 0x2660b48d, 0x52b1761e, 0x50319c4d, 0x00000001, 0x0000012c, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x0000011c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a0, 0x00000050, + 0x00000028, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x0e0000d3, 0x00100032, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x00005002, 0x41500000, 0x3ff00000, 0x00000000, + 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000021, 0x00000000, + }; + static struct named_shader ps_dfma = {"dfma", ps_dfma_code, sizeof(ps_dfma_code)}; static const DWORD ps_dmovc_code[] = { #if 0 @@ -9936,6 +9959,8 @@ static void test_shader_instructions(void) {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true}, {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true}, {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true}, + {&ps_dfma, {.d = {{1.0000002433080226, 2.000000481493771}}}, + {.d = {1.0000002433080226 * 2.000000481493771 + 1.0000002433080226}}, true, true}, {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true}, {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true}, {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true},

1 0

Jump to page:

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-commits August 2021