wine-commits May 2024

wine-commits@winehq.org

1 participants
705 discussions

Alexandre Julliard : kernelbase: Fix the name of the default system locale.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: b9638ebc1c32a8828ec1c2f5dc156ef0bb9c3106 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9638ebc1c32a8828ec1c2f5dc156e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:13:11 2024 +0200 kernelbase: Fix the name of the default system locale. --- dlls/kernel32/tests/locale.c | 19 +++++++++++++------ dlls/kernelbase/locale.c | 9 +++++++++ include/winnls.h | 4 ++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bebd857dfa4..5760d7c9eb1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2964,9 +2964,9 @@ static void test_LocaleNameToLCID(void) buffer[0] = 0; SetLastError(0xdeadbeef); - lcid = pLocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); - ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected lcid == 0, got %08lx, error %ld\n", lcid, GetLastError()); + lcid = LocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); + ok(lcid == GetSystemDefaultLCID(), + "Expected lcid == %08lx, got %08lx, error %ld\n", GetSystemDefaultLCID(), lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); ok(ret > 0, "Expected ret > 0, got %d, error %ld\n", ret, GetLastError()); trace("%08lx, %s\n", lcid, wine_dbgstr_w(buffer)); @@ -5817,10 +5817,9 @@ static void test_ResolveLocaleName(void) { L"zz+XX", NULL }, { L"zz.XX", NULL }, { LOCALE_NAME_INVARIANT, L"" }, - { LOCALE_NAME_SYSTEM_DEFAULT, NULL }, }; INT i, ret; - WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH], system[LOCALE_NAME_MAX_LENGTH]; if (!pResolveLocaleName) { @@ -5831,7 +5830,7 @@ static void test_ResolveLocaleName(void) { SetLastError( 0xdeadbeef ); memset( buffer, 0xcc, sizeof(buffer) ); - ret = pResolveLocaleName( tests[i].name, buffer, sizeof(buffer) ); + ret = pResolveLocaleName( tests[i].name, buffer, ARRAY_SIZE(buffer) ); if (tests[i].exp) { ok( !wcscmp( buffer, tests[i].exp ) || broken( tests[i].broken ), @@ -5847,6 +5846,14 @@ static void test_ResolveLocaleName(void) "%s: wrong error %lu\n", debugstr_w(tests[i].name), GetLastError() ); } } + SetLastError( 0xdeadbeef ); + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pResolveLocaleName( LOCALE_NAME_SYSTEM_DEFAULT, buffer, ARRAY_SIZE(buffer) ); + ok( ret, "failed err %lu\n", GetLastError() ); + GetSystemDefaultLocaleName( system, ARRAY_SIZE(system) ); + ok( !wcscmp( buffer, system ), "got wrong syslocale %s / %s\n", debugstr_w(buffer), debugstr_w(system)); + ok( ret == wcslen(system) + 1, "wrong len %u / %Iu\n", ret, wcslen(system) + 1 ); + SetLastError( 0xdeadbeef ); ret = pResolveLocaleName( L"en-US", buffer, 4 ); ok( !ret, "got %u\n", ret ); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 44af29f163d..568f34d8979 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -648,6 +648,11 @@ static const NLS_LOCALE_DATA *get_locale_by_name( const WCHAR *name, LCID *lcid *lcid = user_lcid; return user_locale; } + if (name[0] == '!' && !compare_locale_names( name, LOCALE_NAME_SYSTEM_DEFAULT )) + { + *lcid = system_lcid; + return system_locale; + } if (!(entry = find_lcname_entry( name ))) return NULL; *lcid = entry->id; return get_locale_data( entry->idx ); @@ -671,6 +676,10 @@ static const struct sortguid *get_language_sort( const WCHAR *name ) if (current_locale_sort) return current_locale_sort; name = locale_strings + user_locale->sname + 1; } + else if (name[0] == '!' && !compare_locale_names( name, LOCALE_NAME_SYSTEM_DEFAULT )) + { + name = locale_strings + system_locale->sname + 1; + } if (!(entry = find_lcname_entry( name ))) { diff --git a/include/winnls.h b/include/winnls.h index 872fdcc3406..185a02a6bc4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -336,9 +336,9 @@ static const WCHAR LOCALE_NAME_INVARIANT[] = { 0 }; #endif #if defined(_MSC_VER) || defined(__MINGW32__) -# define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale" +# define LOCALE_NAME_SYSTEM_DEFAULT L"!x-sys-default-locale" #else -static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; +static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','x','-','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; #endif #define LOCALE_NAME_USER_DEFAULT NULL

