February 2022 - Wine-Commits

Zebediah Figura : wined3d: Use wined3d_context_copy_bo_address() to download buffer ranges.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 57c58c46bb43e825baf49b21263c615ad83962f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c58c46bb43e825baf49b21… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 17:57:20 2022 -0600 wined3d: Use wined3d_context_copy_bo_address() to download buffer ranges. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 56 +++++---------------------------------------------- 1 file changed, 5 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bc6d9a67d6e..cab93ccc4e3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -43,8 +43,6 @@ struct wined3d_buffer_ops struct wined3d_context *context, unsigned int location); void (*buffer_unload_location)(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location); - void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); }; static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) @@ -139,14 +137,6 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc wined3d_buffer_invalidate_range(buffer, location, 0, 0); } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) -{ - const struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(buffer_gl->b.buffer_object); - - wined3d_context_gl_bind_bo(context_gl, bo_gl->binding, bo_gl->id); -} - static GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) { if (!bind_flags) @@ -628,10 +618,13 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, } else { + dst.buffer_object = NULL; + dst.addr = buffer->resource.heap_memory; + src.buffer_object = buffer->buffer_object; + src.addr = NULL; range.offset = 0; range.size = buffer->resource.size; - buffer->buffer_ops->buffer_download_ranges(buffer, context, - buffer->resource.heap_memory, 0, 1, &range); + wined3d_context_copy_bo_address(context, &dst, &src, 1, &range); } break; @@ -1351,17 +1344,10 @@ static void wined3d_buffer_no3d_unload_location(struct wined3d_buffer *buffer, TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); } -static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - FIXME("Not implemented.\n"); -} - static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { wined3d_buffer_no3d_prepare_location, wined3d_buffer_no3d_unload_location, - wined3d_buffer_no3d_download_ranges, }; HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wined3d_device *device, @@ -1419,35 +1405,10 @@ static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer, } } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(buffer->buffer_object); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_range *range; - - TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", - buffer, context, data, data_offset, range_count, ranges); - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glGetBufferSubData(bo_gl->binding, bo_gl->b.buffer_offset + range->offset, - range->size, (BYTE *)data + range->offset - data_offset)); - } - checkGLcall("buffer download"); -} - static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_prepare_location, wined3d_buffer_gl_unload_location, - wined3d_buffer_gl_download_ranges, }; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, @@ -1597,17 +1558,10 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, } } -static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) -{ - FIXME("Not implemented.\n"); -} - static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { wined3d_buffer_vk_prepare_location, wined3d_buffer_vk_unload_location, - wined3d_buffer_vk_download_ranges, }; HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device,

1 0

Connor McAdams : wined3d: Fix comment in wined3d_texture_vk_download_data().
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 0dcdfae29a671a3fbaaae1b2299324d9c51d1faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dcdfae29a671a3fbaaae1b2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Feb 14 12:59:42 2022 -0500 wined3d: Fix comment in wined3d_texture_vk_download_data(). For download, vkCmdCopyImageToBuffer() is used, not vkCmdCopyBufferToImage(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e1f20887840..18925338285 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4953,7 +4953,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, return; } - /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ + /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyImageToBuffer() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); if (!dst_bo_addr->buffer_object)

1 0

