November 2023 - Wine-commits

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

23 Nov '23

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

Alexandre Julliard : bcrypt: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Nov '23

23 Nov '23

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 23 Nov '23

23 Nov '23

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

Alexandre Julliard : mmdevapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Nov '23

23 Nov '23

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

Alexandre Julliard : netapi32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 015c947c81f92ffc4113f27e1c290e4a5414feb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/015c947c81f92ffc4113f27e1c290e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 22:25:51 2023 +0100 netapi32: Remove DECLSPEC_HIDDEN usage. --- dlls/netapi32/nbcmdqueue.h | 12 ++++++------ dlls/netapi32/nbnamecache.h | 8 ++++---- dlls/netapi32/netapi32.c | 8 ++++---- dlls/netapi32/netbios.h | 18 +++++++++--------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/netapi32/nbcmdqueue.h b/dlls/netapi32/nbcmdqueue.h index 57e64118591..9eb7075e7f0 100644 --- a/dlls/netapi32/nbcmdqueue.h +++ b/dlls/netapi32/nbcmdqueue.h @@ -30,12 +30,12 @@ struct NBCmdQueue; /* Allocates a new command queue from heap. */ -struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap) DECLSPEC_HIDDEN; +struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap); /* Adds ncb to queue. Assumes queue is not NULL, and ncb is not already in the * queue. If ncb is already in the queue, returns NRC_TOOMANY. */ -UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb) DECLSPEC_HIDDEN; +UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb); /* Cancels the given ncb. Blocks until the command completes. Implicitly * removes ncb from the queue. Assumes queue and ncb are not NULL, and that @@ -44,23 +44,23 @@ UCHAR NBCmdQueueAdd(struct NBCmdQueue *queue, PNCB ncb) DECLSPEC_HIDDEN; * completed before it could be cancelled, and various other return values for * different failures. */ -UCHAR NBCmdQueueCancel(struct NBCmdQueue *queue, PNCB ncb) DECLSPEC_HIDDEN; +UCHAR NBCmdQueueCancel(struct NBCmdQueue *queue, PNCB ncb); /* Sets the return code of the given ncb, and implicitly removes the command * from the queue. Assumes queue and ncb are not NULL, and that ncb has been * added to queue previously. * Returns NRC_GOODRET on success. */ -UCHAR NBCmdQueueComplete(struct NBCmdQueue *queue, PNCB ncb, UCHAR retcode) DECLSPEC_HIDDEN; +UCHAR NBCmdQueueComplete(struct NBCmdQueue *queue, PNCB ncb, UCHAR retcode); /* Cancels all pending commands in the queue (useful for a RESET or a shutdown). * Returns when all commands have been completed. */ -UCHAR NBCmdQueueCancelAll(struct NBCmdQueue *queue) DECLSPEC_HIDDEN; +UCHAR NBCmdQueueCancelAll(struct NBCmdQueue *queue); /* Frees all memory associated with the queue. Blocks until all commands * pending in the queue have been completed. */ -void NBCmdQueueDestroy(struct NBCmdQueue *queue) DECLSPEC_HIDDEN; +void NBCmdQueueDestroy(struct NBCmdQueue *queue); #endif /* __NBCMDQUEUE_H__ */ diff --git a/dlls/netapi32/nbnamecache.h b/dlls/netapi32/nbnamecache.h index 233f80024e4..ffefbc5b8a1 100644 --- a/dlls/netapi32/nbnamecache.h +++ b/dlls/netapi32/nbnamecache.h @@ -51,7 +51,7 @@ typedef struct _NBNameCacheEntry /* Allocates a new name cache from heap, and sets the expire time on new * entries to entryExpireTimeMS after a cache entry is added. */ -struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS) DECLSPEC_HIDDEN; +struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS); /* Adds an entry to the cache. The entry is assumed to have been allocated * from the same heap as the name cache; the name cache will own the entry @@ -60,14 +60,14 @@ struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS) DECL * same name was in the cache, the entry is replaced. Returns TRUE on success * or FALSE on failure. */ -BOOL NBNameCacheAddEntry(struct NBNameCache *cache, NBNameCacheEntry *entry) DECLSPEC_HIDDEN; +BOOL NBNameCacheAddEntry(struct NBNameCache *cache, NBNameCacheEntry *entry); /* Finds the entry with name name in the cache and returns a pointer to it, or * NULL if it isn't found. */ const NBNameCacheEntry *NBNameCacheFindEntry(struct NBNameCache *cache, - const UCHAR name[NCBNAMSZ]) DECLSPEC_HIDDEN; + const UCHAR name[NCBNAMSZ]); -void NBNameCacheDestroy(struct NBNameCache *cache) DECLSPEC_HIDDEN; +void NBNameCacheDestroy(struct NBNameCache *cache); #endif /* ndef __WINE_NBNAMECACHE_H */ diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d9694cc38e3..1cc36591ea4 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2774,17 +2774,17 @@ DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR server, ULONG flags, PDS_DOMAIN_TRU return ERROR_NO_LOGON_SERVERS; } -DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) +void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n); } -DECLSPEC_HIDDEN void __RPC_USER MIDL_user_free(void __RPC_FAR *p) +void __RPC_USER MIDL_user_free(void __RPC_FAR *p) { HeapFree(GetProcessHeap(), 0, p); } -DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) +handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) { static unsigned char ncalrpc[] = "ncalrpc"; unsigned char *binding_str; @@ -2798,7 +2798,7 @@ DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) return rpc_handle; } -DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) { RpcBindingFree(&rpc_handle); } diff --git a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h index 86fa9990838..7999029a7d6 100644 --- a/dlls/netapi32/netbios.h +++ b/dlls/netapi32/netbios.h @@ -32,8 +32,8 @@ * Public functions */ -void NetBIOSInit(void) DECLSPEC_HIDDEN; -void NetBIOSShutdown(void) DECLSPEC_HIDDEN; +void NetBIOSInit(void); +void NetBIOSShutdown(void); struct _NetBIOSTransport; @@ -41,7 +41,7 @@ struct _NetBIOSTransport; * a unique id (the transport_id of ACTION_HEADER, for example) and an * implementation. Returns TRUE on success, and FALSE on failure. */ -BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport) DECLSPEC_HIDDEN; +BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport); /* Registers an adapter with the given transport and ifIndex with NetBIOS. * ifIndex is an interface index usable by the IpHlpApi. ifIndex is not @@ -51,7 +51,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport) DEC * FIXME: need functions for retrieving the name and hardware index, rather * than assuming a correlation with IpHlpApi. */ -BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter) DECLSPEC_HIDDEN; +BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter); /* During enumeration, all adapters from your transport are disabled * internally. If an adapter is still valid, re-enable it with this function. @@ -59,13 +59,13 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter) DECLS * function (see below) called on them, and will be removed from the table. * (This is to deal with lack of plug-and-play--sorry.) */ -void NetBIOSEnableAdapter(UCHAR lana) DECLSPEC_HIDDEN; +void NetBIOSEnableAdapter(UCHAR lana); /* Gets a quick count of the number of NetBIOS adapters. Not guaranteed not * to change from one call to the next, depending on what's been enumerated * lately. See also NetBIOSEnumAdapters. */ -UCHAR NetBIOSNumAdapters(void) DECLSPEC_HIDDEN; +UCHAR NetBIOSNumAdapters(void); typedef struct _NetBIOSAdapterImpl { UCHAR lana; @@ -84,7 +84,7 @@ typedef BOOL (*NetBIOSEnumAdaptersCallback)(UCHAR totalLANAs, UCHAR lanaIndex, * Your callback should return FALSE if it no longer wishes to be called. */ void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, - void *closure) DECLSPEC_HIDDEN; + void *closure); /* Hangs up the session identified in the NCB; the NCB need not be a NCBHANGUP. * Will result in the transport's hangup function being called, so release any @@ -92,7 +92,7 @@ void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, * This function is intended for use by a transport, if the session is closed * by some error in the transport layer. */ -void NetBIOSHangupSession(const NCB *ncb) DECLSPEC_HIDDEN; +void NetBIOSHangupSession(const NCB *ncb); /** * Functions a transport implementation must implement @@ -178,6 +178,6 @@ typedef struct _NetBIOSTransport /* Not defined by MS, so make my own private define: */ #define TRANSPORT_NBT "MNBT" -void NetBTInit(void) DECLSPEC_HIDDEN; +void NetBTInit(void); #endif /* ndef __WINE_NETBIOS_H__ */