1 0

Alistair Leslie-Hughes : include: Add C++ support for IUnknown.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 77583eed19e63221b0a3821f1956c7055f9a31c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/77583eed19e63221b0a3821f1956c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 17:41:26 2024 +1000 include: Add C++ support for IUnknown. --- include/unknwn.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/unknwn.idl b/include/unknwn.idl index 7856a7f5047..0798ccf79ab 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -39,12 +39,35 @@ interface IUnknown { typedef [unique] IUnknown *LPUNKNOWN; +cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE)") +cpp_quote("EXTERN_C const IID IID_IUnknown;") +cpp_quote("extern \"C++\"") +cpp_quote("{") +cpp_quote(" MIDL_INTERFACE(\"00000000-0000-0000-c000-000000000046\")") +cpp_quote(" IUnknown") +cpp_quote(" {") +cpp_quote(" public:") +cpp_quote(" BEGIN_INTERFACE") +cpp_quote(" virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) = 0;") +cpp_quote(" virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;") +cpp_quote(" virtual ULONG STDMETHODCALLTYPE Release(void) = 0;") + +cpp_quote(" template<class iface>") +cpp_quote(" HRESULT STDMETHODCALLTYPE QueryInterface(iface** pp)") +cpp_quote(" {") +cpp_quote(" return QueryInterface(__uuidof(iface), (void **)pp);") +cpp_quote(" }") +cpp_quote(" END_INTERFACE") +cpp_quote(" };") +cpp_quote("}") +cpp_quote("#else") HRESULT QueryInterface( [in] REFIID riid, [out, iid_is(riid)] void **ppvObject); ULONG AddRef(); ULONG Release(); } +cpp_quote("#endif") cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown* This, REFIID riid, void **ppvObject);") cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,")

1 0

Alistair Leslie-Hughes : include: Complete __wine_uuidof for C++.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 5813a1fe23d859f1c77a087b283562d1026ba94f URL: https://gitlab.winehq.org/wine/wine/-/commit/5813a1fe23d859f1c77a087b283562… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 17:41:26 2024 +1000 include: Complete __wine_uuidof for C++. /usr/local/include/wine/windows/guiddef.h:83:68: error: incomplete type ‘__wine_uuidof_type<IUnknown>::inst’ {aka ‘__wine_uuidof<IUnknown>’} used in nested name specifier 83 | #define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid --- include/guiddef.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index c5ba9635b89..0837ed34ad7 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -56,8 +56,9 @@ typedef struct _GUID #ifdef __WINE_UUID_ATTR extern "C++" { - template<typename T> struct __wine_uuidof; - + template<typename T> struct __wine_uuidof { + static const GUID uuid; + }; template<typename T> struct __wine_uuidof_type { typedef __wine_uuidof<T> inst; };

1 0

Nikolay Sivov : vkd3d-shader: Remove explicit newlines from hlsl_fixme() messages.
by Alexandre Julliard 23 May '24

23 May '24

