- Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Read the thread message queue masks from the shared memory.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: f41c434b88c63984082ad9d4627bef5d51434871 URL: https://gitlab.winehq.org/wine/wine/-/commit/f41c434b88c63984082ad9d4627bef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 25 16:42:46 2024 +0200 win32u: Read the thread message queue masks from the shared memory. --- dlls/win32u/message.c | 34 +++++++++++++++++++--------------- dlls/win32u/ntuser_private.h | 2 -- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 3099f5a6660..d8cb6f395b2 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2708,8 +2708,6 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) free( buffer ); if (res == STATUS_PENDING) { - thread_info->wake_mask = filter->mask & (QS_SENDMESSAGE | QS_SMRESULT); - thread_info->changed_mask = filter->mask; return 0; } if (res != STATUS_BUFFER_OVERFLOW) @@ -3017,6 +3015,23 @@ static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DW return ret; } +/*********************************************************************** + * check_queue_masks + */ +static BOOL check_queue_masks( UINT wake_mask, UINT changed_mask ) +{ + struct object_lock lock = OBJECT_LOCK_INIT; + const queue_shm_t *queue_shm; + BOOL skip = FALSE; + UINT status; + + while ((status = get_shared_queue( &lock, &queue_shm )) == STATUS_PENDING) + skip = queue_shm->wake_mask == wake_mask && queue_shm->changed_mask == changed_mask; + + if (status) return FALSE; + return skip; +} + /*********************************************************************** * wait_objects * @@ -3025,14 +3040,11 @@ static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DW static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, DWORD wake_mask, DWORD changed_mask, DWORD flags ) { - struct user_thread_info *thread_info = get_user_thread_info(); - DWORD ret; - assert( count ); /* we must have at least the server queue */ flush_window_surfaces( TRUE ); - if (thread_info->wake_mask != wake_mask || thread_info->changed_mask != changed_mask) + if (!check_queue_masks( wake_mask, changed_mask )) { SERVER_START_REQ( set_queue_mask ) { @@ -3042,14 +3054,9 @@ static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, wine_server_call( req ); } SERVER_END_REQ; - thread_info->wake_mask = wake_mask; - thread_info->changed_mask = changed_mask; } - ret = wait_message( count, handles, timeout, changed_mask, flags ); - - if (ret != WAIT_TIMEOUT) thread_info->wake_mask = thread_info->changed_mask = 0; - return ret; + return wait_message( count, handles, timeout, changed_mask, flags ); } static HANDLE normalize_std_handle( HANDLE handle ) @@ -3314,7 +3321,6 @@ done: */ static void wait_message_reply( UINT flags ) { - struct user_thread_info *thread_info = get_user_thread_info(); HANDLE server_queue = get_server_queue_handle(); unsigned int wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); @@ -3331,8 +3337,6 @@ static void wait_message_reply( UINT flags ) } SERVER_END_REQ; - thread_info->wake_mask = thread_info->changed_mask = 0; - if (wake_bits & QS_SMRESULT) return; /* got a result */ if (wake_bits & QS_SENDMESSAGE) { diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 44edadad8f8..e9d407efb14 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -108,8 +108,6 @@ struct user_thread_info { struct ntuser_thread_info client_info; /* Data shared with client */ HANDLE server_queue; /* Handle to server-side queue */ - DWORD wake_mask; /* Current queue wake mask */ - DWORD changed_mask; /* Current queue changed mask */ WORD message_count; /* Get/PeekMessage loop counter */ WORD hook_call_depth; /* Number of recursively called hook procs */ WORD hook_unicode; /* Is current hook unicode? */

1 0