Sven Baars : rsaenh: Properly destroy hashes created by CPCreateHash() (Valgrind).
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: f0987134b44bbac43ac21efc2d973bd4022fc375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0987134b44bbac43ac21efc… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Feb 15 12:45:47 2022 +0100 rsaenh: Properly destroy hashes created by CPCreateHash() (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index c913c0c71ee..d03f647832e 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -594,13 +594,14 @@ static BOOL copy_hmac_info(PHMAC_INFO *dst, const HMAC_INFO *src) { * Destructor for hash objects * * PARAMS - * pCryptHash [I] Pointer to the hash object to be destroyed. + * pCryptHash [I] Pointer to the hash object to be destroyed. * Will be invalid after function returns! */ static void destroy_hash(OBJECTHDR *pObject) { CRYPTHASH *pCryptHash = (CRYPTHASH*)pObject; - + + BCryptDestroyHash(pCryptHash->hash_handle); free_hmac_info(pCryptHash->pHMACInfo); free_data_blob(&pCryptHash->tpPRFParams.blobLabel); free_data_blob(&pCryptHash->tpPRFParams.blobSeed); @@ -708,6 +709,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + pCryptHash->hash_handle = NULL; } break; @@ -719,6 +721,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { default: finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + pCryptHash->hash_handle = NULL; } } @@ -2211,6 +2214,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, pCryptHash->hProv = hProv; pCryptHash->dwState = RSAENH_HASHSTATE_HASHING; pCryptHash->pHMACInfo = NULL; + pCryptHash->hash_handle = NULL; pCryptHash->dwHashSize = peaAlgidInfo->dwDefaultLen >> 3; init_data_blob(&pCryptHash->tpPRFParams.blobLabel); init_data_blob(&pCryptHash->tpPRFParams.blobSeed);

1 0

Jacek Caban : win32u: Move GetInputState implementation from user32.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 308ca7f6b1163a40724339b7f0d53034bf6a1073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=308ca7f6b1163a40724339b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 13:10:51 2022 +0100 win32u: Move GetInputState implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 13 +------------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 19 +++++++++++++++++++ dlls/win32u/sysparams.c | 15 +++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 7 +++++++ 8 files changed, 52 insertions(+), 13 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 9d7b24c7b82..99f6bcb159b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -450,18 +450,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) */ BOOL WINAPI GetInputState(void) { - DWORD ret; - - check_for_events( QS_INPUT ); - - SERVER_START_REQ( get_queue_status ) - { - req->clear_bits = 0; - wine_server_call( req ); - ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); - } - SERVER_END_REQ; - return ret; + return NtUserCallNoParam( NtUserGetInputState ); } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 0dc41e7730c..ca71850e86f 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1150,6 +1150,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallNoParam, NtUserCallOneParam, NtUserCallTwoParam, NtUserChangeDisplaySettings, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index d91931768c0..b576660c8a5 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -159,6 +159,25 @@ DWORD WINAPI NtUserGetQueueStatus( UINT flags ) return ret; } +/*********************************************************************** + * get_input_state + */ +DWORD get_input_state(void) +{ + DWORD ret; + + check_for_events( QS_INPUT ); + + SERVER_START_REQ( get_queue_status ) + { + req->clear_bits = 0; + wine_server_call( req ); + ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); + } + SERVER_END_REQ; + return ret; +} + /*********************************************************************** * get_locale_kbd_layout */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6d1d6689bfe..816ce5ecded 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4483,6 +4483,21 @@ static BOOL message_beep( UINT i ) return TRUE; } +/*********************************************************************** + * NtUserCallOneParam (win32u.@) + */ +ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) +{ + switch(code) + { + case NtUserGetInputState: + return get_input_state(); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} + /*********************************************************************** * NtUserCallOneParam (win32u.@) */ diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 15efb8d9645..03e37e14f0b 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -778,7 +778,7 @@ @ stub NtUserCallHwndSafe @ stub NtUserCallMsgFilter @ stub NtUserCallNextHookEx -@ stub NtUserCallNoParam +@ stdcall NtUserCallNoParam(long) @ stdcall NtUserCallOneParam(long long) @ stdcall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 4630813cdd2..fa87db16829 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -192,6 +192,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, @@ -248,6 +249,7 @@ extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; /* input.c */ extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; +extern DWORD get_input_state(void) DECLSPEC_HIDDEN; /* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 8e39953c782..44b7e267a06 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -701,6 +701,12 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) return unix_funcs->pNtUserActivateKeyboardLayout( layout, flags ); } +ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserCallNoParam( code ); +} + ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) { if (!unix_funcs) return 0; diff --git a/include/ntuser.h b/include/ntuser.h index fa32370a90a..029da87c7b2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -49,6 +49,12 @@ struct enum_display_monitor_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 +/* NtUserCallNoParam codes, not compatible with Windows */ +enum +{ + NtUserGetInputState, +}; + /* NtUserCallOneParam codes, not compatible with Windows */ enum { @@ -133,6 +139,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); +ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ); ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ); ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd,

1 0

