July 2024 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/d3dbc: Use vsir_program I/O signatures to write dcls.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: vkd3d Branch: master Commit: daa13934a4b6c883026d2d52b2bbaca098083870 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/daa13934a4b6c883026d2d52b2bba… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue May 21 14:51:17 2024 -0400 vkd3d-shader/d3dbc: Use vsir_program I/O signatures to write dcls. Instead of relying on ctx->extern vars, semantics are now stored in the vsir_program signatures, and then read to write the declarations. --- libs/vkd3d-shader/d3dbc.c | 35 ++++++++++-------- libs/vkd3d-shader/hlsl_codegen.c | 79 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index d0b19362..53cf7169 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2156,7 +2156,8 @@ static void d3dbc_write_constant_defs(struct d3dbc_compiler *d3dbc) } } -static void d3dbc_write_semantic_dcl(struct d3dbc_compiler *d3dbc, const struct hlsl_ir_var *var, bool output) +static void d3dbc_write_semantic_dcl(struct d3dbc_compiler *d3dbc, + const struct signature_element *element, bool output) { const struct vkd3d_shader_version *version = &d3dbc->program->shader_version; struct vkd3d_bytecode_buffer *buffer = &d3dbc->buffer; @@ -2165,20 +2166,18 @@ static void d3dbc_write_semantic_dcl(struct d3dbc_compiler *d3dbc, const struct D3DDECLUSAGE usage; bool ret; - if ((!output && !var->last_read) || (output && !var->first_write)) - return; - - if (hlsl_sm1_register_from_semantic(version, var->semantic.name, var->semantic.index, output, &reg.type, &reg.reg)) + if (hlsl_sm1_register_from_semantic(version, element->semantic_name, + element->semantic_index, output, &reg.type, &reg.reg)) { usage = 0; usage_idx = 0; } else { - ret = hlsl_sm1_usage_from_semantic(var->semantic.name, var->semantic.index, &usage, &usage_idx); + ret = hlsl_sm1_usage_from_semantic(element->semantic_name, element->semantic_index, &usage, &usage_idx); assert(ret); reg.type = output ? VKD3DSPR_OUTPUT : VKD3DSPR_INPUT; - reg.reg = var->regs[HLSL_REGSET_NUMERIC].id; + reg.reg = element->register_index; } token = D3DSIO_DCL; @@ -2191,17 +2190,17 @@ static void d3dbc_write_semantic_dcl(struct d3dbc_compiler *d3dbc, const struct token |= usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT; put_u32(buffer, token); - reg.writemask = (1 << var->data_type->dimx) - 1; + reg.writemask = element->mask; write_sm1_dst_register(buffer, &reg); } static void d3dbc_write_semantic_dcls(struct d3dbc_compiler *d3dbc) { - const struct vkd3d_shader_version *version = &d3dbc->program->shader_version; + struct vsir_program *program = d3dbc->program; + const struct vkd3d_shader_version *version; bool write_in = false, write_out = false; - struct hlsl_ctx *ctx = d3dbc->ctx; - struct hlsl_ir_var *var; + version = &program->shader_version; if (version->type == VKD3D_SHADER_TYPE_PIXEL && version->major >= 2) write_in = true; else if (version->type == VKD3D_SHADER_TYPE_VERTEX && version->major == 3) @@ -2209,12 +2208,16 @@ static void d3dbc_write_semantic_dcls(struct d3dbc_compiler *d3dbc) else if (version->type == VKD3D_SHADER_TYPE_VERTEX && version->major < 3) write_in = true; - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + if (write_in) + { + for (unsigned int i = 0; i < program->input_signature.element_count; ++i) + d3dbc_write_semantic_dcl(d3dbc, &program->input_signature.elements[i], false); + } + + if (write_out) { - if (write_in && var->is_input_semantic) - d3dbc_write_semantic_dcl(d3dbc, var, false); - if (write_out && var->is_output_semantic) - d3dbc_write_semantic_dcl(d3dbc, var, true); + for (unsigned int i = 0; i < program->output_signature.element_count; ++i) + d3dbc_write_semantic_dcl(d3dbc, &program->output_signature.elements[i], true); } } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 8c4cccc9..f9f5c8ed 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5527,6 +5527,83 @@ void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body) } while (progress); } +static void sm1_generate_vsir_signature_entry(struct hlsl_ctx *ctx, + struct vsir_program *program, bool output, struct hlsl_ir_var *var) +{ + enum vkd3d_shader_sysval_semantic sysval = VKD3D_SHADER_SV_NONE; + enum vkd3d_shader_register_type type; + struct shader_signature *signature; + struct signature_element *element; + unsigned int register_index, mask; + + if ((!output && !var->last_read) || (output && !var->first_write)) + return; + + if (output) + signature = &program->output_signature; + else + signature = &program->input_signature; + + if (!vkd3d_array_reserve((void **)&signature->elements, &signature->elements_capacity, + signature->element_count + 1, sizeof(*signature->elements))) + { + ctx->result = VKD3D_ERROR_OUT_OF_MEMORY; + return; + } + element = &signature->elements[signature->element_count++]; + + if (!hlsl_sm1_register_from_semantic(&program->shader_version, + var->semantic.name, var->semantic.index, output, &type, &register_index)) + { + unsigned int usage, usage_idx; + bool ret; + + register_index = var->regs[HLSL_REGSET_NUMERIC].id; + + ret = hlsl_sm1_usage_from_semantic(var->semantic.name, var->semantic.index, &usage, &usage_idx); + assert(ret); + /* With the exception of vertex POSITION output, none of these are + * system values. Pixel POSITION input is not equivalent to + * SV_Position; the closer equivalent is VPOS, which is not declared + * as a semantic. */ + if (program->shader_version.type == VKD3D_SHADER_TYPE_VERTEX + && output && usage == VKD3D_DECL_USAGE_POSITION) + sysval = VKD3D_SHADER_SV_POSITION; + } + mask = (1 << var->data_type->dimx) - 1; + + memset(element, 0, sizeof(*element)); + if (!(element->semantic_name = vkd3d_strdup(var->semantic.name))) + { + --signature->element_count; + ctx->result = VKD3D_ERROR_OUT_OF_MEMORY; + return; + } + element->semantic_index = var->semantic.index; + element->sysval_semantic = sysval; + element->component_type = VKD3D_SHADER_COMPONENT_FLOAT; + element->register_index = register_index; + element->target_location = register_index; + element->register_count = 1; + element->mask = mask; + element->used_mask = mask; + if (program->shader_version.type == VKD3D_SHADER_TYPE_PIXEL && !output) + element->interpolation_mode = VKD3DSIM_LINEAR; +} + +static void sm1_generate_vsir_signature(struct hlsl_ctx *ctx, struct vsir_program *program) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (var->is_input_semantic) + sm1_generate_vsir_signature_entry(ctx, program, false, var); + if (var->is_output_semantic) + sm1_generate_vsir_signature_entry(ctx, program, true, var); + } +} + /* OBJECTIVE: Translate all the information from ctx and entry_func to the * vsir_program and ctab blob, so they can be used as input to d3dbc_compile() * without relying on ctx and entry_func. */ @@ -5554,6 +5631,8 @@ static void sm1_generate_vsir(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl } ctab->code = buffer.data; ctab->size = buffer.size; + + sm1_generate_vsir_signature(ctx, program); } int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func,

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: 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

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: 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

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

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

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

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

