- Wine-Devel - list.winehq.org

[PATCH 5/9] wincodecs: Use nameless unions.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/gifformat.c | 110 +++++++++++------------ dlls/windowscodecs/metadatahandler.c | 126 +++++++++++++-------------- dlls/windowscodecs/metadataquery.c | 40 ++++----- dlls/windowscodecs/pngformat.c | 12 +-- 5 files changed, 144 insertions(+), 145 deletions(-)

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Create a separate variable for uniforms.
by Zebediah Figura March 24, 2021

March 24, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 21bd9ab8..ad183819 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -19,6 +19,42 @@ */ #include "hlsl.h" +#include <stdio.h> + +/* Split uniforms into two variables representing the constant and temp + * registers, and copy the former to the latter, so that writes to uniforms + * work. */ +static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) +{ + struct hlsl_ir_assignment *store; + struct hlsl_ir_var *const_var; + struct hlsl_ir_load *load; + char name[31]; + + sprintf(name, "<uniform-%.20s>", var->name); + if (!(const_var = hlsl_new_var(vkd3d_strdup(name), var->data_type, var->loc, NULL, var->reg_reservation))) + { + ctx->failed = true; + return; + } + list_add_head(&ctx->globals->vars, &const_var->scope_entry); + var->is_uniform = 0; + const_var->is_uniform = 1; + + if (!(load = hlsl_new_var_load(const_var, var->loc))) + { + ctx->failed = true; + return; + } + list_add_head(instrs, &load->node.entry); + + if (!(store = hlsl_new_simple_assignment(var, &load->node))) + { + ctx->failed = true; + return; + } + list_add_after(&load->node.entry, &store->node.entry); +} static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), struct list *instrs, void *context) @@ -418,8 +454,22 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { + struct hlsl_ir_var *var; + list_move_head(entry_func->body, &ctx->static_initializers); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->is_uniform) + prepend_uniform_copy(ctx, entry_func->body, var); + } + + LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) + { + if (var->is_uniform) + prepend_uniform_copy(ctx, entry_func->body, var); + } + while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); -- 2.31.0

1 4

[PATCH 8/9] sechost: Use nameless unions.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/sechost/Makefile.in | 1 - dlls/sechost/service.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-)

2 1

[PATCH 1/2] ntdll: Implement NtQuerySystemInformationEx(SystemCpuSetInformation).
by Paul Gofman March 24, 2021