Rémi Bernon : server: Move thread message queue masks to the shared mapping.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: faa10ba7b536f16fb56728a9c6d99e6ce0cd6388 URL: https://gitlab.winehq.org/wine/wine/-/commit/faa10ba7b536f16fb56728a9c6d99e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 22:40:56 2024 +0100 server: Move thread message queue masks to the shared mapping. --- include/wine/server_protocol.h | 4 ++- server/protocol.def | 2 ++ server/queue.c | 60 ++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 15 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0516d23d3ee..f6cde739a84 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -900,6 +900,8 @@ typedef volatile struct typedef volatile struct { int hooks_count[WH_MAX - WH_MIN + 2]; + unsigned int wake_mask; + unsigned int changed_mask; } queue_shm_t; typedef volatile union @@ -6587,7 +6589,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 819 +#define SERVER_PROTOCOL_VERSION 820 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 33fd7a96e03..6b0ab8ae466 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -916,6 +916,8 @@ typedef volatile struct typedef volatile struct { int hooks_count[WH_MAX - WH_MIN + 2]; /* active hooks count */ + unsigned int wake_mask; /* wakeup mask */ + unsigned int changed_mask; /* changed wakeup mask */ } queue_shm_t; typedef volatile union diff --git a/server/queue.c b/server/queue.c index 53306f46793..d79b4839733 100644 --- a/server/queue.c +++ b/server/queue.c @@ -126,9 +126,7 @@ struct msg_queue struct object obj; /* object header */ struct fd *fd; /* optional file descriptor to poll */ unsigned int wake_bits; /* wakeup bits */ - unsigned int wake_mask; /* wakeup mask */ unsigned int changed_bits; /* changed wakeup bits */ - unsigned int changed_mask; /* changed wakeup mask */ int paint_count; /* pending paint messages count */ int hotkey_count; /* pending hotkey messages count */ int quit_message; /* is there a pending quit message? */ @@ -303,9 +301,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ { queue->fd = NULL; queue->wake_bits = 0; - queue->wake_mask = 0; queue->changed_bits = 0; - queue->changed_mask = 0; queue->paint_count = 0; queue->hotkey_count = 0; queue->quit_message = 0; @@ -332,6 +328,8 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ SHARED_WRITE_BEGIN( queue->shared, queue_shm_t ) { memset( (void *)shared->hooks_count, 0, sizeof(shared->hooks_count) ); + shared->wake_mask = 0; + shared->changed_mask = 0; } SHARED_WRITE_END; @@ -642,7 +640,9 @@ void add_queue_hook_count( struct thread *thread, unsigned int index, int count /* check the queue status */ static inline int is_signaled( struct msg_queue *queue ) { - return ((queue->wake_bits & queue->wake_mask) || (queue->changed_bits & queue->changed_mask)); + const queue_shm_t *queue_shm = queue->shared; + return (queue->wake_bits & queue_shm->wake_mask) || + (queue->changed_bits & queue_shm->changed_mask); } /* set some queue bits */ @@ -1179,8 +1179,9 @@ static void msg_queue_remove_queue(struct object *obj, struct wait_queue_entry * static void msg_queue_dump( struct object *obj, int verbose ) { struct msg_queue *queue = (struct msg_queue *)obj; + const queue_shm_t *queue_shm = queue->shared; fprintf( stderr, "Msg queue bits=%x mask=%x\n", - queue->wake_bits, queue->wake_mask ); + queue->wake_bits, queue_shm->wake_mask ); } static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -1203,8 +1204,14 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - queue->wake_mask = 0; - queue->changed_mask = 0; + const queue_shm_t *queue_shm = queue->shared; + + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) + { + shared->wake_mask = 0; + shared->changed_mask = 0; + } + SHARED_WRITE_END; } static void msg_queue_destroy( struct object *obj ) @@ -1313,7 +1320,9 @@ static int check_queue_input_window( struct msg_queue *queue, user_handle_t wind void check_thread_queue_idle( struct thread *thread ) { struct msg_queue *queue = thread->queue; - if ((queue->wake_mask & QS_SMRESULT)) return; + const queue_shm_t *queue_shm = queue->shared; + + if ((queue_shm->wake_mask & QS_SMRESULT)) return; if (thread->process->idle_event) set_event( thread->process->idle_event ); } @@ -2937,14 +2946,29 @@ DECL_HANDLER(set_queue_mask) if (queue) { - queue->wake_mask = req->wake_mask; - queue->changed_mask = req->changed_mask; + const queue_shm_t *queue_shm = queue->shared; + + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) + { + shared->wake_mask = req->wake_mask; + shared->changed_mask = req->changed_mask; + } + SHARED_WRITE_END; + reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; if (is_signaled( queue )) { /* if skip wait is set, do what would have been done in the subsequent wait */ - if (req->skip_wait) queue->wake_mask = queue->changed_mask = 0; + if (req->skip_wait) + { + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) + { + shared->wake_mask = 0; + shared->changed_mask = 0; + } + SHARED_WRITE_END; + } else wake_up( &queue->obj, 0 ); } } @@ -3108,6 +3132,7 @@ DECL_HANDLER(get_message) struct list *ptr; struct msg_queue *queue = get_current_queue(); user_handle_t get_win = get_user_full_handle( req->get_win ); + const queue_shm_t *queue_shm; unsigned int filter = req->flags >> 16; if (get_win && get_win != 1 && get_win != -1 && !get_user_object( get_win, USER_WINDOW )) @@ -3117,6 +3142,7 @@ DECL_HANDLER(get_message) } if (!queue) return; + queue_shm = queue->shared; /* check for any hardware internal message */ if (get_hardware_message( current, req->hw_id, get_win, WM_WINE_FIRST_DRIVER_MSG, @@ -3200,8 +3226,14 @@ DECL_HANDLER(get_message) } if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event ); - queue->wake_mask = req->wake_mask; - queue->changed_mask = req->changed_mask; + + SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) + { + shared->wake_mask = req->wake_mask; + shared->changed_mask = req->changed_mask; + } + SHARED_WRITE_END; + set_error( STATUS_PENDING ); /* FIXME */ }