1 0

Alexandre Julliard : secur32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Nov '23

23 Nov '23

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

Anton Baskanov : dmime: Factor out timeout computation.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: a6929a54ba306ec9b146f725cc1c1a9265ffac7a URL: https://gitlab.winehq.org/wine/wine/-/commit/a6929a54ba306ec9b146f725cc1c1a… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 22 14:31:13 2023 +0700 dmime: Factor out timeout computation. --- dlls/dmime/performance.c | 68 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index f4504c4d36f..eccc1f83683 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -110,7 +110,44 @@ static void performance_queue_message(struct performance *This, struct message * list_add_after(&prev->entry, &message->entry); } -static HRESULT performance_process_message(struct performance *This, DMUS_PMSG *msg, DWORD *timeout) +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; + IDirectMusicPerformance *performance = (IDirectMusicPerformance *)&This->IDirectMusicPerformance8_iface; + REFERENCE_TIME latency, offset = 0; + struct message *message; + struct list *ptr; + + if (!(ptr = list_head(&This->messages))) + return NULL; + message = LIST_ENTRY(ptr, struct message, entry); + + if (FAILED(IDirectMusicPerformance_GetLatencyTime(performance, &latency))) + return NULL; + + switch (message->msg.dwFlags & delivery_flags) + { + 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; + /* fallthrough */ + case DMUS_PMSGF_TOOL_ATTIME: + if (message->msg.rtTime >= offset && message->msg.rtTime - offset >= latency) + { + *timeout = (message->msg.rtTime - offset - latency) / 10000; + return NULL; + } + break; + } + + return message; +} + +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; @@ -137,10 +174,7 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * /* fallthrough */ case DMUS_PMSGF_TOOL_ATTIME: if (msg->rtTime >= offset && msg->rtTime - offset >= latency) - { - if (timeout) *timeout = (msg->rtTime - offset - latency) / 10000; return DMUS_S_REQUEUE; - } hr = IDirectMusicTool_ProcessPMsg(tool, performance, msg); break; @@ -155,8 +189,7 @@ static HRESULT performance_process_message(struct performance *This, DMUS_PMSG * static DWORD WINAPI message_thread_proc(void *args) { struct performance *This = args; - HRESULT hr = DMUS_S_REQUEUE; - struct list *ptr; + HRESULT hr; TRACE("performance %p message thread\n", This); SetThreadDescription(GetCurrentThread(), L"wine_dmime_message"); @@ -166,20 +199,21 @@ static DWORD WINAPI message_thread_proc(void *args) while (This->message_thread) { DWORD timeout = INFINITE; + struct message *message; + struct list *next; - while ((ptr = list_head(&This->messages))) + if (!(message = performance_get_message(This, &timeout))) { - struct message *message = LIST_ENTRY(ptr, struct message, entry); - struct list *next = ptr->next; - list_remove(&message->entry); - list_init(&message->entry); - - hr = performance_process_message(This, &message->msg, &timeout); - if (hr == DMUS_S_REQUEUE) performance_queue_message(This, message, next); - if (hr != S_OK) break; + SleepConditionVariableCS(&This->cond, &This->safe, timeout); + continue; } + next = message->entry.next; + + list_remove(&message->entry); + list_init(&message->entry); - SleepConditionVariableCS(&This->cond, &This->safe, timeout); + hr = performance_process_message(This, &message->msg); + if (hr == DMUS_S_REQUEUE) performance_queue_message(This, message, next); } LeaveCriticalSection(&This->safe); @@ -824,7 +858,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS if (msg->dwFlags & DMUS_PMSGF_TOOL_IMMEDIATE) { - hr = performance_process_message(This, &message->msg, NULL); + hr = performance_process_message(This, &message->msg); if (hr != DMUS_S_REQUEUE) goto done; }

1 0

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

23 Nov '23

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

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

23 Nov '23

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

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

23 Nov '23

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