March 24, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 87 ++++++++++++++++++++++++++- dlls/ntdll/unix/system.c | 123 +++++++++++++++++++++++++++++++++++++++ include/winnt.h | 41 +++++++++++++ include/winternl.h | 1 + 4 files changed, 251 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 85c523881ef..80ad333031c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -21,6 +21,7 @@ #include "ntdll_test.h" #include <winnls.h> #include <stdio.h> +#include "wine/heap.h" static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); @@ -46,8 +47,8 @@ static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void static NTSTATUS (WINAPI * pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); - static BOOL is_wow64; +static const BOOL is_win64 = sizeof(void *) > sizeof(int); /* one_before_last_pid is used to be able to compare values of a still running process with the output of the test_query_process_times and test_query_process_handlecount tests. @@ -1099,6 +1100,89 @@ static void test_query_logicalprocex(void) HeapFree(GetProcessHeap(), 0, infoex_group); } +static void test_query_cpusetinfo(void) +{ + SYSTEM_CPU_SET_INFORMATION *info; + unsigned int i, cpu_count; + ULONG len, expected_len; + NTSTATUS status; + SYSTEM_INFO si; + HANDLE process; + + if (!pNtQuerySystemInformationEx) + return; + + GetSystemInfo(&si); + cpu_count = si.dwNumberOfProcessors; + expected_len = cpu_count * sizeof(*info); + + process = GetCurrentProcess(); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + if (status == STATUS_INVALID_INFO_CLASS) + { + win_skip("SystemCpuSetInformation is not supported\n"); + return; + } + + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCpuSetInformation, NULL, 0, &len); + ok(status == (is_win64 ? STATUS_INVALID_PARAMETER : STATUS_INVALID_INFO_CLASS), + "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected len %u.\n", len); + + len = 0xdeadbeef; + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + process = NULL; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, 4 * sizeof(process), NULL, 0, &len); + ok(status == (is_win64 ? STATUS_INVALID_PARAMETER : STATUS_BUFFER_TOO_SMALL), + "Got unexpected status %#x.\n", status); + ok(len == (is_win64 ? 0xdeadbeef : expected_len), "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, NULL, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, + expected_len, &len); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + info = heap_alloc(expected_len); + len = 0; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info, expected_len, &len); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + for (i = 0; i < cpu_count; ++i) + { + SYSTEM_CPU_SET_INFORMATION *d = &info[i]; + + ok(d->Size == sizeof(*d), "Got unexpected size %u, i %u.\n", d->Size, i); + ok(d->Type == CpuSetInformation, "Got unexpected type %u, i %u.\n", d->Type, i); + ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#x, i %u.\n", d->CpuSet.Id, i); + ok(!d->CpuSet.Group, "Got unexpected Group %u, i %u.\n", d->CpuSet.Group, i); + ok(d->CpuSet.LogicalProcessorIndex == i, "Got unexpected LogicalProcessorIndex %u, i %u.\n", + d->CpuSet.LogicalProcessorIndex, i); + ok(!d->CpuSet.AllFlags, "Got unexpected AllFlags %#x, i %u.\n", d->CpuSet.AllFlags, i); + } + heap_free(info); +} + static void test_query_firmware(void) { static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); @@ -3059,6 +3143,7 @@ START_TEST(info) test_query_regquota(); test_query_logicalproc(); test_query_logicalprocex(); + test_query_cpusetinfo(); test_query_firmware(); test_query_data_alignment(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6fa71ddfb91..7bd7e26b63b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -170,6 +170,8 @@ struct smbios_boot_info SYSTEM_CPU_INFORMATION cpu_info = { 0 }; +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); + /******************************************************************************* * Architecture specific feature detection for CPUs * @@ -1166,6 +1168,98 @@ static NTSTATUS create_logical_proc_info( SYSTEM_LOGICAL_PROCESSOR_INFORMATION * } #endif +static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *proc_info; + BYTE core_index, cache_index, max_cache_level; + unsigned int i, j, count; + BYTE *proc_info_buffer; + DWORD cpu_info_size; + ULONG64 cpu_mask; + NTSTATUS status; + + count = NtCurrentTeb()->Peb->NumberOfProcessors; + + cpu_info_size = 3 * sizeof(*proc_info); + if (!(proc_info_buffer = malloc(cpu_info_size))) + return STATUS_NO_MEMORY; + + if ((status = create_logical_proc_info(NULL, (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **)&proc_info_buffer, + &cpu_info_size, RelationAll))) + { + free(proc_info_buffer); + return status; + } + + max_cache_level = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; (BYTE *)proc_info != proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationCache) + { + if (max_cache_level < proc_info->u.Cache.Level) + max_cache_level = proc_info->u.Cache.Level; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + memset(info, 0, count * sizeof(*info)); + + core_index = 0; + cache_index = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; i < count; ++i) + { + info[i].Size = sizeof(*info); + info[i].Type = CpuSetInformation; + info[i].u.CpuSet.Id = 0x100 + i; + info[i].u.CpuSet.LogicalProcessorIndex = i; + } + + for (i = 0; (BYTE *)proc_info != (BYTE *)proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationProcessorCore) + { + if (proc_info->u.Processor.GroupCount != 1) + { + FIXME("Unsupported group count %u.\n", proc_info->u.Processor.GroupCount); + continue; + } + cpu_mask = proc_info->u.Processor.GroupMask[0].Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + { + info[j].u.CpuSet.CoreIndex = core_index; + info[j].u.CpuSet.EfficiencyClass = proc_info->u.Processor.EfficiencyClass; + } + ++core_index; + } + else if (proc_info->Relationship == RelationCache) + { + if (proc_info->u.Cache.Level == max_cache_level) + { + cpu_mask = proc_info->u.Cache.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.LastLevelCacheIndex = cache_index; + } + ++cache_index; + } + else if (proc_info->Relationship == RelationNumaNode) + { + cpu_mask = proc_info->u.NumaNode.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.NumaNodeIndex = proc_info->u.NumaNode.NodeNumber; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + free(proc_info_buffer); + + return STATUS_SUCCESS; +} + #ifdef linux static void copy_smbios_string( char **buffer, char *s, size_t len ) @@ -2651,6 +2745,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + return is_win64 ? NtQuerySystemInformationEx(class, NULL, 0, info, size, ret_size) + : STATUS_INVALID_INFO_CLASS; + case SystemRecommendedSharedDataAlignment: { len = sizeof(DWORD); @@ -2773,6 +2871,31 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + { + unsigned int cpu_count = NtCurrentTeb()->Peb->NumberOfProcessors; + PROCESS_BASIC_INFORMATION pbi; + HANDLE process; + + if (!query || query_len < sizeof(HANDLE) || (is_win64 && query_len != sizeof(HANDLE))) + return STATUS_INVALID_PARAMETER; + + process = *(HANDLE *)query; + if (process && (ret = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL))) + return ret; + + if (size < (len = cpu_count * sizeof(SYSTEM_CPU_SET_INFORMATION))) + { + ret = STATUS_BUFFER_TOO_SMALL; + break; + } + if (!info) + return STATUS_ACCESS_VIOLATION; + + if ((ret = create_cpuset_info(info))) + return ret; + break; + } default: FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size ); break; diff --git a/include/winnt.h b/include/winnt.h index 0a6027118fe..840966f657b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6726,6 +6726,47 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; +typedef enum _CPU_SET_INFORMATION_TYPE +{ + CpuSetInformation, +} CPU_SET_INFORMATION_TYPE, *PCPU_SET_INFORMATION_TYPE; + +typedef struct _SYSTEM_CPU_SET_INFORMATION +{ + DWORD Size; + CPU_SET_INFORMATION_TYPE Type; + union + { + struct + { + DWORD Id; + WORD Group; + BYTE LogicalProcessorIndex; + BYTE CoreIndex; + BYTE LastLevelCacheIndex; + BYTE NumaNodeIndex; + BYTE EfficiencyClass; + union + { + BYTE AllFlags; + struct + { + BYTE Parked : 1; + BYTE Allocated : 1; + BYTE AllocatedToTargetProcess : 1; + BYTE RealTime : 1; + BYTE ReservedFlags : 4; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; + union { + DWORD Reserved; + BYTE SchedulingClass; + }; + DWORD64 AllocationTag; + } CpuSet; + } DUMMYUNIONNAME; +} SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; diff --git a/include/winternl.h b/include/winternl.h index fcdedaec8aa..c8fb7031d91 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1551,6 +1551,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemFileCacheInformationEx = 81, SystemDynamicTimeZoneInformation = 102, SystemLogicalProcessorInformationEx = 107, + SystemCpuSetInformation = 175, SystemHypervisorSharedPageInformation = 197, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- 2.30.2

