November 2023 - Wine-commits

Alistair Leslie-Hughes : uiribbon: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: fc99a18a88dcbd1066a3b5d8ffaba3654ae4cce6 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc99a18a88dcbd1066a3b5d8ffaba3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 uiribbon: Remove DECLSPEC_HIDDEN usage. --- dlls/uiribbon/uiribbon_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiribbon/uiribbon_private.h b/dlls/uiribbon/uiribbon_private.h index 9d7481533d0..c5b2d76b938 100644 --- a/dlls/uiribbon/uiribbon_private.h +++ b/dlls/uiribbon/uiribbon_private.h @@ -26,7 +26,7 @@ typedef struct { LONG ref; } UIRibbonFrameworkImpl; -HRESULT UIRibbonFrameworkImpl_Create(IUnknown *pUnkOuter, void **ppObj) DECLSPEC_HIDDEN; +HRESULT UIRibbonFrameworkImpl_Create(IUnknown *pUnkOuter, void **ppObj); #endif /* __UIRIBBON_PRIVATE_INCLUDED__ */

1 0

Alistair Leslie-Hughes : itss: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: ee211f34c6e2555bf94d1aaa024bcc168e4c3d12 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee211f34c6e2555bf94d1aaa024bcc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 itss: Remove DECLSPEC_HIDDEN usage. --- dlls/itss/chm_lib.h | 24 ++++++++---------------- dlls/itss/itsstor.h | 10 ++++------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/itss/chm_lib.h b/dlls/itss/chm_lib.h index 23b51bd6d9d..45b18af3070 100644 --- a/dlls/itss/chm_lib.h +++ b/dlls/itss/chm_lib.h @@ -72,25 +72,20 @@ struct chmUnitInfo WCHAR path[CHM_MAX_PATHLEN+1]; }; -struct chmFile* chm_openW(const WCHAR *filename) DECLSPEC_HIDDEN; -struct chmFile *chm_dup(struct chmFile *oldHandle) DECLSPEC_HIDDEN; +struct chmFile* chm_openW(const WCHAR *filename); +struct chmFile *chm_dup(struct chmFile *oldHandle); /* close an ITS archive */ -void chm_close(struct chmFile *h) DECLSPEC_HIDDEN; +void chm_close(struct chmFile *h); /* resolve a particular object from the archive */ #define CHM_RESOLVE_SUCCESS (0) #define CHM_RESOLVE_FAILURE (1) -int chm_resolve_object(struct chmFile *h, - const WCHAR *objPath, - struct chmUnitInfo *ui) DECLSPEC_HIDDEN; +int chm_resolve_object(struct chmFile *h, const WCHAR *objPath, struct chmUnitInfo *ui); /* retrieve part of an object from the archive */ -LONGINT64 chm_retrieve_object(struct chmFile *h, - struct chmUnitInfo *ui, - unsigned char *buf, - LONGUINT64 addr, - LONGINT64 len) DECLSPEC_HIDDEN; +LONGINT64 chm_retrieve_object(struct chmFile *h, struct chmUnitInfo *ui, unsigned char *buf, + LONGUINT64 addr, LONGINT64 len); /* enumerate the objects in the .chm archive */ typedef int (*CHM_ENUMERATOR)(struct chmFile *h, @@ -105,10 +100,7 @@ typedef int (*CHM_ENUMERATOR)(struct chmFile *h, #define CHM_ENUMERATOR_FAILURE (0) #define CHM_ENUMERATOR_CONTINUE (1) #define CHM_ENUMERATOR_SUCCESS (2) -BOOL chm_enumerate_dir(struct chmFile *h, - const WCHAR *prefix, - int what, - CHM_ENUMERATOR e, - void *context) DECLSPEC_HIDDEN; +BOOL chm_enumerate_dir(struct chmFile *h, const WCHAR *prefix, int what, + CHM_ENUMERATOR e, void *context); #endif /* INCLUDED_CHMLIB_H */ diff --git a/dlls/itss/itsstor.h b/dlls/itss/itsstor.h index f4fa72b216b..ef91d1c6fbb 100644 --- a/dlls/itss/itsstor.h +++ b/dlls/itss/itsstor.h @@ -29,15 +29,13 @@ extern HRESULT ITSS_StgOpenStorage( DWORD grfMode, SNB snbExclude, DWORD reserved, - IStorage** ppstgOpen) DECLSPEC_HIDDEN; + IStorage** ppstgOpen); -extern HRESULT ITS_IParseDisplayName_create( - IUnknown *pUnkOuter, - LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT ITS_IParseDisplayName_create(IUnknown *pUnkOuter, LPVOID *ppObj); -extern HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj); -extern LONG dll_count DECLSPEC_HIDDEN; +extern LONG dll_count; static inline void ITSS_LockModule(void) { InterlockedIncrement(&dll_count); } static inline void ITSS_UnlockModule(void) { InterlockedDecrement(&dll_count); }