Module: vkd3d Branch: master Commit: f090d1e80d8b6617b71f25dd422665b44759f3d0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f090d1e80d8b6617b71f25dd42266… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 23 00:57:32 2024 +0200 vkd3d-shader: Remove explicit newlines from hlsl_fixme() messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 8 ++++---- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index f33146e3..bfd5b52b 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2051,7 +2051,7 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b case HLSL_TYPE_BOOL: /* Casts to bool should have already been lowered. */ default: - hlsl_fixme(ctx, &expr->node.loc, "SM1 cast from %s to %s.\n", + hlsl_fixme(ctx, &expr->node.loc, "SM1 cast from %s to %s.", debug_hlsl_type(ctx, src_type), debug_hlsl_type(ctx, dst_type)); break; } @@ -2459,7 +2459,7 @@ static void write_sm1_jump(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } default: - hlsl_fixme(ctx, &jump->node.loc, "Jump type %s.\n", hlsl_jump_type_to_string(jump->type)); + hlsl_fixme(ctx, &jump->node.loc, "Jump type %s.", hlsl_jump_type_to_string(jump->type)); } } @@ -2547,7 +2547,7 @@ static void write_sm1_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ break; default: - hlsl_fixme(ctx, &instr->loc, "Resource load type %u\n", load->load_type); + hlsl_fixme(ctx, &instr->loc, "Resource load type %u.", load->load_type); return; } @@ -2579,7 +2579,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * if (store->lhs.var->data_type->class == HLSL_CLASS_MATRIX) { - hlsl_fixme(ctx, &instr->loc, "Lower matrix writemasks.\n"); + hlsl_fixme(ctx, &instr->loc, "Lower matrix writemasks."); return; } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 27f16af5..bdb72a1f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2988,7 +2988,7 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru if (cond->data_type->class > HLSL_CLASS_VECTOR || instr->data_type->class > HLSL_CLASS_VECTOR) { - hlsl_fixme(ctx, &instr->loc, "Lower ternary of type other than scalar or vector.\n"); + hlsl_fixme(ctx, &instr->loc, "Lower ternary of type other than scalar or vector."); return false; }

1 0

Henri Verbeet : vkd3d-shader: Use a separate allocation for the "semantic_name" field of shader signature elements.
by Alexandre Julliard 23 May '24

23 May '24