2 3

[PATCH 3/9 v2] winegstreamer: Use nameless unions.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/main.c | 2 ++ dlls/winegstreamer/media_source.c | 6 +++--- dlls/winegstreamer/quartz_parser.c | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-)

2 1

[PATCH 3/9] winegstreamer: Use nameless unions.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 - 1 file changed, 1 deletion(-)

2 4

[PATCH 1/6] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_source().
by Zebediah Figura March 24, 2021

March 24, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f7b682b627e..f32699c40cd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1304,19 +1304,19 @@ static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_STREAMSRC); } -void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset, UINT stride) +void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) { struct wined3d_cs_set_stream_source *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; op->stream_idx = stream_idx; op->buffer = buffer; op->offset = offset; op->stride = stride; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5ff11f15b13..35b1ccc4212 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1362,7 +1362,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI stream->offset = offset; if (buffer) wined3d_buffer_incref(buffer); - wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); + wined3d_device_context_emit_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride); if (prev_buffer) wined3d_buffer_decref(prev_buffer); @@ -1888,7 +1888,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { - wined3d_cs_emit_set_stream_source(device->cs, i, state->streams[i].buffer, + wined3d_device_context_emit_set_stream_source(context, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0df57a91049..f8e17024bf7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4761,8 +4761,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; @@ -4818,6 +4816,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int view_idx, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN; -- 2.30.2

3 12

[PATCH 1/5] windows.globalization: Add stub dll.
by Rémi Bernon March 24, 2021

March 24, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 2 + dlls/windows.globalization/Makefile.in | 9 + dlls/windows.globalization/classes.idl | 23 ++ dlls/windows.globalization/main.c | 159 ++++++++++++++ dlls/windows.globalization/tests/Makefile.in | 5 + .../tests/globalization.c | 197 ++++++++++++++++++ .../windows.globalization.spec | 3 + 7 files changed, 398 insertions(+) create mode 100644 dlls/windows.globalization/Makefile.in create mode 100644 dlls/windows.globalization/classes.idl create mode 100644 dlls/windows.globalization/main.c create mode 100644 dlls/windows.globalization/tests/Makefile.in create mode 100644 dlls/windows.globalization/tests/globalization.c create mode 100644 dlls/windows.globalization/windows.globalization.spec diff --git a/configure.ac b/configure.ac index 6c2e9fa57ad..afd46b353ea 100644 --- a/configure.ac +++ b/configure.ac @@ -3803,6 +3803,8 @@ WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.globalization) +WINE_CONFIG_MAKEFILE(dlls/windows.globalization/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) diff --git a/dlls/windows.globalization/Makefile.in b/dlls/windows.globalization/Makefile.in new file mode 100644 index 00000000000..4dfc49c4bf0 --- /dev/null +++ b/dlls/windows.globalization/Makefile.in @@ -0,0 +1,9 @@ +MODULE = windows.globalization.dll +IMPORTS = combase uuid + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.globalization/classes.idl b/dlls/windows.globalization/classes.idl new file mode 100644 index 00000000000..94fc53c0dd5 --- /dev/null +++ b/dlls/windows.globalization/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.globalization.dll + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "windows.system.userprofile.idl" diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c new file mode 100644 index 00000000000..5e46cc0811b --- /dev/null +++ b/dlls/windows.globalization/main.c @@ -0,0 +1,159 @@ +/* WinRT Windows.Globalization implementation + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#include "windows.foundation.h" + +WINE_DEFAULT_DEBUG_CHANNEL(locale); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_globalization +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_globalization *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_globalization, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_globalization_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + struct windows_globalization *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = &impl->IActivationFactory_iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_globalization_AddRef( + IActivationFactory *iface) +{ + struct windows_globalization *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_globalization_Release( + IActivationFactory *iface) +{ + struct windows_globalization *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_globalization_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_globalization_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_globalization_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_globalization_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_globalization_QueryInterface, + windows_globalization_AddRef, + windows_globalization_Release, + /* IInspectable methods */ + windows_globalization_GetIids, + windows_globalization_GetRuntimeClassName, + windows_globalization_GetTrustLevel, + /* IActivationFactory methods */ + windows_globalization_ActivateInstance, +}; + +static struct windows_globalization windows_globalization = +{ + {&activation_factory_vtbl}, + 0 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_globalization.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.globalization/tests/Makefile.in b/dlls/windows.globalization/tests/Makefile.in new file mode 100644 index 00000000000..d928414c6ea --- /dev/null +++ b/dlls/windows.globalization/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = windows.globalization.dll +IMPORTS = uuid + +C_SRCS = \ + globalization.c diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c new file mode 100644 index 00000000000..7dad2e612bd --- /dev/null +++ b/dlls/windows.globalization/tests/globalization.c @@ -0,0 +1,197 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winstring.h" + +#include "initguid.h" +#include "roapi.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_System_UserProfile +#include "windows.system.userprofile.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); +static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); +static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); +static void (WINAPI *pRoUninitialize)(void); +static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); +static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); +static WCHAR *(WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); + +static void test_GlobalizationPreferences(void) +{ + static const WCHAR *class_name = L"Windows.System.UserProfile.GlobalizationPreferences"; + + IGlobalizationPreferencesStatics *preferences_statics = NULL; + IVectorView_HSTRING *languages = NULL; + IActivationFactory *factory = NULL; + IInspectable *inspectable = NULL, *tmp_inspectable = NULL; + IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + HSTRING str, tmp_str; + BOOLEAN found; + HRESULT hr; + UINT32 len; + WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], *country, *tmp; + UINT32 i, size; + + GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); + if ((tmp = wcsrchr(locale, '_'))) *tmp = 0; + if (!(tmp = wcschr(locale, '-')) || (wcslen(tmp) > 3 && !(tmp = wcschr(tmp + 1, '-')))) country = wcsdup(L"US"); + else country = wcsdup(tmp + 1); + GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); + + hr = pRoInitialize(RO_INIT_MULTITHREADED); + ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + + hr = pWindowsCreateString(class_name, wcslen(class_name), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + + hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); + pWindowsDeleteString(str); + pRoUninitialize(); + free(country); + return; + } + + hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IGlobalizationPreferencesStatics, (void **)&preferences_statics); + todo_wine ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IGlobalizationPreferencesStatics failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; + + hr = IGlobalizationPreferencesStatics_QueryInterface(preferences_statics, &IID_IInspectable, (void **)&tmp_inspectable); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(tmp_inspectable == inspectable, "IGlobalizationPreferencesStatics_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); + IInspectable_Release(tmp_inspectable); + + hr = IGlobalizationPreferencesStatics_QueryInterface(preferences_statics, &IID_IAgileObject, (void **)&tmp_agile_object); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(tmp_agile_object == agile_object, "IGlobalizationPreferencesStatics_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); + IAgileObject_Release(tmp_agile_object); + + hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); + + buf = pWindowsGetStringRawBuffer(tmp_str, &len); + ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); + ok(wcslen(country) == len && !memcmp(buf, country, len), + "IGlobalizationPreferencesStatics_get_HomeGeographicRegion returned len %u, str %s, expected %s\n", + len, wine_dbgstr_w(buf), wine_dbgstr_w(country)); + + pWindowsDeleteString(tmp_str); + + hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + + hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); + ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); + ok(tmp_inspectable != inspectable, "IVectorView_HSTRING_QueryInterface returned %p, expected %p\n", tmp_inspectable, inspectable); + IInspectable_Release(tmp_inspectable); + + hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IAgileObject, (void **)&tmp_agile_object); + ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); + ok(tmp_agile_object != agile_object, "IVectorView_HSTRING_QueryInterface IID_IAgileObject returned agile_object\n"); + IAgileObject_Release(tmp_agile_object); + + size = 0xdeadbeef; + hr = IVectorView_HSTRING_get_Size(languages, &size); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); + + hr = IVectorView_HSTRING_GetAt(languages, 0, &tmp_str); + ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + buf = pWindowsGetStringRawBuffer(tmp_str, &len); + ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); + + ok(wcslen(locale) == len && !memcmp(buf, locale, len), + "IGlobalizationPreferencesStatics_get_Languages 0 returned len %u, str %s, expected %s\n", + len, wine_dbgstr_w(buf), wine_dbgstr_w(locale)); + + i = 0xdeadbeef; + found = FALSE; + hr = IVectorView_HSTRING_IndexOf(languages, tmp_str, &i, &found); + ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); + ok(i == 0 && found == TRUE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); + + pWindowsDeleteString(tmp_str); + + tmp_str = (HSTRING)0xdeadbeef; + hr = IVectorView_HSTRING_GetAt(languages, size, &tmp_str); + ok(hr == E_BOUNDS, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + ok(tmp_str == NULL, "IVectorView_HSTRING_GetAt returned %p\n", tmp_str); + + IVectorView_HSTRING_Release(languages); + + IGlobalizationPreferencesStatics_Release(preferences_statics); + +done: + IAgileObject_Release(agile_object); + IInspectable_Release(inspectable); + IActivationFactory_Release(factory); + + pWindowsDeleteString(str); + + pRoUninitialize(); + free(country); +} + +START_TEST(globalization) +{ + HMODULE combase; + + if (!(combase = LoadLibraryW(L"combase.dll"))) + { + win_skip("Failed to load combase.dll, skipping tests\n"); + return; + } + +#define LOAD_FUNCPTR(x) \ + if (!(p##x = (void*)GetProcAddress(combase, #x))) \ + { \ + win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ + return; \ + } + + LOAD_FUNCPTR(RoActivateInstance); + LOAD_FUNCPTR(RoGetActivationFactory); + LOAD_FUNCPTR(RoInitialize); + LOAD_FUNCPTR(RoUninitialize); + LOAD_FUNCPTR(WindowsCreateString); + LOAD_FUNCPTR(WindowsDeleteString); + LOAD_FUNCPTR(WindowsGetStringRawBuffer); +#undef LOAD_FUNCPTR + + test_GlobalizationPreferences(); +} diff --git a/dlls/windows.globalization/windows.globalization.spec b/dlls/windows.globalization/windows.globalization.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.globalization/windows.globalization.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr) -- 2.30.2

2 9

[PATCH] wineqtdecoder: Use nameless unions.
by Gijs Vermeulen March 24, 2021

March 24, 2021

Fixes a regression caused by b39b9eea39b19a8f91543b8350ed822d0fd9eef0. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Superseeds 202416. dlls/wineqtdecoder/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 435951ba933..da577f82714 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -188,8 +188,8 @@ static const REGFILTER2 reg_qt_splitter = { .dwVersion = 2, .dwMerit = MERIT_NORMAL - 1, - .u.s2.cPins2 = 3, - .u.s2.rgPins2 = reg_qt_splitter_pins, + .cPins2 = 3, + .rgPins2 = reg_qt_splitter_pins, }; static const REGFILTERPINS2 reg_video_decoder_pins[2] = @@ -209,8 +209,8 @@ static const REGFILTER2 reg_video_decoder = { .dwVersion = 2, .dwMerit = MERIT_NORMAL - 1, - .u.s2.cPins2 = 2, - .u.s2.rgPins2 = reg_video_decoder_pins, + .cPins2 = 2, + .rgPins2 = reg_video_decoder_pins, }; HRESULT WINAPI DllRegisterServer(void) -- 2.31.0

2 1

[PATCH 4/9] winealsa: Use nameless unions.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 1 - dlls/winealsa.drv/mmdevdrv.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-)

3 2