September 2021 - Wine-Commits

Zebediah Figura : vkd3d-shader/hlsl: Parse the pow() intrinsic.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: vkd3d Branch: master Commit: 2461ad601b221e58d85da1c8d00d90fec516c3e9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2461ad601b221e58d85da1c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 20 14:20:56 2021 +0200 vkd3d-shader/hlsl: Parse the pow() intrinsic. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++++++++ tests/pow.shader_test | 10 ++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 32b76e1..34617c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,6 +82,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ @@ -297,6 +298,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d53960..96473d0 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1093,7 +1093,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_MOD] = "%", [HLSL_OP2_MUL] = "*", [HLSL_OP2_NEQUAL] = "!=", - [HLSL_OP2_POW] = "pow", [HLSL_OP2_RSHIFT] = ">>", [HLSL_OP3_LERP] = "lerp", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9b579b7..ce1f1b7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -318,7 +318,6 @@ enum hlsl_ir_expr_op HLSL_OP2_MOD, HLSL_OP2_MUL, HLSL_OP2_NEQUAL, - HLSL_OP2_POW, HLSL_OP2_RSHIFT, HLSL_OP3_LERP, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bd26603..2b381dc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1585,6 +1585,28 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); } +static bool intrinsic_pow(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {0}; + struct hlsl_ir_node *log, *exp; + struct hlsl_ir_expr *mul; + + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], loc))) + return false; + list_add_tail(params->instrs, &log->entry); + + args[0] = params->args[1]; + args[1] = log; + if (!(mul = add_expr(ctx, params->instrs, HLSL_OP2_MUL, args, &loc))) + return false; + + if (!(exp = hlsl_new_unary_expr(ctx, HLSL_OP1_EXP2, &mul->node, loc))) + return false; + list_add_tail(params->instrs, &exp->entry); + return true; +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1605,6 +1627,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, + {"pow", 2, true, intrinsic_pow}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/tests/pow.shader_test b/tests/pow.shader_test new file mode 100644 index 0000000..21011e6 --- /dev/null +++ b/tests/pow.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(uniform float2 u, uniform float2 v) : sv_target +{ + return float4(pow(u.y, 3), pow(u, v), pow(0.5, v.y)); +} + +[test] +uniform 0 float4 0.4 0.8 2.5 2.0 +draw quad +probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 exponent instructions.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: vkd3d Branch: master Commit: e2b57f6d2b62a2f693ae6b6a81af61284e14c816 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e2b57f6d2b62a2f693ae6b6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 17 16:06:41 2021 -0500 vkd3d-shader/hlsl: Write SM4 exponent instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 34617c6..4a2bf8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -298,7 +298,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ - tests/pow.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index ca4e7eb..b347e35 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1023,6 +1023,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_EXP2: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_EXP, &expr->node, arg1, 0); + break; + case HLSL_OP1_LOG2: write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 logarithm instructions.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: vkd3d Branch: master Commit: 960a473c6d92c9362699f035e59fd75e3c6d7137 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=960a473c6d92c9362699f03… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 17 16:06:40 2021 -0500 vkd3d-shader/hlsl: Write SM4 logarithm instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 5aefc7e..ca4e7eb 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1023,6 +1023,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_LOG2: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0); + break; + case HLSL_OP1_NEG: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 absolute value instructions.
by Alexandre Julliard Sept. 20, 2021

Sept. 20, 2021