Module: vkd3d Branch: master Commit: b5ac6ac636ec3594d8c440c6a789b0e3204d2d49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b5ac6ac636ec3594d8c440c6a789b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 21 20:11:26 2024 +0200 vkd3d-shader: Use a separate allocation for the "semantic_name" field of shader signature elements. For tpf shader this would previously be a pointer into the original shader code, and for d3dbc shaders we'd use static strings. Unfortunately the dxil parser creates shader signatures where these are pointers to metadata strings, and those go away when we call sm6_parser_cleanup(). We could conceivably store a flag in the shader signature to indicate whether shader_signature_cleanup()/vkd3d_shader_free_shader_signature() should free the "semantic_name" field. It'd be a little ugly, and seems unlikely to be worth it, but I'd be willing to be convinced. --- libs/vkd3d-shader/d3dbc.c | 3 ++- libs/vkd3d-shader/dxbc.c | 10 ++++++++-- libs/vkd3d-shader/dxil.c | 17 ++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 18 +++++++++++++++++- 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 58f830dd..f33146e3 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -559,7 +559,8 @@ static bool add_signature_element(struct vkd3d_shader_sm1_parser *sm1, bool outp element = &signature->elements[signature->element_count++]; memset(element, 0, sizeof(*element)); - element->semantic_name = name; + if (!(element->semantic_name = vkd3d_strdup(name))) + return false; element->semantic_index = index; element->sysval_semantic = sysval; element->component_type = VKD3D_SHADER_COMPONENT_FLOAT; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 8a1012d9..4b9f6723 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -360,7 +360,7 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s uint32_t count, header_size; struct signature_element *e; const char *ptr = data; - unsigned int i; + unsigned int i, j; if (!require_space(0, 2, sizeof(uint32_t), section->data.size)) { @@ -403,6 +403,7 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s for (i = 0; i < count; ++i) { size_t name_offset; + const char *name; uint32_t mask; e[i].sort_index = i; @@ -413,9 +414,14 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s e[i].stream_index = 0; name_offset = read_u32(&ptr); - if (!(e[i].semantic_name = shader_get_string(data, section->data.size, name_offset))) + if (!(name = shader_get_string(data, section->data.size, name_offset)) + || !(e[i].semantic_name = vkd3d_strdup(name))) { WARN("Invalid name offset %#zx (data size %#zx).\n", name_offset, section->data.size); + for (j = 0; j < i; ++j) + { + vkd3d_free((void *)e[j].semantic_name); + } vkd3d_free(e); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4943a586..73a8d868 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -9445,7 +9445,22 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const } } - vkd3d_free(s->elements); + for (i = 0; i < operand_count; ++i) + { + if ((elements[i].semantic_name = vkd3d_strdup(elements[i].semantic_name))) + continue; + + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Failed to allocate signature element semantic name."); + for (j = 0; j < i; ++j) + { + vkd3d_free((void *)elements[j].semantic_name); + } + vkd3d_free(elements); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + shader_signature_cleanup(s); s->elements = elements; s->element_count = operand_count; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 27a88a12..cee7a296 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -657,7 +657,15 @@ static bool vkd3d_shader_signature_from_shader_signature(struct vkd3d_shader_sig struct vkd3d_shader_signature_element *d = &signature->elements[i]; struct signature_element *e = &src->elements[i]; - d->semantic_name = e->semantic_name; + if (!(d->semantic_name = vkd3d_strdup(e->semantic_name))) + { + for (unsigned int j = 0; j < i; ++j) + { + vkd3d_free((void *)signature->elements[j].semantic_name); + } + vkd3d_free(signature->elements); + return false; + } d->semantic_index = e->semantic_index; d->stream_index = e->stream_index; d->sysval_semantic = e->sysval_semantic; @@ -1763,6 +1771,10 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu void shader_signature_cleanup(struct shader_signature *signature) { + for (unsigned int i = 0; i < signature->element_count; ++i) + { + vkd3d_free((void *)signature->elements[i].semantic_name); + } vkd3d_free(signature->elements); signature->elements = NULL; } @@ -1820,6 +1832,10 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature { TRACE("signature %p.\n", signature); + for (unsigned int i = 0; i < signature->element_count; ++i) + { + vkd3d_free((void *)signature->elements[i].semantic_name); + } vkd3d_free(signature->elements); signature->elements = NULL; }

1 0

Alexandre Julliard : wbemprox: Avoid unused function warning.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: badaed641928edb8f2426d9f12d16c88b479e1e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/badaed641928edb8f2426d9f12d16c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 18:20:17 2024 +0200 wbemprox: Avoid unused function warning. --- dlls/wbemprox/wql.y | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index ba33396ddeb..541cd2450f0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -299,6 +299,7 @@ associatorsof: } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + (void)yysymbol_name; /* avoid unused function warning */ } | TK_ASSOCIATORS TK_OF path TK_WHERE keywordlist {

1 0

Jacek Caban : ddraw: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: eca2e8bf6cd99e0daffd0b49a852e86adaa13417 URL: https://gitlab.winehq.org/wine/wine/-/commit/eca2e8bf6cd99e0daffd0b49a852e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:25:37 2024 +0200 ddraw: Use GNU assembly syntax on clang x86_64 MSVC target. --- dlls/ddraw/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index eb1ad90ee0f..896eea68f14 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -42,10 +42,10 @@ const GUID IID_D3DDEVICE_WineD3D = { static inline void set_fpu_control_word(WORD fpucw) { -#if defined(__i386__) && defined(__GNUC__) - __asm__ volatile ("fldcw %0" : : "m" (fpucw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) __asm fldcw fpucw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + __asm__ volatile ("fldcw %0" : : "m" (fpucw)); #endif } @@ -53,10 +53,10 @@ static inline WORD d3d_fpu_setup(void) { WORD oldcw; -#if defined(__i386__) && defined(__GNUC__) - __asm__ volatile ("fnstcw %0" : "=m" (oldcw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) __asm fnstcw oldcw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + __asm__ volatile ("fnstcw %0" : "=m" (oldcw)); #else static BOOL warned = FALSE; if(!warned)

1 0

Jacek Caban : d3d8: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: fe6801930e3549fdeae72f7b061bff78d0ca8a36 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe6801930e3549fdeae72f7b061bff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:23:41 2024 +0200 d3d8: Use GNU assembly syntax on clang x86_64 MSVC target. --- dlls/d3d8/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9be6436f8b4..401677e8261 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3649,16 +3649,16 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = static void setup_fpu(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - WORD cw; - __asm__ volatile ("fnstcw %0" : "=m" (cw)); - cw = (cw & ~0xf3f) | 0x3f; - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) WORD cw; __asm fnstcw cw; cw = (cw & ~0xf3f) | 0x3f; __asm fldcw cw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + WORD cw; + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); #else FIXME("FPU setup not implemented for this platform.\n"); #endif

