wine-commits July 2024

wine-commits@winehq.org

2 participants
519 discussions

Francisco Casas : vkd3d-shader/d3dbc: Split hlsl_sm1_write().
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: vkd3d Branch: master Commit: 130b3335cbf9c173b77d6c9032142b28d21e77ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/130b3335cbf9c173b77d6c9032142… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri May 17 18:30:59 2024 -0400 vkd3d-shader/d3dbc: Split hlsl_sm1_write(). The idea is to start splitting the HLSL IR -> d3dbc translation into HLSL IR -> vsir -> d3dbc So hlsl_sm1_write is split into two functions, sm1_generate_vsir() which should handle the first part and d3dbc_compile() which should handle the second part. This translation should be completed once the hlsl_ctx and entry_func are no longer used in d3dbc_compile(). --- libs/vkd3d-shader/d3dbc.c | 9 ++++++++- libs/vkd3d-shader/hlsl.h | 6 +++++- libs/vkd3d-shader/hlsl_codegen.c | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index a2d728de..1b966afc 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2779,7 +2779,14 @@ static void write_sm1_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * } } -int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) +/* OBJECTIVE: Stop relying on ctx and entry_func on this function, receiving + * data from the other parameters instead, so it can be removed as an argument + * and be declared in vkd3d_shader_private.h and used without relying on HLSL + * IR structs. */ +int d3dbc_compile(struct vsir_program *program, uint64_t config_flags, + const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context, + struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { struct vkd3d_bytecode_buffer buffer = {0}; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2731cae9..9ea6bc2e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1472,7 +1472,11 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type); bool hlsl_sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, enum vkd3d_shader_register_type *type, unsigned int *reg); bool hlsl_sm1_usage_from_semantic(const struct hlsl_semantic *semantic, D3DDECLUSAGE *usage, uint32_t *usage_idx); -int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); + +int d3dbc_compile(struct vsir_program *program, uint64_t config_flags, + const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context, + struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func); bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3D_NAME *usage); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d0e4b75c..458d2fec 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5522,6 +5522,24 @@ void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body) } while (progress); } +/* OBJECTIVE: Translate all the information from ctx and entry_func to the + * vsir_program, so it can be used as input to d3dbc_compile() without relying + * on ctx and entry_func. */ +static void sm1_generate_vsir(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + uint64_t config_flags, struct vsir_program *program) +{ + struct vkd3d_shader_version version = {0}; + + version.major = ctx->profile->major_version; + version.minor = ctx->profile->minor_version; + version.type = ctx->profile->type; + if (!vsir_program_init(program, &version, 0)) + { + ctx->result = VKD3D_ERROR_OUT_OF_MEMORY; + return; + } +} + int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { @@ -5704,7 +5722,22 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry switch (target_type) { case VKD3D_SHADER_TARGET_D3D_BYTECODE: - return hlsl_sm1_write(ctx, entry_func, out); + { + uint32_t config_flags = vkd3d_shader_init_config_flags(); + struct vsir_program program; + int result; + + sm1_generate_vsir(ctx, entry_func, config_flags, &program); + if (ctx->result) + { + vsir_program_cleanup(&program); + return ctx->result; + } + + result = d3dbc_compile(&program, config_flags, NULL, out, ctx->message_context, ctx, entry_func); + vsir_program_cleanup(&program); + return result; + } case VKD3D_SHADER_TARGET_DXBC_TPF: return hlsl_sm4_write(ctx, entry_func, out);

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Use enum vkd3d_shader_register_type in struct sm1_instruction.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: vkd3d Branch: master Commit: 6db2bc3eff2e187a1d345f8590c9a55dc774b438 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6db2bc3eff2e187a1d345f8590c9a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 9 18:29:08 2024 -0600 vkd3d-shader/d3dbc: Use enum vkd3d_shader_register_type in struct sm1_instruction. --- libs/vkd3d-shader/d3dbc.c | 148 +++++++++++++++++++-------------------- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 4 +- 3 files changed, 76 insertions(+), 78 deletions(-)

1 0

Giovanni Mascellani : tests: Support using the Agility SDK in the crosstests.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: vkd3d Branch: master Commit: 4f67675a5179ef6b44a9f26bcd70c580da975488 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f67675a5179ef6b44a9f26bcd70c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu May 2 11:56:04 2024 -0700 tests: Support using the Agility SDK in the crosstests. --- README | 43 ++++++++++++++++++++++++++++++++++++++++++ include/private/vkd3d_common.h | 4 ++++ tests/d3d12.c | 2 ++ tests/d3d12_crosstest.h | 20 ++++++++++++++++++++ tests/d3d12_invalid_usage.c | 2 ++ tests/hlsl_d3d12.c | 2 ++ tests/shader_runner.c | 3 +++ tests/shader_runner_d3d12.c | 2 ++ 8 files changed, 78 insertions(+) diff --git a/README b/README index 27da28b7..a3fcedde 100644 --- a/README +++ b/README @@ -111,3 +111,46 @@ to submit their patches using the merge request tool. Each merge request is automatically tested with the GitLab CI system. See gitlab/README in the Git tree for more details. + +============================ +Testing with the Agility SDK +============================ + +Traditionally Microsoft have released the Direct3D 12 development files, +including the debug layer runtime, as part of the larger Windows SDK. +In 2021 the DirectX 12 Agility SDK was introduced, which may be updated +independently of the Windows SDK. If you plan to run the vkd3d +crosstests with Microsoft's debug layer you might want to get it from +the Agility SDK, both because it's probably going to be more up-to-date +and because the Agility SDK is a couple dozens of megabytes versus the +gigabytes of the Windows SDK. + +In order to build the vkd3d crosstests with Agility SDK support, follow +these steps: + + * The Agility SDK is distributed at [1]: select your preferred + version (likely the most recent one) and note the number in column + D3D12SDKVersion, which you're going to need later. + + [1] https://devblogs.microsoft.com/directx/directx12agility/ + + * Configure vkd3d with something like: + 'CROSSCC64="x86_64-w64-mingw32-gcc -DVKD3D_AGILITY_SDK_VERSION=<version>"', + as well as the equivalent CROSSCC32 variable for the 32-bit + crosstests. You'll have to replace '<version>' with the + D3D12SDKVersion number you noted above. Then build the crosstests + with 'make crosstest' as usual. + + * Download the Agility SDK NuGet package, which is essentially a ZIP + file with a .nupkg extension. Extract d3d12core.dll and + d3d12sdklayers.dll for your architecture, and put them in the + directory containing the crosstest executables. + + * Now you can run the crosstests, possibly with arguments + '--validate' and '--gbv' to enable the debug layers. They will use + the runtime from the Agility SDK. + + * It's also possible to use '-DVKD3D_AGILITY_SDK_PATH=/path/to/sdk/' to + specify the directory to load the Agility SDK DLLs from at runtime. + If relative, the path is intended to be relative to the executable + path. If unspecified the path defaults to '.'. diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 79682483..6fbcbcc9 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -52,6 +52,10 @@ ((uint32_t)(ch0) | ((uint32_t)(ch1) << 8) \ | ((uint32_t)(ch2) << 16) | ((uint32_t)(ch3) << 24)) +#define VKD3D_EXPAND(x) x +#define VKD3D_STRINGIFY(x) #x +#define VKD3D_EXPAND_AND_STRINGIFY(x) VKD3D_EXPAND(VKD3D_STRINGIFY(x)) + #define TAG_AON9 VKD3D_MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC VKD3D_MAKE_TAG('D', 'X', 'B', 'C') #define TAG_DXIL VKD3D_MAKE_TAG('D', 'X', 'I', 'L') diff --git a/tests/d3d12.c b/tests/d3d12.c index 31f387db..6fef405f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23,6 +23,8 @@ #include "d3d12_crosstest.h" +VKD3D_AGILITY_SDK_EXPORTS + struct test_options test_options = {0}; static PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER pfn_D3D12CreateVersionedRootSignatureDeserializer; diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 99770353..8388a7a7 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -259,6 +259,24 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm } #ifdef VKD3D_CROSSTEST + +#ifdef VKD3D_AGILITY_SDK_VERSION +# define VKD3D_AGILITY_SDK_EXPORT_VERSION \ + VKD3D_EXPORT const UINT D3D12SDKVersion = VKD3D_AGILITY_SDK_VERSION; +# ifdef VKD3D_AGILITY_SDK_PATH +# define VKD3D_AGILITY_SDK_EXPORT_PATH \ + VKD3D_EXPORT const char *D3D12SDKPath = VKD3D_EXPAND_AND_STRINGIFY(VKD3D_AGILITY_SDK_PATH); +# else +# define VKD3D_AGILITY_SDK_EXPORT_PATH \ + VKD3D_EXPORT const char *D3D12SDKPath = "."; +# endif +# define VKD3D_AGILITY_SDK_EXPORTS \ + VKD3D_AGILITY_SDK_EXPORT_VERSION \ + VKD3D_AGILITY_SDK_EXPORT_PATH +#else +# define VKD3D_AGILITY_SDK_EXPORTS +#endif + static IUnknown *create_warp_adapter(IDXGIFactory4 *factory) { IUnknown *adapter; @@ -505,6 +523,8 @@ static inline bool is_depth_clip_enable_supported(ID3D12Device *device) #else +#define VKD3D_AGILITY_SDK_EXPORTS + #define DECLARE_VK_PFN(name) static PFN_##name name; DECLARE_VK_PFN(vkGetInstanceProcAddr) #define VK_INSTANCE_PFN DECLARE_VK_PFN diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 09e192a0..3e95d527 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -18,6 +18,8 @@ #include "d3d12_crosstest.h" +VKD3D_AGILITY_SDK_EXPORTS + struct test_options test_options = {0}; #define recreate_command_list(a, b, c) recreate_command_list_(__LINE__, a, b, c) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 2fe41fc2..1595df86 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -21,6 +21,8 @@ #include "vkd3d_common.h" #include "vkd3d_d3d12shader.h" +VKD3D_AGILITY_SDK_EXPORTS + #ifndef D3DERR_INVALIDCALL #define D3DERR_INVALIDCALL 0x8876086c #endif diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f8e18348..91714ab1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -2219,6 +2219,9 @@ START_TEST(shader_runner) print_dll_version("d3d9.dll"); print_dll_version("d3d11.dll"); print_dll_version("d3d12.dll"); + print_dll_version("d3d12core.dll"); + if (test_options.enable_debug_layer) + print_dll_version("d3d12sdklayers.dll"); #elif defined(_WIN32) trace("Running tests from a Windows non-cross build\n"); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index ff2cad2f..126db6d7 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -28,6 +28,8 @@ #include "shader_runner.h" #include "dxcompiler.h" +VKD3D_AGILITY_SDK_EXPORTS + struct d3d12_resource { struct resource r;

1 0

Giovanni Mascellani : tests: Enable the d3d12 debug layer message callbacks.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: vkd3d Branch: master Commit: c49daadce16803aa47511ca4d89553ab708dd450 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c49daadce16803aa47511ca4d8955… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu May 2 12:26:42 2024 -0700 tests: Enable the d3d12 debug layer message callbacks. --- tests/d3d12_crosstest.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 137db142..99770353 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -293,6 +293,51 @@ static IUnknown *create_adapter(void) return adapter; } +static const char *d3d12_message_category_to_string(D3D12_MESSAGE_CATEGORY category) +{ + switch (category) + { +#define X(x) case D3D12_MESSAGE_CATEGORY_ ## x: return #x + X(APPLICATION_DEFINED); + X(MISCELLANEOUS); + X(INITIALIZATION); + X(CLEANUP); + X(COMPILATION); + X(STATE_CREATION); + X(STATE_SETTING); + X(STATE_GETTING); + X(RESOURCE_MANIPULATION); + X(EXECUTION); + X(SHADER); +#undef X + default: return "??"; + } +} + +static const char *d3d12_message_severity_to_string(D3D12_MESSAGE_SEVERITY severity) +{ + switch (severity) + { +#define X(x) case D3D12_MESSAGE_SEVERITY_ ## x: return #x + X(CORRUPTION); + X(ERROR); + X(WARNING); + X(INFO); + X(MESSAGE); +#undef X + default: return "??"; + } +} + +static void STDMETHODCALLTYPE info_callback(D3D12_MESSAGE_CATEGORY category, + D3D12_MESSAGE_SEVERITY severity, D3D12_MESSAGE_ID id, const char *description, void *context) +{ + if (severity >= D3D12_MESSAGE_SEVERITY_INFO) + return; + fprintf(stderr, "d3d12 validation %s %s #%#x: %s.\n", d3d12_message_severity_to_string(severity), + d3d12_message_category_to_string(category), id, description); +} + static ID3D12Device *create_device(void) { IUnknown *adapter = NULL; @@ -310,6 +355,27 @@ static ID3D12Device *create_device(void) if (adapter) IUnknown_Release(adapter); + if (SUCCEEDED(hr) && test_options.enable_debug_layer) + { + ID3D12InfoQueue1 *info_queue; + DWORD cookie; + + hr = ID3D12Device_QueryInterface(device, &IID_ID3D12InfoQueue1, (void **)&info_queue); + + if (FAILED(hr)) + { + trace("Failed to query for ID3D12InfoQueue1, you might want to update your d3d12 runtime " + "or check that d3d12sdklayers.dll is available, hr %#x.\n", hr); + } + else + { + hr = ID3D12InfoQueue1_RegisterMessageCallback(info_queue, info_callback, + D3D12_MESSAGE_CALLBACK_IGNORE_FILTERS, NULL, &cookie); + ok(SUCCEEDED(hr), "Failed to register info queue callback, hr %#x.\n", hr); + ID3D12InfoQueue1_Release(info_queue); + } + } + return SUCCEEDED(hr) ? device : NULL; }

1 0

Giovanni Mascellani : tests: Improve feedback when enabling d3d12 debug layers.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: vkd3d Branch: master Commit: e3ddb76a3e48af9cdd38779d1d752c174b643898 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e3ddb76a3e48af9cdd38779d1d752… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 1 15:16:03 2024 -0700 tests: Improve feedback when enabling d3d12 debug layers. --- tests/d3d12_crosstest.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index c24623ca..137db142 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -749,26 +749,35 @@ static void enable_d3d12_debug_layer(void) { ID3D12Debug1 *debug1; ID3D12Debug *debug; + HRESULT hr; if (test_options.enable_gpu_based_validation) { - if (SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug1, (void **)&debug1))) + if (SUCCEEDED(hr = D3D12GetDebugInterface(&IID_ID3D12Debug1, (void **)&debug1))) { ID3D12Debug1_SetEnableGPUBasedValidation(debug1, true); ID3D12Debug1_Release(debug1); test_options.enable_debug_layer = true; + trace("GPU-based validation was enabled.\n"); } else { - trace("Failed to enable GPU-based validation.\n"); + trace("Failed to enable GPU-based validation, hr %#x.\n", hr); } } - if (test_options.enable_debug_layer - && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + if (test_options.enable_debug_layer) { - ID3D12Debug_EnableDebugLayer(debug); - ID3D12Debug_Release(debug); + if (SUCCEEDED(hr = D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + { + ID3D12Debug_EnableDebugLayer(debug); + ID3D12Debug_Release(debug); + trace("The debug layer was enabled.\n"); + } + else + { + trace("Failed to enable the debug layer, hr %#x.\n", hr); + } } }

1 0

Jacek Caban : mshtml: Factor out dispex_prop_call.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: wine Branch: master Commit: 03c772aaaeb12b80a9c29792afbbba2ce362a29c URL: https://gitlab.winehq.org/wine/wine/-/commit/03c772aaaeb12b80a9c29792afbbba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 28 12:13:26 2024 +0200 mshtml: Factor out dispex_prop_call. --- dlls/mshtml/dispex.c | 101 +++++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d21d9f20433..2e436b364c4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1973,60 +1973,27 @@ static HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT } } -static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatchHost *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, - VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +static HRESULT dispex_prop_call(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *r, + EXCEPINFO *ei, IServiceProvider *caller) { - DispatchEx *This = impl_from_IWineJSDispatchHost(iface); - HRESULT hres; - - TRACE("%s (%p)->(%lx %lx %x %p %p %p %p)\n", This->info->desc->name, This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - - if(!ensure_real_info(This)) - return E_OUTOFMEMORY; - - if(wFlags == (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF)) - wFlags = DISPATCH_PROPERTYPUT; - - if(This->info->desc->vtbl->disp_invoke) { - hres = This->info->desc->vtbl->disp_invoke(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(hres != S_FALSE) - return hres; - } - - switch(wFlags) { - case DISPATCH_PROPERTYGET: - if(!pvarRes) - return E_INVALIDARG; - return dispex_prop_get(This, id, lcid, pvarRes, pei, pspCaller); - - case DISPATCH_PROPERTYPUT: { - if(pdp->cArgs != 1 || (pdp->cNamedArgs == 1 && *pdp->rgdispidNamedArgs != DISPID_PROPERTYPUT) - || pdp->cNamedArgs > 1) { - FIXME("invalid args\n"); - return E_INVALIDARG; - } - return dispex_prop_put(This, id, lcid, pdp->rgvarg, pei, pspCaller); - } - } - switch(get_dispid_type(id)) { case DISPEXPROP_CUSTOM: - if(!This->info->desc->vtbl->invoke) + if(!dispex->info->desc->vtbl->invoke) return DISP_E_MEMBERNOTFOUND; - return This->info->desc->vtbl->invoke(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return dispex->info->desc->vtbl->invoke(dispex, id, lcid, flags, dp, r, ei, caller); case DISPEXPROP_DYNAMIC: { DWORD idx = id - DISPID_DYNPROP_0; dynamic_prop_t *prop; - if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) + if(!get_dynamic_data(dispex) || dispex->dynamic_data->prop_cnt <= idx) return DISP_E_MEMBERNOTFOUND; - prop = This->dynamic_data->props+idx; + prop = dispex->dynamic_data->props + idx; - switch(wFlags) { + switch(flags) { case DISPATCH_METHOD|DISPATCH_PROPERTYGET: - if(!pvarRes) + if(!r) return E_INVALIDARG; /* fall through */ case DISPATCH_METHOD: @@ -2035,17 +2002,17 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatchHost *iface, DISPID id, return E_NOTIMPL; } - return invoke_disp_value(This, V_DISPATCH(&prop->var), lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return invoke_disp_value(dispex, V_DISPATCH(&prop->var), lcid, flags, dp, r, ei, caller); default: - FIXME("unhandled wFlags %x\n", wFlags); + FIXME("unhandled flags %x on dynamic property\n", flags); return E_NOTIMPL; } } case DISPEXPROP_BUILTIN: - if(wFlags == DISPATCH_CONSTRUCT) { + if(flags == DISPATCH_CONSTRUCT) { if(id == DISPID_VALUE) { - if(This->info->desc->vtbl->value) { - return This->info->desc->vtbl->value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(dispex->info->desc->vtbl->value) { + return dispex->info->desc->vtbl->value(dispex, lcid, flags, dp, r, ei, caller); } FIXME("DISPATCH_CONSTRUCT flag but missing value function\n"); return E_FAIL; @@ -2054,13 +2021,53 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatchHost *iface, DISPID id, return E_FAIL; } - return invoke_builtin_prop(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return invoke_builtin_prop(dispex, id, lcid, flags, dp, r, ei, caller); + default: assert(0); return E_FAIL; } } +static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatchHost *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + + TRACE("%s (%p)->(%lx %lx %x %p %p %p %p)\n", This->info->desc->name, This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + + if(wFlags == (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF)) + wFlags = DISPATCH_PROPERTYPUT; + + if(This->info->desc->vtbl->disp_invoke) { + HRESULT hres = This->info->desc->vtbl->disp_invoke(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(hres != S_FALSE) + return hres; + } + + switch(wFlags) { + case DISPATCH_PROPERTYGET: + if(!pvarRes) + return E_INVALIDARG; + return dispex_prop_get(This, id, lcid, pvarRes, pei, pspCaller); + + case DISPATCH_PROPERTYPUT: { + if(pdp->cArgs != 1 || (pdp->cNamedArgs == 1 && *pdp->rgdispidNamedArgs != DISPID_PROPERTYPUT) + || pdp->cNamedArgs > 1) { + FIXME("invalid args\n"); + return E_INVALIDARG; + } + return dispex_prop_put(This, id, lcid, pdp->rgvarg, pei, pspCaller); + } + + default: + return dispex_prop_call(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + } +} + static HRESULT WINAPI DispatchEx_DeleteMemberByName(IWineJSDispatchHost *iface, BSTR name, DWORD grfdex) { DispatchEx *This = impl_from_IWineJSDispatchHost(iface);

1 0

Jacek Caban : mshtml: Factor out dispex_prop_get.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: wine Branch: master Commit: 598cdb1427ca412044e0f0e0c786879c5884c065 URL: https://gitlab.winehq.org/wine/wine/-/commit/598cdb1427ca412044e0f0e0c78687… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 28 12:09:10 2024 +0200 mshtml: Factor out dispex_prop_get. --- dlls/mshtml/dispex.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index efdbbf3da81..d21d9f20433 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1894,6 +1894,42 @@ static HRESULT WINAPI DispatchEx_GetDispID(IWineJSDispatchHost *iface, BSTR bstr return S_OK; } +static HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller) +{ + switch(get_dispid_type(id)) { + case DISPEXPROP_CUSTOM: { + DISPPARAMS dp = { .cArgs = 0 }; + if(!dispex->info->desc->vtbl->invoke) + return DISP_E_MEMBERNOTFOUND; + return dispex->info->desc->vtbl->invoke(dispex, id, lcid, DISPATCH_PROPERTYGET, &dp, r, ei, caller); + } + + case DISPEXPROP_DYNAMIC: { + DWORD idx = id - DISPID_DYNPROP_0; + dynamic_prop_t *prop; + + if(!get_dynamic_data(dispex) || dispex->dynamic_data->prop_cnt <= idx) + return DISP_E_MEMBERNOTFOUND; + + prop = dispex->dynamic_data->props+idx; + if(prop->flags & DYNPROP_DELETED) + return DISP_E_MEMBERNOTFOUND; + + V_VT(r) = VT_EMPTY; + return variant_copy(r, &prop->var); + } + + case DISPEXPROP_BUILTIN: { + DISPPARAMS dp = { .cArgs = 0 }; + return invoke_builtin_prop(dispex, id, lcid, DISPATCH_PROPERTYGET, &dp, r, ei, caller); + } + + default: + assert(0); + return E_FAIL; + } +} + static HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller) { static DISPID propput_dispid = DISPID_PROPERTYPUT; @@ -1958,6 +1994,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatchHost *iface, DISPID id, } switch(wFlags) { + case DISPATCH_PROPERTYGET: + if(!pvarRes) + return E_INVALIDARG; + return dispex_prop_get(This, id, lcid, pvarRes, pei, pspCaller); + case DISPATCH_PROPERTYPUT: { if(pdp->cArgs != 1 || (pdp->cNamedArgs == 1 && *pdp->rgdispidNamedArgs != DISPID_PROPERTYPUT) || pdp->cNamedArgs > 1) { @@ -1995,11 +2036,6 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatchHost *iface, DISPID id, } return invoke_disp_value(This, V_DISPATCH(&prop->var), lcid, wFlags, pdp, pvarRes, pei, pspCaller); - case DISPATCH_PROPERTYGET: - if(prop->flags & DYNPROP_DELETED) - return DISP_E_MEMBERNOTFOUND; - V_VT(pvarRes) = VT_EMPTY; - return variant_copy(pvarRes, &prop->var); default: FIXME("unhandled wFlags %x\n", wFlags); return E_NOTIMPL;

1 0

Dmitry Timoshkov : msv1_0: Add support for SECPKG_CRED_BOTH.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: wine Branch: master Commit: 3f87436670d8a9c87e00825b71ed6995afd870a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f87436670d8a9c87e00825b71ed69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 10 12:45:06 2024 +0300 msv1_0: Add support for SECPKG_CRED_BOTH. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msv1_0/main.c | 16 +++++++--------- dlls/msv1_0/unixlib.h | 7 ++++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 53d8f1b6415..efa87d8d70f 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -194,7 +194,8 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal TRACE( "%s, %#lx, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data, get_key_fn, get_key_arg, cred, expiry ); - switch (cred_use & ~SECPKG_CRED_RESERVED) + cred_use &= ~SECPKG_CRED_RESERVED; + switch (cred_use) { case SECPKG_CRED_INBOUND: if (!(cred = malloc( sizeof(*cred) ))) return SEC_E_INSUFFICIENT_MEMORY; @@ -209,10 +210,12 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal status = SEC_E_OK; break; + case SECPKG_CRED_BOTH: + /* fall through */ case SECPKG_CRED_OUTBOUND: if (!(cred = malloc( sizeof(*cred) ))) return SEC_E_INSUFFICIENT_MEMORY; - cred->mode = MODE_CLIENT; + cred->mode = cred_use == SECPKG_CRED_OUTBOUND ? MODE_CLIENT : MODE_BOTH; cred->username_arg = NULL; cred->domain_arg = NULL; cred->password = NULL; @@ -272,11 +275,6 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal status = SEC_E_OK; break; - case SECPKG_CRED_BOTH: - FIXME( "SECPKG_CRED_BOTH not supported\n" ); - status = SEC_E_UNSUPPORTED_FUNCTION; - break; - default: status = SEC_E_UNKNOWN_CREDENTIALS; break; @@ -610,7 +608,7 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA int password_len = 0; struct ntlm_cred *cred = (struct ntlm_cred *)cred_handle; - if (!cred || cred->mode != MODE_CLIENT) + if (!cred || !(cred->mode & MODE_CLIENT)) { status = SEC_E_INVALID_HANDLE; goto done; @@ -901,7 +899,7 @@ static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, L struct ntlm_cred *cred = (struct ntlm_cred *)cred_handle; char *argv[3]; - if (!cred || cred->mode != MODE_SERVER) + if (!cred || !(cred->mode & MODE_SERVER)) { status = SEC_E_INVALID_HANDLE; goto done; diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index 92edb8e18dc..d71b86770fb 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -29,9 +29,10 @@ enum sign_direction enum mode { - MODE_INVALID = -1, - MODE_CLIENT, - MODE_SERVER, + MODE_INVALID = 0, + MODE_CLIENT = 0x0001, + MODE_SERVER = 0x0002, + MODE_BOTH = 0x0003 }; struct ntlm_cred

1 0

Dmitry Timoshkov : kerberos: Add support for SECPKG_CRED_BOTH.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: wine Branch: master Commit: 6e3dcf6c5877867b98b0d01b85206fba780c39c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e3dcf6c5877867b98b0d01b85206f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 10 12:44:33 2024 +0300 kerberos: Add support for SECPKG_CRED_BOTH. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/unixlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 5bc1f72981f..a7cb8b1da7a 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -654,13 +654,13 @@ static NTSTATUS acquire_credentials_handle( void *args ) cred_usage = GSS_C_ACCEPT; break; + case SECPKG_CRED_BOTH: case SECPKG_CRED_OUTBOUND: if ((status = init_creds( params->username, params->password )) != STATUS_SUCCESS) return status; - cred_usage = GSS_C_INITIATE; + cred_usage = params->credential_use == SECPKG_CRED_OUTBOUND ? GSS_C_INITIATE : GSS_C_BOTH; break; default: - FIXME( "SECPKG_CRED_BOTH not supported\n" ); return SEC_E_UNKNOWN_CREDENTIALS; }

1 0

Rémi Bernon : win32u: Use the thread message queue shared memory in peek_message.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: wine Branch: master Commit: 90dcd2eaa6b6a2afaf298f1e457938350b0becfc URL: https://gitlab.winehq.org/wine/wine/-/commit/90dcd2eaa6b6a2afaf298f1e457938… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 26 12:18:17 2024 +0200 win32u: Use the thread message queue shared memory in peek_message. --- dlls/win32u/message.c | 25 +++++++++++++++++++++++-- dlls/win32u/ntuser_private.h | 1 + server/queue.c | 6 ++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index cadf390eaed..5f8cb95d731 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2725,10 +2725,30 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) NTSTATUS res; size_t size = 0; const message_data_t *msg_data = buffer; + UINT wake_mask, signal_bits, wake_bits, changed_bits, clear_bits = 0; + + /* use the same logic as in server/queue.c get_message */ + if (!(signal_bits = flags >> 16)) signal_bits = QS_ALLINPUT; + + if (signal_bits & QS_POSTMESSAGE) + { + clear_bits |= QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER; + if (first == 0 && last == ~0U) clear_bits |= QS_ALLPOSTMESSAGE; + } + if (signal_bits & QS_INPUT) clear_bits |= QS_INPUT; + if (signal_bits & QS_PAINT) clear_bits |= QS_PAINT; + + /* if filter includes QS_RAWINPUT we have to translate hardware messages */ + if (signal_bits & QS_RAWINPUT) signal_bits |= QS_KEY | QS_MOUSEMOVE | QS_MOUSEBUTTON; thread_info->client_info.msg_source = prev_source; + wake_mask = filter->mask & (QS_SENDMESSAGE | QS_SMRESULT); - SERVER_START_REQ( get_message ) + if (NtGetTickCount() - thread_info->last_getmsg_time < 3000 && /* avoid hung queue */ + check_queue_bits( wake_mask, filter->mask, wake_mask | signal_bits, filter->mask | clear_bits, + &wake_bits, &changed_bits )) + res = STATUS_PENDING; + else SERVER_START_REQ( get_message ) { req->internal = filter->internal; req->flags = flags; @@ -2736,9 +2756,10 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) req->get_first = first; req->get_last = last; req->hw_id = hw_id; - req->wake_mask = filter->mask & (QS_SENDMESSAGE | QS_SMRESULT); + req->wake_mask = wake_mask; req->changed_mask = filter->mask; wine_server_set_reply( req, buffer, buffer_size ); + thread_info->last_getmsg_time = NtGetTickCount(); if (!(res = wine_server_call( req ))) { size = wine_server_reply_size( reply ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index e9d407efb14..a6e61e1751b 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -108,6 +108,7 @@ struct user_thread_info { struct ntuser_thread_info client_info; /* Data shared with client */ HANDLE server_queue; /* Handle to server-side queue */ + DWORD last_getmsg_time; /* Get/PeekMessage last request time */ WORD message_count; /* Get/PeekMessage loop counter */ WORD hook_call_depth; /* Number of recursively called hook procs */ WORD hook_unicode; /* Is current hook unicode? */ diff --git a/server/queue.c b/server/queue.c index ea3afc7cacf..4494b426c0e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3207,7 +3207,7 @@ DECL_HANDLER(get_message) 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; + unsigned int filter; if (get_win && get_win != 1 && get_win != -1 && !get_user_object( get_win, USER_WINDOW )) { @@ -3230,7 +3230,6 @@ DECL_HANDLER(get_message) } queue->last_get_msg = current_time; - if (!filter) filter = QS_ALLINPUT; /* first check for sent messages */ if ((ptr = list_head( &queue->msg_list[SEND_MESSAGE] ))) @@ -3240,6 +3239,9 @@ DECL_HANDLER(get_message) return; } + /* use the same logic as in win32u/message.c peek_message */ + if (!(filter = req->flags >> 16)) filter = QS_ALLINPUT; + /* clear changed bits so we can wait on them if we don't find a message */ SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) {

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2024