Module: vkd3d Branch: master Commit: 96fd5f74f9ace156d7635a4539584a8c1558e812 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=96fd5f74f9ace156d7635a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 17 16:06:38 2021 -0500 vkd3d-shader/hlsl: Write SM4 absolute value instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3287ec7..32b76e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,7 +274,6 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ - tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 8a1d363..5aefc7e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -982,6 +982,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { switch (expr->op) { + case HLSL_OP1_ABS: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_ABS); + break; + case HLSL_OP1_CAST: { const struct hlsl_type *src_type = arg1->data_type;

1 0

Alistair Leslie-Hughes : include: Avoid C++ keyword.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: f0bd0fd9830067bcbdcf0a2cd0e55a43146c08df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0bd0fd9830067bcbdcf0a2c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 17 19:07:08 2021 +1000 include: Avoid C++ keyword. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 94ac72a2099..775a778f85f 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -463,7 +463,7 @@ interface ISpeechObjectToken : IDispatch [out,retval] BSTR* path); [hidden, id(DISPID_SOTRemoveStorageFileName)] - HRESULT RemoveStorageFileName([in] BSTR clsid, [in]BSTR key, [in] VARIANT_BOOL delete); + HRESULT RemoveStorageFileName([in] BSTR clsid, [in]BSTR key, [in] VARIANT_BOOL remove); [hidden, id(DISPID_SOTIsUISupported)] HRESULT IsUISupported( [in]const BSTR type, [in, defaultvalue(NULL)] const VARIANT *data,

1 0

Alistair Leslie-Hughes : include: Fix compiling with C++.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 16e73be10d940c9c04101a47687a6f8a385c2b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e73be10d940c9c04101a47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 17 19:07:09 2021 +1000 include: Fix compiling with C++. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapi.idl | 127 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/include/sapi.idl b/include/sapi.idl index 5120e379450..c90d5ec145b 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -517,6 +517,7 @@ interface ISpEventSource; interface ISpRecoContext; interface ISpRecognizer; interface ISpStreamFormat; +interface ISpVoice; [ object, @@ -837,69 +838,6 @@ interface ISpNotifySink : IUnknown HRESULT Notify(void); } -[ - object, - uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4), - pointer_default(unique), - restricted -] -interface ISpVoice : ISpEventSource -{ - HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes); - HRESULT GetOutputObjectToken([out] ISpObjectToken **token); - HRESULT GetOutputStream([out] ISpStreamFormat **stream); - - HRESULT Pause(void); - HRESULT Resume(void); - - HRESULT SetVoice([in] ISpObjectToken *token); - HRESULT GetVoice([out] ISpObjectToken **token); - - HRESULT Speak([in, string] const WCHAR *pwcs, - [in] DWORD flags, - [out] ULONG *number); - HRESULT SpeakStream([in] IStream *stream, - [in] DWORD flags, - [out] ULONG *number); - - HRESULT GetStatus( - [out] SPVOICESTATUS *status, - [out, string] WCHAR **bookmark); - - HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped); - - HRESULT SetPriority([in] SPVPRIORITY priority); - HRESULT GetPriority([out] SPVPRIORITY* priority); - - HRESULT SetAlertBoundary([in] SPEVENTENUM boundary); - HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary); - - HRESULT SetRate([in] long adjust); - HRESULT GetRate([out] long *adjust); - - HRESULT SetVolume([in] USHORT volume); - HRESULT GetVolume([out] USHORT *volume); - - HRESULT WaitUntilDone([in] ULONG timeout); - - HRESULT SetSyncSpeakTimeout([in] ULONG timeout); - HRESULT GetSyncSpeakTimeout([out] ULONG *timeout); - - [local] HANDLE SpeakCompleteEvent(); - - [local] HRESULT IsUISupported( - [in] const WCHAR *type, - [in] void * extra, - [in] ULONG count, - [out] BOOL *supported); - [local] HRESULT DisplayUI( - [in] HWND parent, - [in] const WCHAR *title, - [in] const WCHAR *type, - [in] void *extra, - [in] ULONG count); -}; - [ object, uuid(5eff4aef-8487-11d2-961c-00c04f8ee628), @@ -982,6 +920,69 @@ interface ISpRecoContext : ISpEventSource HRESULT GetContextState([in] SPCONTEXTSTATE *state); }; +[ + object, + uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4), + pointer_default(unique), + restricted +] +interface ISpVoice : ISpEventSource +{ + HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes); + HRESULT GetOutputObjectToken([out] ISpObjectToken **token); + HRESULT GetOutputStream([out] ISpStreamFormat **stream); + + HRESULT Pause(void); + HRESULT Resume(void); + + HRESULT SetVoice([in] ISpObjectToken *token); + HRESULT GetVoice([out] ISpObjectToken **token); + + HRESULT Speak([in, string] const WCHAR *pwcs, + [in] DWORD flags, + [out] ULONG *number); + HRESULT SpeakStream([in] IStream *stream, + [in] DWORD flags, + [out] ULONG *number); + + HRESULT GetStatus( + [out] SPVOICESTATUS *status, + [out, string] WCHAR **bookmark); + + HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped); + + HRESULT SetPriority([in] SPVPRIORITY priority); + HRESULT GetPriority([out] SPVPRIORITY* priority); + + HRESULT SetAlertBoundary([in] SPEVENTENUM boundary); + HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary); + + HRESULT SetRate([in] long adjust); + HRESULT GetRate([out] long *adjust); + + HRESULT SetVolume([in] USHORT volume); + HRESULT GetVolume([out] USHORT *volume); + + HRESULT WaitUntilDone([in] ULONG timeout); + + HRESULT SetSyncSpeakTimeout([in] ULONG timeout); + HRESULT GetSyncSpeakTimeout([out] ULONG *timeout); + + [local] HANDLE SpeakCompleteEvent(); + + [local] HRESULT IsUISupported( + [in] const WCHAR *type, + [in] void * extra, + [in] ULONG count, + [out] BOOL *supported); + [local] HRESULT DisplayUI( + [in] HWND parent, + [in] const WCHAR *title, + [in] const WCHAR *type, + [in] void *extra, + [in] ULONG count); +}; + [ object, uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f),