1 0

Alistair Leslie-Hughes : rsaenh: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: d8f37d0a047e51b98d21c36a2f666d646e4fae58 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8f37d0a047e51b98d21c36a2f666d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 rsaenh: Remove DECLSPEC_HIDDEN usage. --- dlls/rsaenh/handle.h | 14 +++++++------- dlls/rsaenh/implglue.h | 32 +++++++++++++++----------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/rsaenh/handle.h b/dlls/rsaenh/handle.h index 05cbb77fbfe..f28f2af1f3a 100644 --- a/dlls/rsaenh/handle.h +++ b/dlls/rsaenh/handle.h @@ -56,15 +56,15 @@ struct handle_table CRITICAL_SECTION mutex; }; -void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN; -void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN; -BOOL release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; -BOOL copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; -BOOL lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; -BOOL is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +void init_handle_table (struct handle_table *lpTable); +void destroy_handle_table(struct handle_table *lpTable); +BOOL release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); +BOOL copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy); +BOOL lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject); +BOOL is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, - OBJECTHDR **ppObject) DECLSPEC_HIDDEN; + OBJECTHDR **ppObject); #ifdef __cplusplus } diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 423474dc52e..2d490aa345b 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -38,34 +38,32 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; -BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, - DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, - BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle); +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen); +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size); +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle); -BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; -BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; +BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen); +BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext); BOOL setup_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue) DECLSPEC_HIDDEN; + DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue); BOOL duplicate_key_impl(ALG_ID aiAlgid, const KEY_CONTEXT *pSrcKeyContext, - KEY_CONTEXT *pDestKeyContext) DECLSPEC_HIDDEN; + KEY_CONTEXT *pDestKeyContext); /* dwKeySpec is optional for symmetric key algorithms */ BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, const BYTE *pbIn, - BYTE *pbOut, DWORD enc) DECLSPEC_HIDDEN; -BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen) DECLSPEC_HIDDEN; + BYTE *pbOut, DWORD enc); +BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen); BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp) DECLSPEC_HIDDEN; + DWORD *pdwPubExp); BOOL import_public_key_impl(const BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp) DECLSPEC_HIDDEN; + DWORD dwPubExp); BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp) DECLSPEC_HIDDEN; + DWORD *pdwPubExp); BOOL import_private_key_impl(const BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwDataLen, DWORD dwPubExp) DECLSPEC_HIDDEN; + DWORD dwDataLen, DWORD dwPubExp); -BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) DECLSPEC_HIDDEN; +BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen); #endif /* __WINE_IMPLGLUE_H */

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 2aa688326d1ad923138754e186e566835e07b24e URL: https://gitlab.winehq.org/wine/wine/-/commit/2aa688326d1ad923138754e186e566… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 ntoskrnl.exe: Remove DECLSPEC_HIDDEN usage. --- dlls/ntoskrnl.exe/ntoskrnl_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index ef1fa99057c..472dc46fde3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -72,8 +72,8 @@ struct _ETHREAD struct _KTHREAD kthread; }; -void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; -NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; +void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ); +NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ); extern POBJECT_TYPE ExEventObjectType; extern POBJECT_TYPE ExSemaphoreObjectType; @@ -100,15 +100,15 @@ struct wine_driver struct list root_pnp_devices; }; -void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; +void ObReferenceObject( void *obj ); -void pnp_manager_start(void) DECLSPEC_HIDDEN; -void pnp_manager_stop_driver( struct wine_driver *driver ) DECLSPEC_HIDDEN; -void pnp_manager_stop(void) DECLSPEC_HIDDEN; +void pnp_manager_start(void); +void pnp_manager_stop_driver( struct wine_driver *driver ); +void pnp_manager_stop(void); void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ); -struct wine_driver *get_driver( const WCHAR *name ) DECLSPEC_HIDDEN; +struct wine_driver *get_driver( const WCHAR *name ); static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','M','a','c','h','i','n','e',