1 0

Jacek Caban : d3d9: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 920804604836433004ebac198068635360752d57 URL: https://gitlab.winehq.org/wine/wine/-/commit/920804604836433004ebac19806863… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:23:10 2024 +0200 d3d9: Use GNU assembly syntax on clang x86_64 MSVC target. --- dlls/d3d9/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 31dffbf4b60..c3cecc4e27f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4614,16 +4614,16 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = static void setup_fpu(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - WORD cw; - __asm__ volatile ("fnstcw %0" : "=m" (cw)); - cw = (cw & ~0xf3f) | 0x3f; - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) WORD cw; __asm fnstcw cw; cw = (cw & ~0xf3f) | 0x3f; __asm fldcw cw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + WORD cw; + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); #else FIXME("FPU setup not implemented for this platform.\n"); #endif

1 0

Jacek Caban : d3d8/tests: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: e972f3369d55334923a86ba9c71edef35922d670 URL: https://gitlab.winehq.org/wine/wine/-/commit/e972f3369d55334923a86ba9c71ede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:19:59 2024 +0200 d3d8/tests: Use GNU assembly syntax on clang x86_64 MSVC target. Also fix unused dummy_object_vtbl variable warnings on targets skipping the test. --- dlls/d3d8/tests/device.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 108895e4d02..8261a3139c5 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3701,28 +3701,34 @@ done: UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); } +static const GUID d3d8_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + +#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + static inline void set_fpu_cw(WORD cw) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D8_TEST_SET_FPU_CW 1 - __asm__ volatile ("fnclex"); - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D8_TEST_SET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnclex; __asm fldcw cw; +#else + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); #endif } static inline WORD get_fpu_cw(void) { WORD cw = 0; -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D8_TEST_GET_FPU_CW 1 - __asm__ volatile ("fnstcw %0" : "=m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D8_TEST_GET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnstcw cw; +#else + __asm__ volatile ("fnstcw %0" : "=m" (cw)); #endif return cw; } @@ -3759,17 +3765,8 @@ static const IUnknownVtbl dummy_object_vtbl = dummy_object_Release, }; -static const GUID d3d8_private_data_test_guid = -{ - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} -}; - static void test_fpu_setup(void) { -#if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) struct device_desc device_desc; IDirect3DDevice8 *device; IDirect3D8 *d3d8; @@ -3869,9 +3866,16 @@ static void test_fpu_setup(void) done: DestroyWindow(window); IDirect3D8_Release(d3d8); -#endif } +#else + +static void test_fpu_setup(void) +{ +} + +#endif + static void test_ApplyStateBlock(void) { IDirect3DDevice8 *device;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
71
Older →

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 May 2024