Sven Baars : rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: bb4c43de94720357bbabac489963df006c1783a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4c43de94720357bbabac48… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Feb 15 12:45:46 2022 +0100 rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 20 ++++++++++---------- dlls/rsaenh/implglue.h | 14 +++++--------- dlls/rsaenh/rsaenh.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 9d90ad70f53..d98a08b2f31 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -32,8 +32,8 @@ /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); - -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) + +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) { BCRYPT_ALG_HANDLE provider; NTSTATUS status; @@ -74,27 +74,27 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + status = BCryptCreateHash(provider, hash_handle, NULL, 0, NULL, 0, 0); BCryptCloseAlgorithmProvider(provider, 0); return !status; } -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) { - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); + BCryptHashData(hash_handle, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) { - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); + BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(hash_handle); return TRUE; } -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) { - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + return !BCryptDuplicateHash(src_hash_handle, dest_hash_handle, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 9be642e9b60..06fa3f4430a 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,10 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -typedef union tagHASH_CONTEXT { - BCRYPT_HASH_HANDLE bcrypt_hash; -} HASH_CONTEXT; - typedef union tagKEY_CONTEXT { rc2_key rc2; des_key des; @@ -42,12 +38,12 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, +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(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, + BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; 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; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a4deb80b0e1..c913c0c71ee 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -58,7 +58,7 @@ typedef struct tagCRYPTHASH HCRYPTPROV hProv; DWORD dwHashSize; DWORD dwState; - HASH_CONTEXT context; + BCRYPT_HASH_HANDLE hash_handle; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; @@ -627,8 +627,8 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -642,7 +642,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { return TRUE; default: - return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context); + return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->hash_handle); } } @@ -664,7 +664,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); break; case CALG_MAC: @@ -677,7 +677,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); } } @@ -699,15 +699,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(&pCryptHash->context, + update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } break; @@ -718,7 +718,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } } @@ -2371,7 +2371,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(pSrcHash->hash_handle, &pDestHash->hash_handle); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed);

1 0

Nikolay Sivov : winepulse: Use FAILED() instead of non-zero result check.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 820c77319db2ad097f900f07c7596e125c7e615d URL: https://source.winehq.org/git/wine.git/?a=commit;h=820c77319db2ad097f900f07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:50:47 2022 +0300 winepulse: Use FAILED() instead of non-zero result check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e18d8a..e3d5ea91cf5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -344,7 +344,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); - if (hr) { + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; }

1 0