1 0

Alistair Leslie-Hughes : mpr: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: d4223b255cb3277bff118f73a5cbb94b832a08f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4223b255cb3277bff118f73a5cbb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 8 17:35:28 2023 +1100 mpr: Remove DECLSPEC_HIDDEN usage. --- dlls/mpr/wnetpriv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnetpriv.h b/dlls/mpr/wnetpriv.h index 3e744c55ca7..7a329029f3d 100644 --- a/dlls/mpr/wnetpriv.h +++ b/dlls/mpr/wnetpriv.h @@ -21,7 +21,7 @@ #ifndef __WNET_PRIV_H__ #define __WNET_PRIV_H__ -void wnetInit(HINSTANCE hInstDll) DECLSPEC_HIDDEN; -void wnetFree(void) DECLSPEC_HIDDEN; +void wnetInit(HINSTANCE hInstDll); +void wnetFree(void); #endif /* ndef __WNET_PRIV_H__ */

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN from standard Dll* functions.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: a02ff4b5d3b43fab0662dac3834388d758661769 URL: https://gitlab.winehq.org/wine/wine/-/commit/a02ff4b5d3b43fab0662dac3834388… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:08:39 2023 +0100 include: Remove DECLSPEC_HIDDEN from standard Dll* functions. --- dlls/winecrt0/dll_main.c | 2 +- include/objbase.h | 4 ++-- include/shlwapi.h | 4 ++-- include/winbase.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winecrt0/dll_main.c b/dlls/winecrt0/dll_main.c index 08a9322d809..a177438584c 100644 --- a/dlls/winecrt0/dll_main.c +++ b/dlls/winecrt0/dll_main.c @@ -22,7 +22,7 @@ #include "windef.h" #include "winbase.h" -BOOL WINAPI DECLSPEC_HIDDEN DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); return TRUE; diff --git a/include/objbase.h b/include/objbase.h index 15851a13550..bae8de54bab 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -420,8 +420,8 @@ WINOLE32API HRESULT WINAPI StringFromIID(REFIID riid, LPOLESTR*); /***************************************************************************** * COM Server dll - exports */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; -HRESULT WINAPI DllCanUnloadNow(void) DECLSPEC_HIDDEN; +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv); +HRESULT WINAPI DllCanUnloadNow(void); /***************************************************************************** * Data Object diff --git a/include/shlwapi.h b/include/shlwapi.h index aafbdd3870b..c643d2a4e3a 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1089,7 +1089,7 @@ typedef HRESULT (CALLBACK *DLLGETVERSIONPROC)(DLLVERSIONINFO *); #ifdef __WINESRC__ /* shouldn't be here, but is nice for type checking */ -HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *) DECLSPEC_HIDDEN; +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *); #endif typedef struct _DLLVERSIONINFO2 { @@ -1106,7 +1106,7 @@ typedef struct _DLLVERSIONINFO2 { #define MAKEDLLVERULL(mjr, mnr, bld, qfe) (((ULONGLONG)(mjr)<< 48)| \ ((ULONGLONG)(mnr)<< 32) | ((ULONGLONG)(bld)<< 16) | (ULONGLONG)(qfe)) -HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; +HRESULT WINAPI DllInstall(BOOL,LPCWSTR); /* IsOS definitions */ diff --git a/include/winbase.h b/include/winbase.h index 5f005fcd82b..16e449f7c2d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -3048,7 +3048,7 @@ int WINAPI wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int); #ifdef __WINESRC__ /* shouldn't be here, but is nice for type checking */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) DECLSPEC_HIDDEN; +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ); #endif #ifdef __cplusplus

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN from winecrt0 functions.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: d597d04924a79e67e49d63ce5790fb1fe3e39d5e URL: https://gitlab.winehq.org/wine/wine/-/commit/d597d04924a79e67e49d63ce5790fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:09:22 2023 +0100 include: Remove DECLSPEC_HIDDEN from winecrt0 functions. --- dlls/winecrt0/dll_entry.c | 4 ++-- dlls/winecrt0/exe16_entry.c | 2 +- dlls/winecrt0/exe_entry.c | 4 ++-- dlls/winecrt0/exe_wentry.c | 4 ++-- dlls/winecrt0/stub.c | 2 +- include/rpcproxy.h | 4 ++-- include/wine/exception.h | 18 +++++++++--------- include/wine/unixlib.h | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index 61ce0cf024f..b5b6e2e6159 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -29,9 +29,9 @@ #include "windef.h" #include "winbase.h" -extern void __wine_init_so_dll(void) DECLSPEC_HIDDEN; +extern void __wine_init_so_dll(void); -BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, LPVOID reserved ) +BOOL WINAPI __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, LPVOID reserved ) { if (reason == DLL_PROCESS_ATTACH) __wine_init_so_dll(); return DllMain( inst, reason, reserved ); diff --git a/dlls/winecrt0/exe16_entry.c b/dlls/winecrt0/exe16_entry.c index e6823b29699..02992ab049e 100644 --- a/dlls/winecrt0/exe16_entry.c +++ b/dlls/winecrt0/exe16_entry.c @@ -28,7 +28,7 @@ extern WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ); -void WINAPI DECLSPEC_HIDDEN __wine_spec_exe16_entry( CONTEXT *context ) +void WINAPI __wine_spec_exe16_entry( CONTEXT *context ) { PDB16 *psp; WORD len; diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 44a98109f8b..def7b57c38d 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -31,7 +31,7 @@ #include "winternl.h" extern int main( int argc, char *argv[] ); -extern void __wine_init_so_dll(void) DECLSPEC_HIDDEN; +extern void __wine_init_so_dll(void); static char **build_argv( const char *src, int *ret_argc ) { @@ -96,7 +96,7 @@ static char **build_argv( const char *src, int *ret_argc ) return argv; } -DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) +DWORD WINAPI __wine_spec_exe_entry( PEB *peb ) { int argc; char **argv = build_argv( GetCommandLineA(), &argc ); diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 5fdec771ce5..303e9e5a69b 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -31,7 +31,7 @@ #include "winternl.h" extern int wmain( int argc, WCHAR *argv[] ); -extern void __wine_init_so_dll(void) DECLSPEC_HIDDEN; +extern void __wine_init_so_dll(void); static WCHAR **build_argv( const WCHAR *src, int *ret_argc ) { @@ -96,7 +96,7 @@ static WCHAR **build_argv( const WCHAR *src, int *ret_argc ) return argv; } -DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) +DWORD WINAPI __wine_spec_exe_wentry( PEB *peb ) { int argc; WCHAR **argv = build_argv( GetCommandLineW(), &argc ); diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index 49fd273def2..c1198561886 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -23,7 +23,7 @@ #include "winbase.h" #include "wine/exception.h" -void DECLSPEC_HIDDEN __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) +void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) { ULONG_PTR args[2]; diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 87bb7022629..747d2225954 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -191,8 +191,8 @@ RPCRTAPI HRESULT RPC_ENTRY RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); -HRESULT __cdecl __wine_register_resources(void) DECLSPEC_HIDDEN; -HRESULT __cdecl __wine_unregister_resources(void) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_register_resources(void); +HRESULT __cdecl __wine_unregister_resources(void); #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \ diff --git a/include/wine/exception.h b/include/wine/exception.h index 51446ad7403..580c5ff556c 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -109,34 +109,34 @@ typedef struct { int reg; } __wine_jmp_buf; #endif extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, - EXCEPTION_REGISTRATION_RECORD *frame ) DECLSPEC_HIDDEN; -extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ) DECLSPEC_HIDDEN; + EXCEPTION_REGISTRATION_RECORD *frame ); +extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ); extern void DECLSPEC_NORETURN __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, - void (*target)(void) ) DECLSPEC_HIDDEN; + void (*target)(void) ); extern DWORD __cdecl __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, - EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; + EXCEPTION_REGISTRATION_RECORD **pdispatcher ); extern DWORD __cdecl __wine_exception_ctx_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, - EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; + EXCEPTION_REGISTRATION_RECORD **pdispatcher ); extern DWORD __cdecl __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, - EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; + EXCEPTION_REGISTRATION_RECORD **pdispatcher ); extern DWORD __cdecl __wine_exception_handler_all( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, - EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; + EXCEPTION_REGISTRATION_RECORD **pdispatcher ); extern DWORD __cdecl __wine_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, - EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; + EXCEPTION_REGISTRATION_RECORD **pdispatcher ); extern DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, - EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; + EXCEPTION_REGISTRATION_RECORD **pdispatcher ); #define __TRY \ do { __WINE_FRAME __f; \ diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 26c6d68071d..46b5e982943 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -271,9 +271,9 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ NTSYSAPI NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); -extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; -extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI __wine_init_unix_call(void) DECLSPEC_HIDDEN; +extern unixlib_handle_t __wine_unixlib_handle; +extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ); +extern NTSTATUS WINAPI __wine_init_unix_call(void); #define WINE_UNIX_CALL(code,args) __wine_unix_call_dispatcher( __wine_unixlib_handle, (code), (args) )

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN from RPC functions.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 30ce97dd20ef3876eafa40a85994ddaba1194a9c URL: https://gitlab.winehq.org/wine/wine/-/commit/30ce97dd20ef3876eafa40a85994dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:09:47 2023 +0100 include: Remove DECLSPEC_HIDDEN from RPC functions. --- include/rpcproxy.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 747d2225954..98c9430fdcb 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -139,8 +139,8 @@ RPCRTAPI void WINAPI CStdStubBuffer_DebugServerRelease( IRpcStubBuffer *Thi RPCRTAPI ULONG WINAPI NdrCStdStubBuffer_Release( IRpcStubBuffer *This, IPSFactoryBuffer *pPSF ); RPCRTAPI ULONG WINAPI NdrCStdStubBuffer2_Release(IRpcStubBuffer *This, IPSFactoryBuffer *pPSF); -ULONG STDMETHODCALLTYPE CStdStubBuffer_Release( IRpcStubBuffer *This ) DECLSPEC_HIDDEN; -ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This) DECLSPEC_HIDDEN; +ULONG STDMETHODCALLTYPE CStdStubBuffer_Release( IRpcStubBuffer *This ); +ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This); #define CStdStubBuffer_METHODS \ CStdStubBuffer_QueryInterface, \ @@ -224,10 +224,10 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ /* macros used in dlldata.c files */ #define EXTERN_PROXY_FILE(proxy) \ - EXTERN_C const ProxyFileInfo proxy##_ProxyFileInfo DECLSPEC_HIDDEN; + EXTERN_C const ProxyFileInfo proxy##_ProxyFileInfo; #define PROXYFILE_LIST_START \ - const ProxyFileInfo * aProxyFileList[] DECLSPEC_HIDDEN = \ + const ProxyFileInfo * aProxyFileList[] = \ { #define REFERENCE_PROXY_FILE(proxy) \ @@ -287,7 +287,7 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ #define DLLDATA_GETPROXYDLLINFO(pfl, rclsid) \ void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ - const CLSID **ppClsid) DECLSPEC_HIDDEN; \ + const CLSID **ppClsid); \ void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ const CLSID **ppClsid) \ { \ @@ -296,7 +296,7 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ } #define DLLGETCLASSOBJECTROUTINE(pfl, factory_clsid, factory) \ - HRESULT WINAPI DLLGETCLASSOBJECT_ENTRY(REFCLSID rclsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLGETCLASSOBJECT_ENTRY(REFCLSID rclsid, REFIID riid, void **ppv); \ HRESULT WINAPI DLLGETCLASSOBJECT_ENTRY(REFCLSID rclsid, REFIID riid, \ void **ppv) \ { \ @@ -305,16 +305,16 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ } #define DLLCANUNLOADNOW(factory) \ - HRESULT WINAPI DLLCANUNLOADNOW_ENTRY(void) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLCANUNLOADNOW_ENTRY(void); \ HRESULT WINAPI DLLCANUNLOADNOW_ENTRY(void) \ { \ return NdrDllCanUnloadNow((factory)); \ } #define REGISTER_PROXY_DLL_ROUTINES(pfl, factory_clsid) \ - HINSTANCE hProxyDll DECLSPEC_HIDDEN = NULL; \ + HINSTANCE hProxyDll = NULL; \ \ - BOOL WINAPI DLLMAIN_ENTRY(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DECLSPEC_HIDDEN; \ + BOOL WINAPI DLLMAIN_ENTRY(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); \ BOOL WINAPI DLLMAIN_ENTRY(HINSTANCE hinstDLL, DWORD fdwReason, \ LPVOID lpvReserved) \ { \ @@ -326,13 +326,13 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ return TRUE; \ } \ \ - HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void); \ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) \ { \ WINE_DO_REGISTER_DLL( (pfl), (factory_clsid) ); \ } \ \ - HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ + HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void); \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) \ { \ WINE_DO_UNREGISTER_DLL( (pfl), (factory_clsid) ); \ @@ -347,7 +347,7 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ #define DLLDATA_ROUTINES(pfl, factory_clsid) \ CLSID_PSFACTORYBUFFER \ - CStdPSFactoryBuffer DECLSPEC_HIDDEN gPFactory = { NULL, 0, NULL, 0 }; \ + CStdPSFactoryBuffer gPFactory = { NULL, 0, NULL, 0 }; \ DLLDATA_GETPROXYDLLINFO(pfl, factory_clsid) \ DLLGETCLASSOBJECTROUTINE(pfl, factory_clsid, &gPFactory) \ DLLCANUNLOADNOW(&gPFactory) \