Rémi Bernon : win32u: Simplify the logic for driver messages polling.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: wine Branch: master Commit: 54ca1ab607d3ff22a1f57a9561430f64c75f0916 URL: https://gitlab.winehq.org/wine/wine/-/commit/54ca1ab607d3ff22a1f57a9561430f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 26 14:25:56 2024 +0200 win32u: Simplify the logic for driver messages polling. As we don't need to make a server request to check for the queue status anymore, we can stop relying on ProcessEvent return status, and only call it often enough, before and after checking for messages. We keep a throttle here though, as now that PeekMessage returns very quickly when no message is found, calling it in a tight loop triggers a large number of calls into the drivers instead. --- dlls/win32u/message.c | 41 +++++++++++++++++------------------------ dlls/win32u/ntuser_private.h | 2 +- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5f8cb95d731..ba348cd3782 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3038,19 +3038,14 @@ static HANDLE get_server_queue_handle(void) } /* check for driver events if we detect that the app is not properly consuming messages */ -static inline void check_for_driver_events( UINT msg ) +static inline void check_for_driver_events(void) { - if (get_user_thread_info()->message_count > 200) + if (get_user_thread_info()->last_driver_time != NtGetTickCount()) { flush_window_surfaces( FALSE ); user_driver->pProcessEvents( QS_ALLINPUT ); + get_user_thread_info()->last_driver_time = NtGetTickCount(); } - else if (msg == WM_TIMER || msg == WM_SYSTIMER) - { - /* driver events should have priority over timers, so make sure we'll check for them soon */ - get_user_thread_info()->message_count += 100; - } - else get_user_thread_info()->message_count++; } /* helper for kernel32->ntdll timeout format conversion */ @@ -3075,8 +3070,8 @@ static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DW lock = *(DWORD *)ret_ptr; } - if (user_driver->pProcessEvents( mask )) ret = count ? count - 1 : 0; - else if (count) + if (user_driver->pProcessEvents( mask )) ret = count - 1; + else { ret = NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), !!(flags & MWMO_ALERTABLE), get_nt_timeout( &time, timeout )); @@ -3087,10 +3082,9 @@ static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DW ret = WAIT_FAILED; } } - else ret = WAIT_TIMEOUT; if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); - if ((mask & QS_INPUT) == QS_INPUT) get_user_thread_info()->message_count = 0; + if (ret == count - 1) get_user_thread_info()->last_driver_time = NtGetTickCount(); if (enable_thunk_lock) KeUserModeCallback( NtUserThunkLock, &lock, sizeof(lock), &ret_ptr, &ret_len ); @@ -3247,20 +3241,19 @@ BOOL WINAPI NtUserPeekMessage( MSG *msg_out, HWND hwnd, UINT first, UINT last, U int ret; user_check_not_lock(); - check_for_driver_events( 0 ); - - ret = peek_message( &msg, &filter ); - if (ret < 0) return FALSE; + check_for_driver_events(); - if (!ret) + if ((ret = peek_message( &msg, &filter )) <= 0) { - flush_window_surfaces( TRUE ); - ret = wait_message( 0, NULL, 0, QS_ALLINPUT, 0 ); - /* if we received driver events, check again for a pending message */ - if (ret == WAIT_TIMEOUT || peek_message( &msg, &filter ) <= 0) return FALSE; + if (!ret) + { + flush_window_surfaces( TRUE ); + NtYieldExecution(); + } + return FALSE; } - check_for_driver_events( msg.message ); + check_for_driver_events(); /* copy back our internal safe copy of message data to msg_out. * msg_out is a variable from the *program*, so it can't be used @@ -3286,7 +3279,7 @@ BOOL WINAPI NtUserGetMessage( MSG *msg, HWND hwnd, UINT first, UINT last ) int ret; user_check_not_lock(); - check_for_driver_events( 0 ); + check_for_driver_events(); if (first || last) { @@ -3307,7 +3300,7 @@ BOOL WINAPI NtUserGetMessage( MSG *msg, HWND hwnd, UINT first, UINT last ) } if (ret < 0) return -1; - check_for_driver_events( msg->message ); + check_for_driver_events(); return msg->message != WM_QUIT; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index a6e61e1751b..a361e1d73a5 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -109,7 +109,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 */ + DWORD last_driver_time; /* Get/PeekMessage driver event time */ WORD hook_call_depth; /* Number of recursively called hook procs */ WORD hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */

1 0