1 0

Hans Leidekker : winhttp: Consistently validate the buffer in option query functions.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 73c107fd532363d7f98f77b4c4d5704c66160232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c107fd532363d7f98f77b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 17 14:41:14 2021 +0200 winhttp: Consistently validate the buffer in option query functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 103 ++++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 49 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 88e305da864..659a1ec8cee 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -82,6 +82,17 @@ static void session_destroy( struct object_header *hdr ) free( session ); } +static BOOL validate_buffer( void *buffer, DWORD *buflen, DWORD required ) +{ + if (!buffer || *buflen < required) + { + *buflen = required; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + return TRUE; +} + static BOOL session_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { struct session *session = (struct session *)hdr; @@ -90,38 +101,43 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void { case WINHTTP_OPTION_REDIRECT_POLICY: { - if (!buffer || *buflen < sizeof(DWORD)) - { - *buflen = sizeof(DWORD); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; *(DWORD *)buffer = hdr->redirect_policy; *buflen = sizeof(DWORD); return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_CONNECT_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_SEND_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->send_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->receive_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -314,38 +330,43 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void { case WINHTTP_OPTION_PARENT_HANDLE: { - if (!buffer || *buflen < sizeof(HINTERNET)) - { - *buflen = sizeof(HINTERNET); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(HINTERNET) )) return FALSE; *(HINTERNET *)buffer = ((struct object_header *)connect->session)->handle; *buflen = sizeof(HINTERNET); return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_CONNECT_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_SEND_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->send_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->receive_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -669,12 +690,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void DWORD flags; int bits; - if (!buffer || *buflen < sizeof(flags)) - { - *buflen = sizeof(flags); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(flags) )) return FALSE; flags = request->security_flags; if (request->netconn) @@ -695,12 +711,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void { const CERT_CONTEXT *cert; - if (!buffer || *buflen < sizeof(cert)) - { - *buflen = sizeof(cert); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(cert) )) return FALSE; if (!(cert = CertDuplicateCertificateContext( request->server_cert ))) return FALSE; *(CERT_CONTEXT **)buffer = (CERT_CONTEXT *)cert; @@ -715,13 +726,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void FIXME("partial stub\n"); - if (!buffer || *buflen < sizeof(*ci)) - { - *buflen = sizeof(*ci); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } - if (!cert) return FALSE; + if (!validate_buffer( buffer, buflen, sizeof(*ci) ) || !cert) return FALSE; ci->ftExpiry = cert->pCertInfo->NotAfter; ci->ftStart = cert->pCertInfo->NotBefore; @@ -741,12 +746,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void } case WINHTTP_OPTION_SECURITY_KEY_BITNESS: { - if (!buffer || *buflen < sizeof(DWORD)) - { - *buflen = sizeof(DWORD); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; *(DWORD *)buffer = request->netconn ? netconn_get_cipher_strength( request->netconn ) : 0; *buflen = sizeof(DWORD); @@ -759,12 +759,8 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void socklen_t len = sizeof(local); const struct sockaddr *remote = (const struct sockaddr *)&request->connect->sockaddr; - if (!buffer || *buflen < sizeof(*info)) - { - *buflen = sizeof(*info); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(*info) )) return FALSE; + if (!request->netconn) { SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); @@ -777,26 +773,36 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_CONNECT_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->connect_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_SEND_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->send_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->receive_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -818,11 +824,15 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return TRUE; case WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->max_redirects; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_HTTP_PROTOCOL_USED: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + FIXME("WINHTTP_OPTION_HTTP_PROTOCOL_USED\n"); *(DWORD *)buffer = 0; *buflen = sizeof(DWORD); @@ -1214,12 +1224,7 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, { case WINHTTP_OPTION_CONTEXT_VALUE: { - if (!buffer || *buflen < sizeof(DWORD_PTR)) - { - *buflen = sizeof(DWORD_PTR); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(DWORD_PTR) )) return FALSE; *(DWORD_PTR *)buffer = hdr->context; *buflen = sizeof(DWORD_PTR);

1 0

Jacek Caban : gdi32: Directly use ntdll in dib.c.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: ac6458844af6e7dc2b57761a544677899762d3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6458844af6e7dc2b57761a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 13:45:10 2021 +0200 gdi32: Directly use ntdll in dib.c. 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/gdi32/dib.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c5f6a41cb77..4d70e99a3c5 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1531,33 +1531,40 @@ HBITMAP WINAPI NtGdiCreateDIBSection( HDC hdc, HANDLE section, DWORD offset, con if (section) { - DWORD mapOffset; - INT mapSize; + LARGE_INTEGER map_offset; + SIZE_T map_size; - mapOffset = offset - (offset % system_info.AllocationGranularity); - mapSize = bmp->dib.dsBmih.biSizeImage + (offset - mapOffset); - mapBits = MapViewOfFile( section, FILE_MAP_ALL_ACCESS, 0, mapOffset, mapSize ); - if (mapBits) bmp->dib.dsBm.bmBits = (char *)mapBits + (offset - mapOffset); + map_offset.QuadPart = offset - (offset % system_info.AllocationGranularity); + map_size = bmp->dib.dsBmih.biSizeImage + (offset - map_offset.QuadPart); + if (NtMapViewOfSection( section, GetCurrentProcess(), &mapBits, 0, 0, &map_offset, + &map_size, ViewShare, 0, PAGE_READWRITE )) + goto error; + bmp->dib.dsBm.bmBits = (char *)mapBits + (offset - map_offset.QuadPart); } else { + SIZE_T size = bmp->dib.dsBmih.biSizeImage; offset = 0; - bmp->dib.dsBm.bmBits = VirtualAlloc( NULL, bmp->dib.dsBmih.biSizeImage, - MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ); + if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, 0, &size, + MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + goto error; } bmp->dib.dshSection = section; bmp->dib.dsOffset = offset; - if (!bmp->dib.dsBm.bmBits) goto error; - - if (!(ret = alloc_gdi_handle( &bmp->obj, NTGDI_OBJ_BITMAP, &dib_funcs ))) goto error; - - if (bits) *bits = bmp->dib.dsBm.bmBits; - return ret; + if ((ret = alloc_gdi_handle( &bmp->obj, NTGDI_OBJ_BITMAP, &dib_funcs ))) + { + if (bits) *bits = bmp->dib.dsBm.bmBits; + return ret; + } + if (section) NtUnmapViewOfSection( GetCurrentProcess(), mapBits ); + else + { + SIZE_T size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, &size, MEM_RELEASE ); + } error: - if (section) UnmapViewOfFile( mapBits ); - else VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE ); HeapFree( GetProcessHeap(), 0, bmp->color_table ); HeapFree( GetProcessHeap(), 0, bmp ); return 0; @@ -1739,10 +1746,14 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle ) if (bmp->dib.dshSection) { - UnmapViewOfFile( (char *)bmp->dib.dsBm.bmBits - - (bmp->dib.dsOffset % system_info.AllocationGranularity) ); + NtUnmapViewOfSection( GetCurrentProcess(), (char *)bmp->dib.dsBm.bmBits - + (bmp->dib.dsOffset % system_info.AllocationGranularity) ); + } + else + { + SIZE_T size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, &size, MEM_RELEASE ); } - else VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE ); HeapFree(GetProcessHeap(), 0, bmp->color_table); HeapFree( GetProcessHeap(), 0, bmp );

1 0

Jacek Caban : gdi32: Avoid calling gdi32 functions from ntgdi functions.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 57460dbb5859f1f6285707829d29fe88c73eb978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57460dbb5859f1f628570782… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 13:44:30 2021 +0200 gdi32: Avoid calling gdi32 functions from ntgdi functions. 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/gdi32/clipping.c | 8 ++++---- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/driver.c | 2 +- dlls/gdi32/palette.c | 2 +- dlls/gdi32/path.c | 10 +++++----- dlls/gdi32/region.c | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 598f738cad1..4fefa834b58 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -133,7 +133,7 @@ static inline void create_default_clip_region( DC * dc ) rect.right = NtGdiGetDeviceCaps( dc->hSelf, DESKTOPHORZRES ); rect.bottom = NtGdiGetDeviceCaps( dc->hSelf, DESKTOPVERTRES ); } - dc->hClipRgn = CreateRectRgnIndirect( &rect ); + dc->hClipRgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ); } @@ -265,7 +265,7 @@ INT WINAPI NtGdiExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bott rect = get_clip_rect( dc, left, top, right, bottom ); - if ((rgn = CreateRectRgnIndirect( &rect ))) + if ((rgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ))) { if (!dc->hClipRgn) create_default_clip_region( dc ); ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); @@ -293,10 +293,10 @@ INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bo rect = get_clip_rect( dc, left, top, right, bottom ); if (!dc->hClipRgn) { - if ((dc->hClipRgn = CreateRectRgnIndirect( &rect ))) + if ((dc->hClipRgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ))) ret = SIMPLEREGION; } - else if ((rgn = CreateRectRgnIndirect( &rect ))) + else if ((rgn = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ))) { ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_AND ); NtGdiDeleteObjectApp( rgn ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 9f10f479c2f..db517b89745 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -936,8 +936,8 @@ UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, const RGBQUAD if (result) /* update colors of selected objects */ { - SetTextColor( hdc, dc->attr->text_color ); - SetBkColor( hdc, dc->attr->background_color ); + NtGdiGetAndSetDCDword( hdc, NtGdiSetTextColor, dc->attr->text_color, NULL ); + NtGdiGetAndSetDCDword( hdc, NtGdiSetBkColor, dc->attr->background_color, NULL ); NtGdiSelectPen( hdc, dc->hPen ); NtGdiSelectBrush( hdc, dc->hBrush ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 75f82fbabe7..ac1a64016a1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -608,7 +608,7 @@ static INT CDECL nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) LOGFONTW font; DC *dc = get_nulldrv_dc( dev ); - if (GetObjectW( dc->hFont, sizeof(font), &font )) + if (NtGdiExtGetObjectW( dc->hFont, sizeof(font), &font )) { ret = lstrlenW( font.lfFaceName ) + 1; if (name) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 09959c6d398..2f3fc7dd215 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -158,7 +158,7 @@ HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ) pal->palPalEntry[i].peBlue = entries[i].rgbBlue; pal->palPalEntry[i].peFlags = 0; } - return CreatePalette( pal ); + return NtGdiCreatePaletteInternal( pal, pal->palNumEntries ); } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index cc6c6c714c2..9eb0c40665e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -348,7 +348,7 @@ static HRGN path_to_region( const struct gdi_path *path, int mode ) if (i > pos + 1) counts[polygons++] = i - pos; assert( polygons <= path->count / 2 ); - hrgn = CreatePolyPolygonRgn( path->points, counts, polygons, mode ); + hrgn = create_polypolygon_region( path->points, counts, polygons, mode, NULL ); HeapFree( GetProcessHeap(), 0, counts ); return hrgn; } @@ -1535,7 +1535,7 @@ static BOOL CDECL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, con DWORD dwSize; void *outline; - dwSize = GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity); + dwSize = NtGdiGetGlyphOutline( dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity, FALSE ); if (dwSize == GDI_ERROR) continue; /* add outline only if char is printable */ @@ -1544,7 +1544,7 @@ static BOOL CDECL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, con outline = HeapAlloc(GetProcessHeap(), 0, dwSize); if (!outline) return FALSE; - GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, dwSize, outline, &identity); + NtGdiGetGlyphOutline( dev->hdc, str[idx], ggo_flags, &gm, dwSize, outline, &identity, FALSE ); PATH_add_outline(physdev, x + offset.x, y + offset.y, outline, dwSize); HeapFree(GetProcessHeap(), 0, outline); @@ -1618,14 +1618,14 @@ static struct gdi_path *PATH_WidenPath(DC *dc) BYTE *type; DWORD obj_type, joint, endcap, penType; - size = GetObjectW( dc->hPen, 0, NULL ); + size = NtGdiExtGetObjectW( dc->hPen, 0, NULL ); if (!size) { SetLastError(ERROR_CAN_NOT_COMPLETE); return NULL; } elp = HeapAlloc( GetProcessHeap(), 0, size ); - GetObjectW( dc->hPen, size, elp ); + NtGdiExtGetObjectW( dc->hPen, size, elp ); obj_type = get_gdi_object_type(dc->hPen); switch (obj_type) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 757efc0ac1a..44ac1744793 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -927,7 +927,7 @@ HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA pt[3].y = pCurRect->bottom; translate( pt, 4, xform ); - poly_hrgn = CreatePolyPolygonRgn( pt, &count, 1, WINDING ); + poly_hrgn = create_polypolygon_region( pt, &count, 1, WINDING, NULL ); NtGdiCombineRgn( hrgn, hrgn, poly_hrgn, RGN_OR ); NtGdiDeleteObjectApp( poly_hrgn ); }