1 0

Zebediah Figura : gitlab: Enable d3d10core:d3d10core and d3d8:visual.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: d7d782b1123dc26ec2eca1051f712e686a2b6b22 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7d782b1123dc26ec2eca1051f712e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 7 21:47:39 2023 -0600 gitlab: Enable d3d10core:d3d10core and d3d8:visual. These pass on llvmpipe now. --- tools/gitlab/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 4e0b6d75983..590eacb2438 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -58,7 +58,7 @@ test-linux-64: test-linux-32: extends: .wine-test variables: - EXCLUDE_TESTS: "d3d10core:d3d10core d3d11:d3d11 d3d8:visual d3d9:d3d9ex d3d9:visual" + EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual" rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' needs:

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement ternary operator for SM1.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: vkd3d Branch: master Commit: 76e42fbd214f094a46ea4a1bccc131809d9a44ce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/76e42fbd214f094a46ea4a1bccc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 20:48:58 2023 +0200 vkd3d-shader/hlsl: Implement ternary operator for SM1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 35 +++++++++++++++++++++++ libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 5 +++- libs/vkd3d-shader/hlsl_codegen.c | 61 ++++++++++++++++++++++++++++------------ 4 files changed, 83 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index b1e2dc91..8a15fc4e 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1824,6 +1824,37 @@ static void write_sm1_dp2add(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer write_sm1_instruction(ctx, buffer, &instr); } +static void write_sm1_ternary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src1, + const struct hlsl_reg *src2, const struct hlsl_reg *src3) +{ + struct sm1_instruction instr = + { + .opcode = opcode, + + .dst.type = D3DSPR_TEMP, + .dst.writemask = dst->writemask, + .dst.reg = dst->id, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].swizzle = hlsl_swizzle_from_writemask(src1->writemask), + .srcs[0].reg = src1->id, + .srcs[1].type = D3DSPR_TEMP, + .srcs[1].swizzle = hlsl_swizzle_from_writemask(src2->writemask), + .srcs[1].reg = src2->id, + .srcs[2].type = D3DSPR_TEMP, + .srcs[2].swizzle = hlsl_swizzle_from_writemask(src3->writemask), + .srcs[2].reg = src3->id, + .src_count = 3, + }; + + sm1_map_src_swizzle(&instr.srcs[0], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[1], instr.dst.writemask); + sm1_map_src_swizzle(&instr.srcs[2], instr.dst.writemask); + write_sm1_instruction(ctx, buffer, &instr); +} + static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src1, const struct hlsl_reg *src2) @@ -2190,6 +2221,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } break; + case HLSL_OP3_CMP: + write_sm1_ternary_op(ctx, buffer, D3DSIO_CMP, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); + break; + case HLSL_OP3_DP2ADD: write_sm1_dp2add(ctx, buffer, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); break; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1d3fd0f7..9bae821d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2607,6 +2607,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_NEQUAL] = "!=", [HLSL_OP2_RSHIFT] = ">>", + [HLSL_OP3_CMP] = "cmp", [HLSL_OP3_DP2ADD] = "dp2add", [HLSL_OP3_MOVC] = "movc", [HLSL_OP3_TERNARY] = "ternary", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 309d7080..98861f40 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -578,7 +578,10 @@ enum hlsl_ir_expr_op /* MOVC(a, b, c) returns c if a is bitwise zero and b otherwise. * TERNARY(a, b, c) returns c if a == 0 and b otherwise. * They differ for floating point numbers, because - * -0.0 == 0.0, but it is not bitwise zero. */ + * -0.0 == 0.0, but it is not bitwise zero. CMP(a, b, c) returns b + if a >= 0, and c otherwise. It's used only for SM1-SM3 targets, while + SM4+ is using MOVC in such cases. */ + HLSL_OP3_CMP, HLSL_OP3_MOVC, HLSL_OP3_TERNARY, }; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 76a010fb..570591a6 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2688,7 +2688,7 @@ static bool lower_round(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct /* Use 'movc' for the ternary operator. */ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { - struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], *replacement; + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = { 0 }, *replacement; struct hlsl_ir_node *zero, *cond, *first, *second; struct hlsl_constant_value zero_value = { 0 }; struct hlsl_ir_expr *expr; @@ -2705,28 +2705,54 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru first = expr->operands[1].node; second = expr->operands[2].node; - if (cond->data_type->base_type == HLSL_TYPE_FLOAT) + if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) { - if (!(zero = hlsl_new_constant(ctx, cond->data_type, &zero_value, &instr->loc))) + struct hlsl_ir_node *abs, *neg; + + if (!(abs = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, cond, &instr->loc))) return false; - hlsl_block_add_instr(block, zero); + hlsl_block_add_instr(block, abs); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, abs, &instr->loc))) + return false; + hlsl_block_add_instr(block, neg); + + operands[0] = neg; + operands[1] = second; + operands[2] = first; + if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_CMP, operands, first->data_type, &instr->loc))) + return false; + } + else if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX) + { + hlsl_fixme(ctx, &instr->loc, "Ternary operator is not implemented for %s profile.", ctx->profile->name); + return false; + } + else + { + if (cond->data_type->base_type == HLSL_TYPE_FLOAT) + { + if (!(zero = hlsl_new_constant(ctx, cond->data_type, &zero_value, &instr->loc))) + return false; + hlsl_block_add_instr(block, zero); + + operands[0] = zero; + operands[1] = cond; + type = cond->data_type; + type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_BOOL, type->dimx, type->dimy); + if (!(cond = hlsl_new_expr(ctx, HLSL_OP2_NEQUAL, operands, type, &instr->loc))) + return false; + hlsl_block_add_instr(block, cond); + } memset(operands, 0, sizeof(operands)); - operands[0] = zero; - operands[1] = cond; - type = cond->data_type; - type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_BOOL, type->dimx, type->dimy); - if (!(cond = hlsl_new_expr(ctx, HLSL_OP2_NEQUAL, operands, type, &instr->loc))) + operands[0] = cond; + operands[1] = first; + operands[2] = second; + if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_MOVC, operands, first->data_type, &instr->loc))) return false; - hlsl_block_add_instr(block, cond); } - memset(operands, 0, sizeof(operands)); - operands[0] = cond; - operands[1] = first; - operands[2] = second; - if (!(replacement = hlsl_new_expr(ctx, HLSL_OP3_MOVC, operands, first->data_type, &instr->loc))) - return false; hlsl_block_add_instr(block, replacement); return true; } @@ -4818,8 +4844,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry hlsl_transform_ir(ctx, track_object_components_usage, body, NULL); sort_synthetic_separated_samplers_first(ctx); - if (profile->major_version >= 4) - lower_ir(ctx, lower_ternary, body); + lower_ir(ctx, lower_ternary, body); if (profile->major_version < 4) { lower_ir(ctx, lower_division, body);

1 0