1 0

Biswapriyo Nath : include: Add new names in D3D_NAME enum in d3dcommon.idl.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: c8eec0af70a590ab0830ce10d9dd98abb955f7c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8eec0af70a590ab0830ce10d9dd98… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jun 28 18:41:53 2024 +0000 include: Add new names in D3D_NAME enum in d3dcommon.idl. --- include/d3dcommon.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 5ffb4cd5b5b..7d3c486d049 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -658,6 +658,8 @@ typedef enum D3D_NAME D3D_NAME_COVERAGE, D3D_NAME_DEPTH_GREATER_EQUAL, D3D_NAME_DEPTH_LESS_EQUAL, + D3D_NAME_STENCIL_REF, + D3D_NAME_INNER_COVERAGE, D3D10_NAME_UNDEFINED = 0, D3D10_NAME_POSITION, D3D10_NAME_CLIP_DISTANCE, @@ -680,6 +682,11 @@ typedef enum D3D_NAME D3D10_NAME_COVERAGE, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D11_NAME_DEPTH_LESS_EQUAL, + D3D11_NAME_STENCIL_REF, + D3D11_NAME_INNER_COVERAGE, + D3D12_NAME_BARYCENTRICS = 23, + D3D12_NAME_SHADINGRATE, + D3D12_NAME_CULLPRIMITIVE, } D3D_NAME; typedef enum _D3D_SHADER_INPUT_TYPE

1 0

Biswapriyo Nath : include: Add macros for d3d12 shader version in d3d12shader.idl.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: f506bfd018aa28f22aeb7d28c15595829d111464 URL: https://gitlab.winehq.org/wine/wine/-/commit/f506bfd018aa28f22aeb7d28c15595… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jun 28 18:40:49 2024 +0000 include: Add macros for d3d12 shader version in d3d12shader.idl. --- include/d3d12shader.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl index f6cc35a843d..d66080f4b40 100644 --- a/include/d3d12shader.idl +++ b/include/d3d12shader.idl @@ -31,6 +31,10 @@ typedef enum D3D12_SHADER_VERSION_TYPE D3D12_SHVER_RESERVED0 = 0xfff0, } D3D12_SHADER_VERSION_TYPE; +cpp_quote("#define D3D12_SHVER_GET_TYPE(v) (((v) >> 16) & 0xffff)") +cpp_quote("#define D3D12_SHVER_GET_MAJOR(v) (((v) >> 4) & 0xf)") +cpp_quote("#define D3D12_SHVER_GET_MINOR(v) (((v) >> 0) & 0xf)") + typedef struct _D3D12_SHADER_DESC { UINT Version;