1 0

Nikolay Sivov : oleaut32/tests: Link to SafeArrayGetVartype() directly.
by Alexandre Julliard Sept. 17, 2021

Sept. 17, 2021

Module: wine Branch: master Commit: 5b04eacfa9f39f0f52ec4a86f82ddfed670f1f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b04eacfa9f39f0f52ec4a86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 14:12:50 2021 +0300 oleaut32/tests: Link to SafeArrayGetVartype() directly. It was already available on XP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 78 +++++++++++----------------------------- 1 file changed, 21 insertions(+), 57 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 4fc26f33c63..92d0da3403b 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -36,14 +36,12 @@ # define V_U2(A) (*(A)) #endif -static HRESULT (WINAPI *pSafeArrayGetVartype)(SAFEARRAY*,VARTYPE*); - static inline SF_TYPE get_union_type(SAFEARRAY *psa) { VARTYPE vt; HRESULT hr; - hr = pSafeArrayGetVartype(psa, &vt); + hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) { if(psa->fFeatures & FADF_VARIANT) return SF_VARIANT; @@ -131,10 +129,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) return; } - if (!pSafeArrayGetVartype) - return; - - if(FAILED(pSafeArrayGetVartype(lpsa, &vt))) + if(FAILED(SafeArrayGetVartype(lpsa, &vt))) vt = 0; sftype = get_union_type(lpsa); @@ -266,12 +261,9 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(lpsa, &vt); - pSafeArrayGetVartype(lpsa2, &vt2); - ok(vt == vt2, "vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(lpsa, &vt); + SafeArrayGetVartype(lpsa2, &vt2); + ok(vt == vt2, "vts differ %x %x\n", vt, vt2); ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); @@ -313,12 +305,9 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(lpsa, &vt); - pSafeArrayGetVartype(lpsa2, &vt2); - ok(vt == vt2, "vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(lpsa, &vt); + SafeArrayGetVartype(lpsa2, &vt2); + ok(vt == vt2, "vts differ %x %x\n", vt, vt2); ok(lpsa2->cLocks == 0, "got lock count %u, expected 0\n", lpsa2->cLocks); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); @@ -387,12 +376,8 @@ static void test_marshal_LPSAFEARRAY(void) lpsa->rgsabound[0].cElements = 48; hr = SafeArrayAllocData(lpsa); ok(hr == S_OK, "saad failed %08x\n", hr); - - if (pSafeArrayGetVartype) - { - hr = pSafeArrayGetVartype(lpsa, &vt); - ok(hr == E_INVALIDARG, "ret %08x\n", hr); - } + hr = SafeArrayGetVartype(lpsa, &vt); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); @@ -496,12 +481,8 @@ static void test_marshal_LPSAFEARRAY(void) lpsa->rgsabound[0].cElements = 48; hr = SafeArrayAllocData(lpsa); ok(hr == S_OK, "saad failed %08x\n", hr); - - if (pSafeArrayGetVartype) - { - hr = pSafeArrayGetVartype(lpsa, &vt); - ok(hr == E_INVALIDARG, "ret %08x\n", hr); - } + hr = SafeArrayGetVartype(lpsa, &vt); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); @@ -1321,12 +1302,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetUBound(V_ARRAY(&v), 1, &bound); SafeArrayGetUBound(V_ARRAY(&v2), 1, &bound2); ok(bound == bound2, "array ubounds differ\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(V_ARRAY(&v), &vt); - pSafeArrayGetVartype(V_ARRAY(&v2), &vt2); - ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(V_ARRAY(&v), &vt); + SafeArrayGetVartype(V_ARRAY(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1363,12 +1341,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetUBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetUBound(*V_ARRAYREF(&v2), 1, &bound2); ok(bound == bound2, "array ubounds differ\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(*V_ARRAYREF(&v), &vt); - pSafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); - ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(*V_ARRAYREF(&v), &vt); + SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1413,12 +1388,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetUBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetUBound(*V_ARRAYREF(&v2), 1, &bound2); ok(bound == bound2, "array ubounds differ\n"); - if (pSafeArrayGetVartype) - { - pSafeArrayGetVartype(*V_ARRAYREF(&v), &vt); - pSafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); - ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); - } + SafeArrayGetVartype(*V_ARRAYREF(&v), &vt); + SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); + ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); lpsa2->fFeatures &= ~FADF_STATIC; hr = SafeArrayDestroy(*V_ARRAYREF(&v2)); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1608,14 +1580,6 @@ todo_wine START_TEST(usrmarshal) { - HANDLE hOleaut32 = GetModuleHandleA("oleaut32.dll"); -#define GETPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func) - GETPTR(SafeArrayGetVartype); -#undef GETPTR - - if (!pSafeArrayGetVartype) - win_skip("SafeArrayGetVartype is not available, some tests will be skipped\n"); - CoInitialize(NULL); test_marshal_LPSAFEARRAY();

1 0