Alexandre Julliard : api-ms-*: Forward to shcore instead of shell32.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: e2187d4fe142b1f8322ecc46832f26f4f76680ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2187d4fe142b1f8322ecc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:38:02 2022 +0100 api-ms-*: Forward to shcore instead of shell32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shell32-l1-1-0.spec | 6 +++--- tools/make_specfiles | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec index 9d03c03f8b7..5484bdecc70 100644 --- a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec @@ -1,3 +1,3 @@ -@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW -@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID -@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stdcall CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shcore.GetCurrentProcessExplicitAppUserModelID +@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shcore.SetCurrentProcessExplicitAppUserModelID diff --git a/tools/make_specfiles b/tools/make_specfiles index 3f1370a01f3..157337ee01a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -375,6 +375,7 @@ my @dll_groups = [ "shcore", "api-ms-win-core-featurestaging-l1-1-0", + "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-downlevel-shlwapi-l2-1-0", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-scaling-l1-1-0", @@ -385,7 +386,6 @@ my @dll_groups = ], [ "shell32", - "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0", "api-ms-win-shell-shellfolders-l1-1-0", "ext-ms-win-shell-shell32-l1-2-0",

1 0

Alexandre Julliard : make_specfiles: Sort the ApiSet dlls by name.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: ef83ca16786af166db36b625a68d67a70cc4a8cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef83ca16786af166db36b625… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 14:59:11 2022 +0100 make_specfiles: Sort the ApiSet dlls by name. To make it easier to find a specific one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_specfiles | 103 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 594e01396db..fb8c9f90377 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -118,13 +118,12 @@ my @dll_groups = [ "advapi32", "api-ms-win-core-localregistry-l1-1-0", - "api-ms-win-downlevel-advapi32-l1-1-0", - "api-ms-win-downlevel-advapi32-l2-1-0", - "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", "api-ms-win-core-registry-l2-1-0", "api-ms-win-core-registry-l2-2-0", "api-ms-win-core-shutdown-l1-1-0", + "api-ms-win-downlevel-advapi32-l1-1-0", + "api-ms-win-downlevel-advapi32-l2-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0", "api-ms-win-eventing-controller-l1-1-0", @@ -133,6 +132,7 @@ my @dll_groups = "api-ms-win-eventlog-legacy-l1-1-0", "api-ms-win-perf-legacy-l1-1-0", "api-ms-win-security-audit-l1-1-1", + "api-ms-win-security-base-l1-1-0", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", @@ -208,10 +208,15 @@ my @dll_groups = "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1", - "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", "api-ms-win-core-comm-l1-1-0", + "api-ms-win-core-console-l1-1-0", + "api-ms-win-core-console-l1-2-0", + "api-ms-win-core-console-l2-1-0", + "api-ms-win-core-console-l3-2-0", + "api-ms-win-core-datetime-l1-1-0", + "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-delayload-l1-1-0", @@ -220,40 +225,24 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-errorhandling-l1-1-2", "api-ms-win-core-errorhandling-l1-1-3", - "api-ms-win-core-interlocked-l1-1-0", - "api-ms-win-core-interlocked-l1-2-0", - "api-ms-win-core-misc-l1-1-0", - "api-ms-win-core-profile-l1-1-0", - "api-ms-win-core-realtime-l1-1-0", - "api-ms-win-core-realtime-l1-1-1", - "api-ms-win-core-sidebyside-l1-1-0", - "api-ms-win-core-string-l1-1-0", - "api-ms-win-core-string-obsolete-l1-1-0", - "api-ms-win-core-sysinfo-l1-1-0", - "api-ms-win-core-sysinfo-l1-2-0", - "api-ms-win-core-util-l1-1-0", - "api-ms-win-core-synch-ansi-l1-1-0", - "api-ms-win-core-synch-l1-1-0", - "api-ms-win-core-synch-l1-2-0", - "api-ms-win-core-synch-l1-2-1", - "api-ms-win-core-console-l1-1-0", - "api-ms-win-core-console-l1-2-0", - "api-ms-win-core-console-l2-1-0", - "api-ms-win-core-console-l3-2-0", + "api-ms-win-core-fibers-l1-1-0", + "api-ms-win-core-fibers-l1-1-1", + "api-ms-win-core-file-ansi-l2-1-0", + "api-ms-win-core-file-fromapp-l1-1-0", "api-ms-win-core-file-l1-1-0", - "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0", + "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-2", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-file-l2-1-2", - "api-ms-win-core-file-ansi-l2-1-0", - "api-ms-win-core-file-fromapp-l1-1-0", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0", "api-ms-win-core-heap-l2-1-0", "api-ms-win-core-heap-obsolete-l1-1-0", + "api-ms-win-core-interlocked-l1-1-0", + "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-io-l1-1-0", "api-ms-win-core-io-l1-1-1", "api-ms-win-core-job-l1-1-0", @@ -269,6 +258,8 @@ my @dll_groups = "api-ms-win-core-libraryloader-l2-1-0", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", + "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-localization-l1-2-2", "api-ms-win-core-localization-l2-1-0", "api-ms-win-core-localization-obsolete-l1-1-0", "api-ms-win-core-localization-obsolete-l1-2-0", @@ -279,36 +270,44 @@ my @dll_groups = "api-ms-win-core-memory-l1-1-2", "api-ms-win-core-memory-l1-1-3", "api-ms-win-core-memory-l1-1-4", + "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-namespace-l1-1-0", "api-ms-win-core-normalization-l1-1-0", "api-ms-win-core-privateprofile-l1-1-1", "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", - "api-ms-win-core-psapi-l1-1-0", + "api-ms-win-core-processtopology-l1-1-0", + "api-ms-win-core-processtopology-obsolete-l1-1-0", + "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-psapi-ansi-l1-1-0", + "api-ms-win-core-psapi-l1-1-0", "api-ms-win-core-psapi-obsolete-l1-1-0", + "api-ms-win-core-realtime-l1-1-0", + "api-ms-win-core-realtime-l1-1-1", + "api-ms-win-core-sidebyside-l1-1-0", + "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-string-obsolete-l1-1-0", + "api-ms-win-core-synch-ansi-l1-1-0", + "api-ms-win-core-synch-l1-1-0", + "api-ms-win-core-synch-l1-2-0", + "api-ms-win-core-synch-l1-2-1", + "api-ms-win-core-sysinfo-l1-1-0", + "api-ms-win-core-sysinfo-l1-2-0", + "api-ms-win-core-sysinfo-l1-2-1", "api-ms-win-core-threadpool-l1-1-0", "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-threadpool-private-l1-1-0", "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-toolhelp-l1-1-0", - "api-ms-win-core-sysinfo-l1-2-1", - "api-ms-win-core-fibers-l1-1-0", - "api-ms-win-core-fibers-l1-1-1", - "api-ms-win-core-localization-l1-2-1", - "api-ms-win-core-localization-l1-2-2", - "api-ms-win-core-datetime-l1-1-0", - "api-ms-win-core-datetime-l1-1-1", + "api-ms-win-core-util-l1-1-0", "api-ms-win-core-windowserrorreporting-l1-1-0", "api-ms-win-core-windowserrorreporting-l1-1-1", "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-wow64-l1-1-1", "api-ms-win-core-xstate-l2-1-0", - "api-ms-win-core-processtopology-l1-1-0", - "api-ms-win-core-processtopology-obsolete-l1-1-0", - "api-ms-win-core-util-l1-1-0", "api-ms-win-downlevel-kernel32-l2-1-0", + "api-ms-win-downlevel-normaliz-l1-1-0", "ext-ms-win-kernel32-package-current-l1-1-0", "ext-ms-win-kernel32-package-l1-1-1", ], @@ -353,9 +352,9 @@ my @dll_groups = ], [ "ole32", - "api-ms-win-downlevel-ole32-l1-1-0", "api-ms-win-core-com-l1-1-0", "api-ms-win-core-com-l1-1-1", + "api-ms-win-downlevel-ole32-l1-1-0", "iprop", ], [ @@ -374,11 +373,11 @@ my @dll_groups = "shcore", "shell32", "api-ms-win-shcore-obsolete-l1-1-0", - "api-ms-win-shcore-thread-l1-1-0", - "api-ms-win-shcore-stream-l1-1-0", - "api-ms-win-shcore-stream-winrt-l1-1-0", "api-ms-win-shcore-scaling-l1-1-0", "api-ms-win-shcore-scaling-l1-1-1", + "api-ms-win-shcore-stream-l1-1-0", + "api-ms-win-shcore-stream-winrt-l1-1-0", + "api-ms-win-shcore-thread-l1-1-0", ], [ "shell32", @@ -389,21 +388,23 @@ my @dll_groups = ], [ "shlwapi", - "api-ms-win-downlevel-shlwapi-l1-1-0", - "api-ms-win-downlevel-shlwapi-l2-1-0", "api-ms-win-core-registryuserspecific-l1-1-0", "api-ms-win-core-shlwapi-legacy-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-2-0", "api-ms-win-core-url-l1-1-0", + "api-ms-win-downlevel-shlwapi-l1-1-0", + "api-ms-win-downlevel-shlwapi-l2-1-0", ], [ "user32", + "api-ms-win-core-string-l2-1-0", "api-ms-win-core-stringansi-l1-1-0", "api-ms-win-core-stringloader-l1-1-1", - "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", + "api-ms-win-ntuser-rectangle-l1-1-0", + "api-ms-win-ntuser-sysparams-l1-1-0", "api-ms-win-rtcore-ntuser-draw-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-4", @@ -425,14 +426,12 @@ my @dll_groups = "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-private-l1-3-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", - "api-ms-win-ntuser-rectangle-l1-1-0", - "api-ms-win-ntuser-sysparams-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", - "ext-ms-win-ntuser-windowclass-l1-1-0", - "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-0", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-ntuser-window-l1-1-4", + "ext-ms-win-ntuser-windowclass-l1-1-0", + "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-rtcore-ntuser-cursor-l1-1-0", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", @@ -443,10 +442,10 @@ my @dll_groups = ], [ "version", - "api-ms-win-core-versionansi-l1-1-0", "api-ms-win-core-version-l1-1-0", "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", + "api-ms-win-core-versionansi-l1-1-0", "api-ms-win-downlevel-version-l1-1-0", ], [ @@ -461,10 +460,10 @@ my @dll_groups = "ntdll", "ntoskrnl.exe", "api-ms-win-core-apiquery-l1-1-0", - "api-ms-win-core-rtlsupport-l1-1-0", - "api-ms-win-core-rtlsupport-l1-2-0", "api-ms-win-core-crt-l1-1-0", "api-ms-win-core-crt-l2-1-0", + "api-ms-win-core-rtlsupport-l1-1-0", + "api-ms-win-core-rtlsupport-l1-2-0", ], [ "gdi32",

1 0

Hans Leidekker : webservices/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 30e9711375c34bb6dd16ebd6f3bf4108b2ff284e URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e9711375c34bb6dd16ebd6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 15 10:32:50 2022 +0100 webservices/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 - dlls/webservices/tests/channel.c | 378 +++--- dlls/webservices/tests/msg.c | 502 +++---- dlls/webservices/tests/proxy.c | 118 +- dlls/webservices/tests/reader.c | 2576 ++++++++++++++++++------------------ dlls/webservices/tests/url.c | 42 +- dlls/webservices/tests/writer.c | 1604 +++++++++++----------- 7 files changed, 2610 insertions(+), 2611 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=30e9711375c34bb6dd16…

1 0

Eric Pouech : msacm32: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: d1ee1d68c0fbf555a7f5d88477d027f1579231a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1ee1d68c0fbf555a7f5d884… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:35 2022 +0100 msacm32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/Makefile.in | 1 - dlls/msacm32/driver.c | 26 +++++++++++++------------- dlls/msacm32/filter.c | 12 ++++++------ dlls/msacm32/format.c | 26 +++++++++++++------------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/msacm32_main.c | 4 ++-- dlls/msacm32/pcmconverter.c | 24 ++++++++++++------------ dlls/msacm32/stream.c | 24 ++++++++++++------------ 8 files changed, 65 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1ee1d68c0fbf555a7f5…

1 0