1 0

Elizabeth Figura : d3dx9/tests: Define COBJMACROS.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: d16c47625f8d9a1b180dd147332329ac61d16ee9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d16c47625f8d9a1b180dd147332329… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 19:19:26 2024 -0500 d3dx9/tests: Define COBJMACROS. --- dlls/d3dx9_36/tests/line.c | 1 + dlls/d3dx9_36/tests/math.c | 1 + dlls/d3dx9_36/tests/shader.c | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 8056e021c95..cdcb91715fe 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "wine/test.h" #include "d3dx9.h" diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 3345c412481..638d2bddc45 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "wine/test.h" #include "d3dx9.h" #include <math.h> diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2b40abef53c..f0c03052404 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "wine/test.h" #include "d3dx9.h"

1 0

Austin English : netapi32: Add NetGetAadJoinInformation stub.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: ce4674e1801ac7b6d4ea1a76f3502b2fb5b04ba1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce4674e1801ac7b6d4ea1a76f3502b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 30 20:29:04 2024 -0500 netapi32: Add NetGetAadJoinInformation stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56617 --- dlls/netapi32/netapi32.c | 9 +++++++++ dlls/netapi32/netapi32.spec | 1 + include/lmjoin.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 56da0cd640b..f7885f6e2c3 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2814,3 +2814,12 @@ void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle { RpcBindingFree(&rpc_handle); } + +/************************************************************ + * NetGetAadJoinInformation (NETAPI32.@) + */ +HRESULT WINAPI NetGetAadJoinInformation(LPCWSTR tenant_id, PDSREG_JOIN_INFO *join_info) +{ + FIXME("(%s, %p): stub\n", debugstr_w(tenant_id), join_info); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 4e19c3c53ba..19a03ad642a 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -93,6 +93,7 @@ @ stub NetFileClose @ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo +@ stdcall NetGetAadJoinInformation(wstr ptr) @ stdcall NetGetAnyDCName(wstr wstr ptr) @ stdcall NetGetDCName(wstr wstr ptr) @ stub NetGetDisplayInformationIndex diff --git a/include/lmjoin.h b/include/lmjoin.h index cf0896d3f23..f363259f990 100644 --- a/include/lmjoin.h +++ b/include/lmjoin.h @@ -23,6 +23,10 @@ extern "C" { #endif +#ifndef __WINCRYPT_H__ +typedef const struct _CERT_CONTEXT *PCCERT_CONTEXT; +#endif + typedef enum tagNETSETUP_JOIN_STATUS { NetSetupUnknownStatus = 0, @@ -31,11 +35,45 @@ typedef enum tagNETSETUP_JOIN_STATUS NetSetupDomainName } NETSETUP_JOIN_STATUS, *PNETSETUP_JOIN_STATUS; +typedef enum _DSREG_JOIN_TYPE +{ + DSREG_UNKNOWN_JOIN = 0, + DSREG_DEVICE_JOIN = 1, + DSREG_WORKPLACE_JOIN = 2 +} DSREG_JOIN_TYPE, *PDSREG_JOIN_TYPE; + +typedef struct _DSREG_USER_INFO +{ + LPWSTR pszUserEmail; + LPWSTR pszUserKeyId; + LPWSTR pszUserKeyName; +} DSREG_USER_INFO, *PDSREG_USER_INFO; + +typedef struct _DSREG_JOIN_INFO +{ + DSREG_JOIN_TYPE joinType; + PCCERT_CONTEXT pJoinCertificate; + LPWSTR pszDeviceId; + LPWSTR pszIdpDomain; + LPWSTR pszTenantId; + LPWSTR pszJoinUserEmail; + LPWSTR pszTenantDisplayName; + LPWSTR pszMdmEnrollmentUrl; + LPWSTR pszMdmTermsOfUseUrl; + LPWSTR pszMdmComplianceUrl; + LPWSTR pszUserSettingSyncUrl; + DSREG_USER_INFO *pUserInfo; +} DSREG_JOIN_INFO, *PDSREG_JOIN_INFO; + NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( LPCWSTR Server, LPWSTR *Name, PNETSETUP_JOIN_STATUS type); +HRESULT NET_API_FUNCTION NetGetAadJoinInformation( + LPCWSTR pcszTenantId, + PDSREG_JOIN_INFO *ppJoinInfo); + #ifdef __cplusplus } #endif

1 0

Biswapriyo Nath : include: Add flags for ID3D11ShaderReflection::GetRequiresFlags method in d3d11shader.h.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: fe510b5c5ce9222cc5f125044da6365c09d80b74 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe510b5c5ce9222cc5f125044da636… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jun 28 18:34:19 2024 +0000 include: Add flags for ID3D11ShaderReflection::GetRequiresFlags method in d3d11shader.h. --- include/d3d11shader.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 225c4344100..81d14fc3933 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -26,6 +26,16 @@ #define D3D_COMPILER_VERSION 47 #endif +#define D3D_SHADER_REQUIRES_DOUBLES 0x00000001 +#define D3D_SHADER_REQUIRES_EARLY_DEPTH_STENCIL 0x00000002 +#define D3D_SHADER_REQUIRES_UAVS_AT_EVERY_STAGE 0x00000004 +#define D3D_SHADER_REQUIRES_64_UAVS 0x00000008 +#define D3D_SHADER_REQUIRES_MINIMUM_PRECISION 0x00000010 +#define D3D_SHADER_REQUIRES_11_1_DOUBLE_EXTENSIONS 0x00000020 +#define D3D_SHADER_REQUIRES_11_1_SHADER_EXTENSIONS 0x00000040 +#define D3D_SHADER_REQUIRES_LEVEL_9_COMPARISON_FILTERING 0x00000080 +#define D3D_SHADER_REQUIRES_TILED_RESOURCES 0x00000100 + /* These are defined as version-neutral in d3dcommon.h */ typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE;

1 0

Elizabeth Figura : mfplat/tests: Use the correct interfaces for some COM calls.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: 5bb9e670f6a1277959852ec1a1e4e24caba10274 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bb9e670f6a1277959852ec1a1e4e2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 19:17:04 2024 -0500 mfplat/tests: Use the correct interfaces for some COM calls. --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 40853f6fc00..7aba4666f45 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -177,7 +177,7 @@ static void get_d3d9_surface_readback(IDirect3DSurface9 *surface, struct d3d9_su rb->surf_desc.Format, D3DPOOL_SYSTEMMEM, &rb->readback_surface, NULL); ok(hr == D3D_OK, "Failed to create surface, hr %#lx.\n", hr); - hr = IDirect3DDevice9Ex_GetRenderTargetData(device, surface, rb->readback_surface); + hr = IDirect3DDevice9_GetRenderTargetData(device, surface, rb->readback_surface); ok(hr == D3D_OK, "Failed to get render target data, hr %#lx.\n", hr); hr = IDirect3DSurface9_LockRect(rb->readback_surface, &rb->map_desc, NULL, 0);

1 0

Elizabeth Figura : d3dx9: Use the correct interfaces for some COM calls.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: 43afea4e9952109b1956f1e10d53bfb978f7a193 URL: https://gitlab.winehq.org/wine/wine/-/commit/43afea4e9952109b1956f1e10d53bf… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 19:18:13 2024 -0500 d3dx9: Use the correct interfaces for some COM calls. --- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/render.c | 8 +++++--- dlls/d3dx9_36/texture.c | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea965ce789b..d84ad749f30 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4164,7 +4164,7 @@ static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) cube_texture = *(IDirect3DCubeTexture9 **)param->data; if (!cube_texture) return FALSE; - IDirect3DTexture9_GetLevelDesc(cube_texture, 0, &surface_desc); + IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 0, &surface_desc); if (surface_desc.Pool != D3DPOOL_DEFAULT) return FALSE; break; diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 6bef9430f80..31a2a2e3aff 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -503,7 +503,8 @@ static ULONG WINAPI D3DXRenderToEnvMap_Release(ID3DXRenderToEnvMap *iface) if (!ref) { - if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + if (render->dst_cube_texture) + IDirect3DCubeTexture9_Release(render->dst_cube_texture); if (render->render_target) IDirect3DSurface9_Release(render->render_target); if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); @@ -585,7 +586,8 @@ static HRESULT WINAPI D3DXRenderToEnvMap_BeginCube(ID3DXRenderToEnvMap *iface, return D3D_OK; cleanup: - if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + if (render->dst_cube_texture) + IDirect3DCubeTexture9_Release(render->dst_cube_texture); render->dst_cube_texture = NULL; if (render->render_target) IDirect3DSurface9_Release(render->render_target); @@ -705,7 +707,7 @@ static HRESULT WINAPI D3DXRenderToEnvMap_End(ID3DXRenderToEnvMap *iface, render->depth_stencil = NULL; } - IDirect3DSurface9_Release(render->dst_cube_texture); + IDirect3DCubeTexture9_Release(render->dst_cube_texture); render->dst_cube_texture = NULL; render->state = INITIAL; diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 5a68b2dd1c4..8314146a264 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -84,7 +84,7 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture, else { numfaces = 6; - IDirect3DCubeTexture9_GetLevelDesc((IDirect3DTexture9*) texture, srclevel, &desc); + IDirect3DCubeTexture9_GetLevelDesc((IDirect3DCubeTexture9 *)texture, srclevel, &desc); } if (filter == D3DX_DEFAULT) @@ -1303,7 +1303,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f if (!texture || !function) return D3DERR_INVALIDCALL; - miplevels = IDirect3DBaseTexture9_GetLevelCount(texture); + miplevels = IDirect3DTexture9_GetLevelCount(texture); for (m = 0; m < miplevels; m++) { @@ -1652,7 +1652,7 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX if (texture == NULL || function == NULL) return D3DERR_INVALIDCALL; - miplevels = IDirect3DBaseTexture9_GetLevelCount(texture); + miplevels = IDirect3DCubeTexture9_GetLevelCount(texture); for (m = 0; m < miplevels; m++) { @@ -1713,7 +1713,7 @@ HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LP if (texture == NULL || function == NULL) return D3DERR_INVALIDCALL; - miplevels = IDirect3DBaseTexture9_GetLevelCount(texture); + miplevels = IDirect3DVolumeTexture9_GetLevelCount(texture); for (m = 0; m < miplevels; m++) {

1 0

Elizabeth Figura : d3dcompiler/tests: Use the correct interfaces for some COM calls.
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: 70f5c4cf3805cb1291d61a55ef834646df21d876 URL: https://gitlab.winehq.org/wine/wine/-/commit/70f5c4cf3805cb1291d61a55ef8346… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 19:12:10 2024 -0500 d3dcompiler/tests: Use the correct interfaces for some COM calls. --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index e736f932b39..1799a958ee8 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -288,16 +288,16 @@ static void init_readback(IDirect3DDevice9 *device, struct readback *rb) D3DSURFACE_DESC desc; HRESULT hr; - hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &rt); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_GetDesc(rt, &desc); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9Ex_GetRenderTargetData(device, rt, rb->surface); + hr = IDirect3DDevice9_GetRenderTargetData(device, rt, rb->surface); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY);

1 0