November 2023 - Wine-Commits

Anton Baskanov : dmime: Always queue messages with non-immediate delivery type.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: fcf82e335288d8f6a9206ee8e142955a8189bcf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcf82e335288d8f6a9206ee8e14295… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 22 15:38:30 2023 +0700 dmime: Always queue messages with non-immediate delivery type. --- dlls/dmime/performance.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index e2ca75b9c10..aa892d108c0 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -134,37 +134,13 @@ static struct message *performance_get_message(struct performance *This, DWORD * static HRESULT performance_process_message(struct performance *This, DMUS_PMSG *msg) { - static const DWORD delivery_flags = DMUS_PMSGF_TOOL_IMMEDIATE | DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_ATTIME; IDirectMusicPerformance *performance = (IDirectMusicPerformance *)&This->IDirectMusicPerformance8_iface; + IDirectMusicTool *tool; HRESULT hr; - do - { - REFERENCE_TIME latency, offset = 0; - IDirectMusicTool *tool; - - if (FAILED(hr = IDirectMusicPerformance_GetLatencyTime(performance, &latency))) return hr; - if (!(tool = msg->pTool)) tool = &This->IDirectMusicTool_iface; + if (!(tool = msg->pTool)) tool = &This->IDirectMusicTool_iface; - switch (msg->dwFlags & delivery_flags) - { - default: - WARN("No delivery flag found for message %p\n", msg); - /* fallthrough */ - case DMUS_PMSGF_TOOL_IMMEDIATE: - hr = IDirectMusicTool_ProcessPMsg(tool, performance, msg); - break; - case DMUS_PMSGF_TOOL_QUEUE: - offset = This->dwBumperLength * 10000; - /* fallthrough */ - case DMUS_PMSGF_TOOL_ATTIME: - if (msg->rtTime >= offset && msg->rtTime - offset >= latency) - return DMUS_S_REQUEUE; - - hr = IDirectMusicTool_ProcessPMsg(tool, performance, msg); - break; - } - } while (hr == DMUS_S_REQUEUE); + hr = IDirectMusicTool_ProcessPMsg(tool, performance, msg); if (hr == DMUS_S_FREE) hr = IDirectMusicPerformance_FreePMsg(performance, msg); if (FAILED(hr)) WARN("Failed to process message, hr %#lx\n", hr);

1 0

Alexandre Julliard : mmdevapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: d305d8676d98a2facdb1b7dd88ff4c5564f1d48c URL: https://gitlab.winehq.org/wine/wine/-/commit/d305d8676d98a2facdb1b7dd88ff4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 22:25:24 2023 +0100 mmdevapi: Remove DECLSPEC_HIDDEN usage. --- dlls/mmdevapi/client.c | 8 ++++---- dlls/mmdevapi/mmdevapi_private.h | 22 +++++++++++----------- dlls/mmdevapi/session.c | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 8146f8a53b4..3e0c70a44f4 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -40,12 +40,12 @@ typedef struct tagLANGANDCODEPAGE WORD wCodePage; } LANGANDCODEPAGE; -extern void sessions_lock(void) DECLSPEC_HIDDEN; -extern void sessions_unlock(void) DECLSPEC_HIDDEN; +extern void sessions_lock(void); +extern void sessions_unlock(void); extern HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device, UINT channels, - struct audio_session **out) DECLSPEC_HIDDEN; -extern struct audio_session_wrapper *session_wrapper_create(struct audio_client *client) DECLSPEC_HIDDEN; + struct audio_session **out); +extern struct audio_session_wrapper *session_wrapper_create(struct audio_client *client); static HANDLE main_loop_thread; diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index 0ed9140c3ed..5ef19ffc0d1 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -28,8 +28,8 @@ #include "unixlib.h" #include "mmdevdrv.h" -extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; -extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; +extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv); +extern void MMDevEnum_Free(void); typedef struct _DriverFuncs { HMODULE module; @@ -46,7 +46,7 @@ typedef struct _DriverFuncs { BOOL (WINAPI *pget_device_name_from_guid)(GUID *guid, char **name, EDataFlow *flow); } DriverFuncs; -extern DriverFuncs drvs DECLSPEC_HIDDEN; +extern DriverFuncs drvs; typedef struct MMDevice { IMMDevice IMMDevice_iface; @@ -69,14 +69,14 @@ static inline void wine_unix_call(const unsigned int code, void *args) assert(!status); } -extern HRESULT AudioClient_Create(GUID *guid, IMMDevice *device, IAudioClient **out) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioSessionManager_Create(IMMDevice *device, IAudioSessionManager2 **ppv) DECLSPEC_HIDDEN; -extern HRESULT SpatialAudioClient_Create(IMMDevice *device, ISpatialAudioClient **out) DECLSPEC_HIDDEN; +extern HRESULT AudioClient_Create(GUID *guid, IMMDevice *device, IAudioClient **out); +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv); +extern HRESULT AudioSessionManager_Create(IMMDevice *device, IAudioSessionManager2 **ppv); +extern HRESULT SpatialAudioClient_Create(IMMDevice *device, ISpatialAudioClient **out); -extern HRESULT load_devices_from_reg(void) DECLSPEC_HIDDEN; -extern HRESULT load_driver_devices(EDataFlow flow) DECLSPEC_HIDDEN; +extern HRESULT load_devices_from_reg(void); +extern HRESULT load_driver_devices(EDataFlow flow); -extern void main_loop_stop(void) DECLSPEC_HIDDEN; +extern void main_loop_stop(void); -extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; +extern const WCHAR drv_keyW[]; diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 112c0c52fb9..9a36adb5bf2 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -34,10 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -extern void sessions_lock(void) DECLSPEC_HIDDEN; -extern void sessions_unlock(void) DECLSPEC_HIDDEN; +extern void sessions_lock(void); +extern void sessions_unlock(void); -extern void set_stream_volumes(struct audio_client *This) DECLSPEC_HIDDEN; +extern void set_stream_volumes(struct audio_client *This); static struct list sessions = LIST_INIT(sessions);

1 0

Anton Baskanov : dmime: Don't queue messages with immediate delivery type.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: be77443b7ca769fc9717ac42297f033742db8905 URL: https://gitlab.winehq.org/wine/wine/-/commit/be77443b7ca769fc9717ac42297f03… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 22 14:48:41 2023 +0700 dmime: Don't queue messages with immediate delivery type. --- dlls/dmime/performance.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index eccc1f83683..e2ca75b9c10 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -97,19 +97,6 @@ static inline struct message *message_from_DMUS_PMSG(DMUS_PMSG *msg) return msg ? CONTAINING_RECORD(msg, struct message, msg) : NULL; } -static void performance_queue_message(struct performance *This, struct message *message, struct list *hint) -{ - struct message *prev; - - LIST_FOR_EACH_ENTRY_REV(prev, hint ? hint : &This->messages, struct message, entry) - { - if (&prev->entry == &This->messages) break; - if (prev->msg.rtTime <= message->msg.rtTime) break; - } - - list_add_after(&prev->entry, &message->entry); -} - static struct message *performance_get_message(struct performance *This, DWORD *timeout) { static const DWORD delivery_flags = DMUS_PMSGF_TOOL_IMMEDIATE | DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_ATTIME; @@ -129,8 +116,6 @@ static struct message *performance_get_message(struct performance *This, DWORD * { default: WARN("No delivery flag found for message %p\n", &message->msg); - /* fallthrough */ - case DMUS_PMSGF_TOOL_IMMEDIATE: break; case DMUS_PMSGF_TOOL_QUEUE: offset = This->dwBumperLength * 10000; @@ -186,6 +171,30 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * return hr; } +static HRESULT performance_queue_message(struct performance *This, struct message *message, struct list *hint) +{ + static const DWORD delivery_flags = DMUS_PMSGF_TOOL_IMMEDIATE | DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_ATTIME; + struct message *prev; + HRESULT hr; + + while ((message->msg.dwFlags & delivery_flags) == DMUS_PMSGF_TOOL_IMMEDIATE) + { + hr = performance_process_message(This, &message->msg); + if (hr != DMUS_S_REQUEUE) + return hr; + } + + LIST_FOR_EACH_ENTRY_REV(prev, hint ? hint : &This->messages, struct message, entry) + { + if (&prev->entry == &This->messages) break; + if (prev->msg.rtTime <= message->msg.rtTime) break; + } + + list_add_after(&prev->entry, &message->entry); + + return S_OK; +} + static DWORD WINAPI message_thread_proc(void *args) { struct performance *This = args; @@ -856,14 +865,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS msg->dwFlags |= DMUS_PMSGF_REFTIME; } - if (msg->dwFlags & DMUS_PMSGF_TOOL_IMMEDIATE) - { - hr = performance_process_message(This, &message->msg); - if (hr != DMUS_S_REQUEUE) goto done; - } - - performance_queue_message(This, message, NULL); - hr = S_OK; + hr = performance_queue_message(This, message, NULL); } done:

1 0

Alexandre Julliard : bcrypt: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: f2451be041f9963c918be6e6729935655d72864a URL: https://gitlab.winehq.org/wine/wine/-/commit/f2451be041f9963c918be6e6729935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 22:24:37 2023 +0100 bcrypt: Remove DECLSPEC_HIDDEN usage. --- dlls/bcrypt/bcrypt_internal.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 26a98eba1dc..10b1cc12e8c 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -39,9 +39,9 @@ typedef struct UCHAR buf[64]; } SHA256_CTX; -void sha256_init(SHA256_CTX *ctx) DECLSPEC_HIDDEN; -void sha256_update(SHA256_CTX *ctx, const UCHAR *buffer, ULONG len) DECLSPEC_HIDDEN; -void sha256_finalize(SHA256_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN; +void sha256_init(SHA256_CTX *ctx); +void sha256_update(SHA256_CTX *ctx, const UCHAR *buffer, ULONG len); +void sha256_finalize(SHA256_CTX *ctx, UCHAR *buffer); typedef struct { @@ -50,22 +50,22 @@ typedef struct UCHAR buf[128]; } SHA512_CTX; -void sha512_init(SHA512_CTX *ctx) DECLSPEC_HIDDEN; -void sha512_update(SHA512_CTX *ctx, const UCHAR *buffer, ULONG len) DECLSPEC_HIDDEN; -void sha512_finalize(SHA512_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN; +void sha512_init(SHA512_CTX *ctx); +void sha512_update(SHA512_CTX *ctx, const UCHAR *buffer, ULONG len); +void sha512_finalize(SHA512_CTX *ctx, UCHAR *buffer); -void sha384_init(SHA512_CTX *ctx) DECLSPEC_HIDDEN; +void sha384_init(SHA512_CTX *ctx); #define sha384_update sha512_update -void sha384_finalize(SHA512_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN; +void sha384_finalize(SHA512_CTX *ctx, UCHAR *buffer); typedef struct { unsigned char chksum[16], X[48], buf[16]; unsigned long curlen; } MD2_CTX; -void md2_init(MD2_CTX *ctx) DECLSPEC_HIDDEN; -void md2_update(MD2_CTX *ctx, const unsigned char *buf, ULONG len) DECLSPEC_HIDDEN; -void md2_finalize(MD2_CTX *ctx, unsigned char *hash) DECLSPEC_HIDDEN; +void md2_init(MD2_CTX *ctx); +void md2_update(MD2_CTX *ctx, const unsigned char *buf, ULONG len); +void md2_finalize(MD2_CTX *ctx, unsigned char *hash); /* Definitions from advapi32 */ typedef struct tagMD4_CTX {

1 0

Alexandre Julliard : crypt32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: e7d3c4294f7f29ed24613dafe1b5561f0f659944 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7d3c4294f7f29ed24613dafe1b556… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 22:25:01 2023 +0100 crypt32: Remove DECLSPEC_HIDDEN usage. --- dlls/crypt32/crypt32_private.h | 120 ++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 60 deletions(-)

1 0

Anton Baskanov : dmime: Correctly requeue messages with changed time.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: 00a77f0137ef73c363d0aedc977eefb500eac54f URL: https://gitlab.winehq.org/wine/wine/-/commit/00a77f0137ef73c363d0aedc977eef… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Nov 18 17:20:24 2023 +0700 dmime: Correctly requeue messages with changed time. --- dlls/dmime/performance.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index aa892d108c0..1236766afd9 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -147,7 +147,7 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * return hr; } -static HRESULT performance_queue_message(struct performance *This, struct message *message, struct list *hint) +static HRESULT performance_queue_message(struct performance *This, struct message *message) { static const DWORD delivery_flags = DMUS_PMSGF_TOOL_IMMEDIATE | DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_ATTIME; struct message *prev; @@ -160,7 +160,7 @@ static HRESULT performance_queue_message(struct performance *This, struct messag return hr; } - LIST_FOR_EACH_ENTRY_REV(prev, hint ? hint : &This->messages, struct message, entry) + LIST_FOR_EACH_ENTRY_REV(prev, &This->messages, struct message, entry) { if (&prev->entry == &This->messages) break; if (prev->msg.rtTime <= message->msg.rtTime) break; @@ -185,20 +185,18 @@ static DWORD WINAPI message_thread_proc(void *args) { DWORD timeout = INFINITE; struct message *message; - struct list *next; if (!(message = performance_get_message(This, &timeout))) { SleepConditionVariableCS(&This->cond, &This->safe, timeout); continue; } - next = message->entry.next; list_remove(&message->entry); list_init(&message->entry); hr = performance_process_message(This, &message->msg); - if (hr == DMUS_S_REQUEUE) performance_queue_message(This, message, next); + if (hr == DMUS_S_REQUEUE) performance_queue_message(This, message); } LeaveCriticalSection(&This->safe); @@ -841,7 +839,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS msg->dwFlags |= DMUS_PMSGF_REFTIME; } - hr = performance_queue_message(This, message, NULL); + hr = performance_queue_message(This, message); } done:

1 0

Alexandre Julliard : secur32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: a93e4cf644d40a495f8d330d3e381de9a4f5f4ef URL: https://gitlab.winehq.org/wine/wine/-/commit/a93e4cf644d40a495f8d330d3e381d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 22:26:18 2023 +0100 secur32: Remove DECLSPEC_HIDDEN usage. --- dlls/secur32/secur32_priv.h | 20 ++++++++++---------- dlls/secur32/thunks.h | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 0b410c9970c..a9fc40fa73a 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -52,33 +52,33 @@ typedef struct _SecurePackage * Returns a pointer to the stored provider entry, for use adding packages. */ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, - const SecurityFunctionTableW *fnTableW, PCWSTR moduleName) DECLSPEC_HIDDEN; + const SecurityFunctionTableW *fnTableW, PCWSTR moduleName); /* Allocates space for and adds toAdd packages with the given provider. * provider must not be NULL, and either infoA or infoW may be NULL, but not * both. */ void SECUR32_addPackages(SecureProvider *provider, ULONG toAdd, - const SecPkgInfoA *infoA, const SecPkgInfoW *infoW) DECLSPEC_HIDDEN; + const SecPkgInfoA *infoA, const SecPkgInfoW *infoW); /* Tries to find the package named packageName. If it finds it, implicitly * loads the package if it isn't already loaded. */ -SecurePackage *SECUR32_findPackageW(PCWSTR packageName) DECLSPEC_HIDDEN; +SecurePackage *SECUR32_findPackageW(PCWSTR packageName); /* Tries to find the package named packageName. (Thunks to _findPackageW) */ -SecurePackage *SECUR32_findPackageA(PCSTR packageName) DECLSPEC_HIDDEN; +SecurePackage *SECUR32_findPackageA(PCSTR packageName); /* Initialization functions for built-in providers */ -void SECUR32_initSchannelSP(void) DECLSPEC_HIDDEN; -void load_auth_packages(void) DECLSPEC_HIDDEN; -NTSTATUS NTAPI nego_SpLsaModeInitialize(ULONG, PULONG, PSECPKG_FUNCTION_TABLE *, PULONG) DECLSPEC_HIDDEN; -NTSTATUS NTAPI nego_SpUserModeInitialize(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG) DECLSPEC_HIDDEN; -SECPKG_FUNCTION_TABLE *lsa_find_package(const char *name, SECPKG_USER_FUNCTION_TABLE **user_api) DECLSPEC_HIDDEN; +void SECUR32_initSchannelSP(void); +void load_auth_packages(void); +NTSTATUS NTAPI nego_SpLsaModeInitialize(ULONG, PULONG, PSECPKG_FUNCTION_TABLE *, PULONG); +NTSTATUS NTAPI nego_SpUserModeInitialize(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG); +SECPKG_FUNCTION_TABLE *lsa_find_package(const char *name, SECPKG_USER_FUNCTION_TABLE **user_api); /* Cleanup functions for built-in providers */ -void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; +void SECUR32_deinitSchannelSP(void); /* schannel internal interface */ typedef UINT64 schan_session; diff --git a/dlls/secur32/thunks.h b/dlls/secur32/thunks.h index 7c3171e0623..53fa63ab4e2 100644 --- a/dlls/secur32/thunks.h +++ b/dlls/secur32/thunks.h @@ -27,48 +27,48 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleA( SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialsUse, PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) DECLSPEC_HIDDEN; + PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleW( SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialsUse, PLUID pvLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) DECLSPEC_HIDDEN; + PVOID pvGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextA( PCredHandle phCredential, PCtxtHandle phContext, SEC_CHAR *pszTargetName, ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, - ULONG *pfContextAttr, PTimeStamp ptsExpiry) DECLSPEC_HIDDEN; + ULONG *pfContextAttr, PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW( PCredHandle phCredential, PCtxtHandle phContext, SEC_WCHAR *pszTargetName, ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, - ULONG *pfContextAttr, PTimeStamp ptsExpiry) DECLSPEC_HIDDEN; + ULONG *pfContextAttr, PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY thunk_ImportSecurityContextA( SEC_CHAR *pszPackage, PSecBuffer pPackedContext, void *Token, - PCtxtHandle phContext) DECLSPEC_HIDDEN; + PCtxtHandle phContext); SECURITY_STATUS SEC_ENTRY thunk_ImportSecurityContextW( SEC_WCHAR *pszPackage, PSecBuffer pPackedContext, void *Token, - PCtxtHandle phContext) DECLSPEC_HIDDEN; + PCtxtHandle phContext); SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsA(PCredHandle hCredentials, SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, - PTimeStamp ptsExpiry) DECLSPEC_HIDDEN; + PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials, SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pvGetKeyArgument, - PTimeStamp ptsExpiry) DECLSPEC_HIDDEN; + PTimeStamp ptsExpiry); SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA( - PCredHandle phCredential, ULONG ulAttribute, void *pBuffer) DECLSPEC_HIDDEN; + PCredHandle phCredential, ULONG ulAttribute, void *pBuffer); SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW( - PCredHandle phCredential, ULONG ulAttribute, void *pBuffer) DECLSPEC_HIDDEN; + PCredHandle phCredential, ULONG ulAttribute, void *pBuffer); SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA( - PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) DECLSPEC_HIDDEN; + PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer); SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesW( - PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) DECLSPEC_HIDDEN; + PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer); SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesA(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer, ULONG cbBuffer) DECLSPEC_HIDDEN; + ULONG ulAttribute, void *pBuffer, ULONG cbBuffer); SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesW(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer, ULONG cbBuffer) DECLSPEC_HIDDEN; + ULONG ulAttribute, void *pBuffer, ULONG cbBuffer); #endif /* ndef __SECUR32_THUNKS_H__ */

1 0

Zebediah Figura : ddraw/tests: Add a test for drawing to a flippable surface.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: 192c488a565adbb8c36739ee1a6836cadbd943b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/192c488a565adbb8c36739ee1a6836… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 22 16:56:00 2023 -0600 ddraw/tests: Add a test for drawing to a flippable surface. --- dlls/ddraw/tests/ddraw7.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ab43c1bbb2d..dc9568a1143 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -641,6 +641,29 @@ static bool init_3d_test_context_guid(struct ddraw_test_context *context, const return true; } +static bool init_3d_test_context(struct ddraw_test_context *context) +{ + HRESULT hr; + + memset(context, 0, sizeof(*context)); + + context->window = create_window(); + if (!(context->device = create_device(context->window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(context->window); + return false; + } + + hr = IDirect3DDevice7_GetDirect3D(context->device, &context->d3d); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3D7_QueryInterface(context->d3d, &IID_IDirectDraw7, (void **)&context->ddraw); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(context->device, &context->backbuffer); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + return true; +} + #define release_test_context(a) release_test_context_(__LINE__, a) static void release_test_context_(unsigned int line, struct ddraw_test_context *context) { @@ -665,6 +688,36 @@ static void clear_surface(IDirectDrawSurface7 *surface, unsigned int colour) ok(hr == S_OK, "Got hr %#lx.\n", hr); } +static void draw_color_quad(struct ddraw_test_context *context, unsigned int colour) +{ + IDirect3DDevice7 *device = context->device; + HRESULT hr; + + struct + { + struct vec3 position; + unsigned int colour; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, colour}, + {{-1.0f, 1.0f, 0.0f}, colour}, + {{ 1.0f, -1.0f, 0.0f}, colour}, + {{ 1.0f, 1.0f, 0.0f}, colour}, + }; + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); +} + struct message { UINT message; @@ -19889,6 +19942,55 @@ static void test_user_memory(const GUID *device_guid) release_test_context(&context); } +/* Test that we handle flipping correctly when drawing to a flippable surface. */ +static void test_flip_3d(void) +{ + struct ddraw_test_context context; + IDirectDrawSurface7 *buffers[4]; + DDSURFACEDESC2 desc; + unsigned int color; + HRESULT hr; + + if (!init_3d_test_context(&context)) + return; + + reset_ddsd(&desc); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_FLIP | DDSCAPS_COMPLEX; + desc.dwBackBufferCount = ARRAY_SIZE(buffers) - 1; + desc.dwWidth = 16; + desc.dwHeight = 16; + hr = IDirectDraw7_CreateSurface(context.ddraw, &desc, &buffers[0], NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (unsigned int i = 0; i < ARRAY_SIZE(buffers) - 1; ++i) + { + DDSCAPS2 backbuffer_caps = {DDSCAPS_FLIP}; + + hr = IDirectDrawSurface7_GetAttachedSurface(buffers[i], &backbuffer_caps, &buffers[i + 1]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + } + + hr = IDirect3DDevice7_SetRenderTarget(context.device, buffers[0], 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_color_quad(&context, 0x0000ff00); + + hr = IDirectDrawSurface7_Flip(buffers[0], NULL, DDFLIP_WAIT); + + draw_color_quad(&context, 0x000000ff); + + color = get_surface_color(buffers[0], 0, 0); + todo_wine ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color); + + color = get_surface_color(buffers[3], 0, 0); + todo_wine ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color); + + for (unsigned int i = 0; i < ARRAY_SIZE(buffers); ++i) + IDirectDrawSurface7_Release(buffers[ARRAY_SIZE(buffers) - 1 - i]); + release_test_context(&context); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { winetest_push_context("Hardware device"); @@ -20073,4 +20175,5 @@ START_TEST(ddraw7) test_filling_convention(); test_enum_devices(); run_for_each_device_type(test_user_memory); + test_flip_3d(); }

1 0

Zebediah Figura : ddraw: Read the current RTV before flipping any surfaces.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: 3b5dca348e12f65f3a92313f207fc004ab5eb33c URL: https://gitlab.winehq.org/wine/wine/-/commit/3b5dca348e12f65f3a92313f207fc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 22 17:04:18 2023 -0600 ddraw: Read the current RTV before flipping any surfaces. Since we rename one at a time, we will swap the RTV twice otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54839 Fixes: f103da7c69cc18aaf63f08a752d870b7049d9d20 --- dlls/ddraw/surface.c | 14 +++++++------- dlls/ddraw/tests/ddraw7.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ef82a5bfac5..5836a49f4fd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1330,15 +1330,14 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags) } static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wined3d_texture *wined3d_texture, - struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory) + struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory, + struct wined3d_rendertarget_view *current_rtv) { struct ddraw_surface *dst_surface = dst_texture->root; - struct wined3d_rendertarget_view *current_rtv; /* We don't have to worry about potential texture bindings, since * flippable surfaces can never be textures. */ - current_rtv = wined3d_device_context_get_rendertarget_view(dst_surface->ddraw->immediate_context, 0); if (current_rtv == dst_surface->wined3d_rtv) wined3d_device_context_set_rendertarget_views(dst_surface->ddraw->immediate_context, 0, 1, &rtv, FALSE); wined3d_rendertarget_view_set_parent(rtv, dst_surface, &ddraw_view_wined3d_parent_ops); @@ -1377,8 +1376,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; + struct wined3d_rendertarget_view *tmp_rtv, *current_rtv; struct wined3d_texture *texture, *draw_texture; - struct wined3d_rendertarget_view *tmp_rtv; DDSCAPS caps = {DDSCAPS_FLIP}; IDirectDrawSurface *current; void *texture_memory; @@ -1407,6 +1406,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); texture_memory = dst_ddraw_texture->texture_memory; draw_texture = dst_impl->draw_texture; + current_rtv = wined3d_device_context_get_rendertarget_view(dst_impl->ddraw->immediate_context, 0); if (src_impl) { @@ -1430,7 +1430,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, - ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory, current_rtv); dst_ddraw_texture = src_ddraw_texture; } @@ -1455,14 +1455,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, - ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory, current_rtv); dst_ddraw_texture = src_ddraw_texture; dst_impl = src_impl; } } - ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory); + ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory, current_rtv); if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index dc9568a1143..2771a4ed368 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -19981,10 +19981,10 @@ static void test_flip_3d(void) draw_color_quad(&context, 0x000000ff); color = get_surface_color(buffers[0], 0, 0); - todo_wine ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color); color = get_surface_color(buffers[3], 0, 0); - todo_wine ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color); for (unsigned int i = 0; i < ARRAY_SIZE(buffers); ++i) IDirectDrawSurface7_Release(buffers[ARRAY_SIZE(buffers) - 1 - i]);

1 0

Alexandre Julliard : vkd3d: Disable printf format checks.
by Alexandre Julliard Nov. 23, 2023

Nov. 23, 2023

Module: wine Branch: master Commit: 2863311d7c96fce9df7c932ca93f76eb2b8f51cf URL: https://gitlab.winehq.org/wine/wine/-/commit/2863311d7c96fce9df7c932ca93f76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 18:42:15 2023 +0100 vkd3d: Disable printf format checks. clang warns by default, and the existing printf formats assume Unix type definitions. --- libs/vkd3d/include/private/vkd3d_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h index ee733ee0d76..6b5cdf8cf2c 100644 --- a/libs/vkd3d/include/private/vkd3d_common.h +++ b/libs/vkd3d/include/private/vkd3d_common.h @@ -59,7 +59,7 @@ static inline size_t align(size_t addr, size_t alignment) # ifdef __MINGW_PRINTF_FORMAT # define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args))) # else -# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args))) +# define VKD3D_PRINTF_FUNC(fmt, args) /* __attribute__((format(printf, fmt, args))) */ # endif # define VKD3D_UNUSED __attribute__((unused)) # define VKD3D_UNREACHABLE __builtin_unreachable()

1 0