- wine-devel - winehq.org

[PATCH vkd3d 03/10] tests: Add a test for 0 sample count resources to test_create_committed_resource().
by Henri Verbeet 14 Oct '21

14 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Windows returns E_INVALIDARG at least on AMD and Intel. Psychonauts 2 attempts to create resources with this argument. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Minor style changes. This supersedes patch 214666. tests/d3d12.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e6461e31..4a7309d6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1700,6 +1700,14 @@ static void test_create_committed_resource(void) ID3D12Resource_Release(resource); resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + resource_desc.SampleDesc.Count = 1; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &clear_value, &IID_ID3D12Resource, (void **)&resource); -- 2.20.1

1 0

[PATCH vkd3d 02/10] tests: Add tests for d3d12_command_list_IASetVertexBuffers() calls with NULL views.
by Henri Verbeet 14 Oct '21

14 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Part of a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Slightly modified the comment. This supersedes patch 214665. tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4e908d43..e6461e31 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19201,6 +19201,10 @@ static void test_null_vbv(void) vbv[1].SizeInBytes = 0; ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + /* Calls with NULL "views" pointers should be ignored. */ + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, NULL); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 1, 1, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); transition_resource_state(command_list, context.render_target, -- 2.20.1

1 0

[PATCH vkd3d 01/10] vkd3d: Ignore d3d12_command_list_IASetVertexBuffers() calls with NULL views.
by Henri Verbeet 14 Oct '21

14 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Part of a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Print a WARN. This supersedes patch 214664. libs/vkd3d/command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 118fc4bb..1db624e0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4498,6 +4498,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } + if (!views) + { + WARN("NULL \"views\" pointer specified.\n"); + return; + } + for (i = 0; i < view_count; ++i) { if (views[i].BufferLocation) -- 2.20.1

1 0

[PATCH v2 1/2] server: Return STATUS_IMAGE_INVALID_NOT_MZ on create_mapping for a fake 16 bit dll.
by Oleh Nykyforchyn 14 Oct '21

14 Oct '21

If request ( create_mapping ) returns STATUS_IMAGE_INVALID_WIN_16 for a file, then the search fails, but STATUS_IMAGE_INVALID_NOT_MZ triggers attempt to load *.so file instead in ntdll. It allows to run 16 bin applications again. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51564 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- server/mapping.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 93dae94b7c4..af9e92fcf25 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -697,6 +697,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mz_size = size; pos = mz.dos.e_lfanew; + mapping->image.image_flags = 0; + mapping->image.loader_flags = 0; + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; + else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; + size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ @@ -707,7 +714,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s { IMAGE_OS2_HEADER *os2 = (IMAGE_OS2_HEADER *)&nt; if (os2->ne_magic != IMAGE_OS2_SIGNATURE) return STATUS_INVALID_IMAGE_PROTECT; - if (os2->ne_exetyp == 2) return STATUS_INVALID_IMAGE_WIN_16; + if (os2->ne_exetyp == 2) + { + if (mapping->image.image_flags & IMAGE_FLAGS_WineFakeDll) + return STATUS_INVALID_IMAGE_NOT_MZ; + else + return STATUS_INVALID_IMAGE_WIN_16; + } if (os2->ne_exetyp == 5) return STATUS_INVALID_IMAGE_PROTECT; return STATUS_INVALID_IMAGE_NE_FORMAT; } @@ -737,7 +750,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr32.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -769,7 +781,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr64.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -788,10 +799,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.zerobits = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; - else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ -- 2.33.0

1 1

[PATCH 1/2] server: Return a fake mapping with WineFakeDll flag set for a fake 16 bit dll.
by Oleh Nykyforchyn 14 Oct '21

14 Oct '21

If fake 16 bit dll is found by create_mapping and status is set to STATUS_IMAGE_INVALID_WIN_16, do not release the mapping, but return it with WineFakeDll flag set to allow ntdll properly discover this dll by NtCreateSection and handle by find_dll_file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51564 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- server/mapping.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 93dae94b7c4..8016feaf432 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -697,6 +697,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mz_size = size; pos = mz.dos.e_lfanew; + mapping->image.image_flags = 0; + mapping->image.loader_flags = 0; + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; + else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; + size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ @@ -707,7 +714,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s { IMAGE_OS2_HEADER *os2 = (IMAGE_OS2_HEADER *)&nt; if (os2->ne_magic != IMAGE_OS2_SIGNATURE) return STATUS_INVALID_IMAGE_PROTECT; - if (os2->ne_exetyp == 2) return STATUS_INVALID_IMAGE_WIN_16; + if (os2->ne_exetyp == 2) + { + mapping->image.machine = IMAGE_FILE_MACHINE_I386; + return STATUS_INVALID_IMAGE_WIN_16; + } if (os2->ne_exetyp == 5) return STATUS_INVALID_IMAGE_PROTECT; return STATUS_INVALID_IMAGE_NE_FORMAT; } @@ -737,7 +748,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr32.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -769,7 +779,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr64.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -788,10 +797,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.zerobits = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; - else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ @@ -920,7 +925,11 @@ static struct mapping *create_mapping( struct object *root, const struct unicode unsigned int err = get_image_params( mapping, st.st_size, unix_fd ); if (!err) return mapping; set_error( err ); - goto error; + /* return fake mapping to discover fake 16 bit dll */ + if ((err == STATUS_INVALID_IMAGE_WIN_16) && (mapping->image.image_flags & IMAGE_FLAGS_WineFakeDll)) + return mapping; + else + goto error; } if (!mapping->size) { @@ -1106,6 +1115,12 @@ struct object *create_user_data_mapping( struct object *root, const struct unico if (!(mapping = create_mapping( root, name, attr, sizeof(KSHARED_USER_DATA), SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, sd ))) return NULL; + /* FIXME: is this necessary? */ + if ((get_error() == STATUS_INVALID_IMAGE_WIN_16) && (mapping->image.image_flags & IMAGE_FLAGS_WineFakeDll)) + { + release_object( mapping ); + return NULL; + } ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); if (ptr != MAP_FAILED) { -- 2.33.0

2 2

[PATCH] vbscript: Emit catch after next in for each loops.
by Robert Wilhelm 14 Oct '21

14 Oct '21

Hi Jacek, We crash in following testcase: On Error Resume Next For each i in empty Next There is no catch after next but we search for it until we hit unaccessible memory. Please see bugreport for details. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39463 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/tests/error.vbs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index da56eac74b2..8eb1878ec05 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -829,6 +829,10 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t return hres; label_set_addr(ctx, loop_ctx.for_end_label); + + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + return S_OK; } diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 1853f6c4bf5..9b74dc8773e 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -309,12 +309,15 @@ call ok(x = "ok", "testOnErrorClear failed") sub testForEachError() on error resume next - dim x, y + dim x, y, z y = false + z = false for each x in empty y = true next + z = true call ok(y, "for each not executed") + call ok(z, "line after next not executed") call todo_wine_ok(Err.Number = VB_E_OBJNOTCOLLECTION, "Err.Number = " & Err.Number) end sub -- 2.31.1

2 1

[PATCH] vbscript: Emit catch after enumnext in for each loops.
by Jacek Caban 14 Oct '21

14 Oct '21

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39463 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/tests/error.vbs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Allocate textures for SM4.
by Zebediah Figura 14 Oct '21

14 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 63 ++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 00fe76b2f..bf93a03df 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1197,6 +1197,64 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } } +static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint32_t index) +{ + const struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) + { + if (var->has_resource_access && var->reg_reservation.type == 't' && var->reg_reservation.index == index) + return var; + } + return NULL; +} + +static void allocate_textures(struct hlsl_ctx *ctx) +{ + struct hlsl_ir_var *var; + uint32_t index = 0; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (!var->has_resource_access || var->data_type->type != HLSL_CLASS_OBJECT + || var->data_type->base_type != HLSL_TYPE_TEXTURE) + continue; + + if (var->reg_reservation.type == 't') + { + const struct hlsl_ir_var *reserved_texture = get_reserved_texture(ctx, var->reg_reservation.index); + + if (reserved_texture && reserved_texture != var) + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, + "Multiple textures bound to t%u.", var->reg_reservation.index); + hlsl_note(ctx, reserved_texture->loc, VKD3D_SHADER_LOG_ERROR, + "Texture '%s' is already bound to t%u.", reserved_texture->name, + var->reg_reservation.index); + } + + var->reg.id = var->reg_reservation.index; + var->reg.allocated = true; + TRACE("Allocated reserved %s to t%u.\n", var->name, index); + } + else if (!var->reg_reservation.type) + { + while (get_reserved_texture(ctx, index)) + ++index; + + var->reg.id = index; + var->reg.allocated = true; + TRACE("Allocated %s to t%u.\n", var->name, index); + ++index; + } + else + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Textures must be bound to register type 't'."); + } + } +} + static bool type_is_single_reg(const struct hlsl_type *type) { return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; @@ -1315,9 +1373,14 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun allocate_temp_registers(ctx, entry_func); if (ctx->profile->major_version < 4) + { allocate_const_registers(ctx, entry_func); + } else + { allocate_buffers(ctx); + allocate_textures(ctx); + } allocate_semantic_registers(ctx); if (ctx->result) -- 2.33.0

5 22

[PATCH 5/6] win32u: Factor out reg_open_hkcu_key.
by Jacek Caban 14 Oct '21

14 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)

2 1

[PATCH v2] winex11.drv: Destroy windows associated with X11 display when the display is closed.
by Paul Gofman 14 Oct '21

14 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 217174. X11DRV_ThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when, for instance, the window is still used for Vulkan rendering (even if only to tear down the device and swapchain). dlls/winex11.drv/window.c | 66 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 6 ++++ dlls/winex11.drv/x11drv_main.c | 3 ++ 3 files changed, 75 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0057a341525..3423f79f6f0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -48,6 +48,7 @@ #include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/heap.h" #include "mwm.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -88,6 +89,9 @@ XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ XContext win_data_context = 0; +/* X context to associate windows list with a display */ +XContext display_windows_context; + /* time of last user event and window where it's stored */ static Time last_user_time; static Window user_time_window; @@ -200,12 +204,30 @@ static BOOL has_owned_popups( HWND hwnd ) } +/*********************************************************************** + * init_display_window_list + */ +void init_display_window_list( Display *display ) +{ + struct list *window_list; + + if (!(window_list = heap_alloc( sizeof(*window_list) ))) + { + ERR( "No memory.\n" ); + return; + } + list_init( window_list ); + XSaveContext( gdi_display, (XID)display, display_windows_context, (char *)window_list ); +} + + /*********************************************************************** * alloc_win_data */ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; + struct list *window_list; if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { @@ -213,6 +235,17 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) data->vis = default_visual; data->hwnd = hwnd; EnterCriticalSection( &win_data_section ); + if (display != gdi_display + && !XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + { + list_add_head( window_list, &data->display_entry ); + } + else + { + list_init( &data->display_entry ); + if (display != gdi_display) + WARN( "No window list for display %p.\n", display ); + } XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); } return data; @@ -1764,6 +1797,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (data->client_colormap) XFreeColormap( data->display, data->client_colormap ); HeapFree( GetProcessHeap(), 0, data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); + list_remove( &data->display_entry ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); destroy_gl_drawable( hwnd ); @@ -1771,6 +1805,38 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) } +/*********************************************************************** + * destroy_display_windows + */ +void destroy_display_windows( Display *display ) +{ + struct list *window_list, *head; + HWND hwnd; + + if (XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + { + WARN( "No windows list for display %p.\n", display ); + return; + } + + while (1) + { + EnterCriticalSection( &win_data_section ); + if ((head = list_head( window_list ))) + hwnd = LIST_ENTRY( head, struct x11drv_win_data, display_entry )->hwnd; + else + hwnd = NULL; + LeaveCriticalSection( &win_data_section ); + if (!hwnd) break; + TRACE( "Destroying data for hwnd %p.\n", hwnd ); + X11DRV_DestroyWindow( hwnd ); + } + + XDeleteContext( gdi_display, (XID)display, display_windows_context ); + heap_free( window_list ); +} + + /*********************************************************************** * X11DRV_DestroyNotify */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5ed2fcf73fb..8e79bfd0d32 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -342,6 +342,7 @@ struct x11drv_thread_data struct x11drv_valuator_data y_rel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ + }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; @@ -555,6 +556,7 @@ enum x11drv_net_wm_state struct x11drv_win_data { Display *display; /* display connection for the thread owning the window */ + struct list display_entry; /* list entry in display window list */ XVisualInfo vis; /* X visual used by this window */ Colormap whole_colormap; /* colormap if non-default visual */ Colormap client_colormap; /* colormap for the client window */ @@ -583,6 +585,8 @@ struct x11drv_win_data unsigned int icon_size; }; +extern void init_display_window_list( Display *display ) DECLSPEC_HIDDEN; +extern void destroy_display_windows( Display *display ) DECLSPEC_HIDDEN; extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; @@ -619,6 +623,8 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) extern XContext winContext DECLSPEC_HIDDEN; /* X context to associate a struct x11drv_win_data to an hwnd */ extern XContext win_data_context DECLSPEC_HIDDEN; +/* X context to associate windows list with a display */ +extern XContext display_windows_context DECLSPEC_HIDDEN; /* X context to associate an X cursor to a Win32 cursor handle */ extern XContext cursor_context DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e8b273d055e..4be1137dc03 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -608,6 +608,7 @@ static BOOL process_attach(void) winContext = XUniqueContext(); win_data_context = XUniqueContext(); + display_windows_context = XUniqueContext(); cursor_context = XUniqueContext(); if (TRACE_ON(synchronous)) XSynchronize( display, True ); @@ -645,6 +646,7 @@ void CDECL X11DRV_ThreadDetach(void) if (data) { + destroy_display_windows( data->display ); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); @@ -700,6 +702,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); ExitProcess(1); } + init_display_window_list( data->display ); fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */ -- 2.31.1

2 4

[PATCH] winex11.drv: Destroy windows associated with X11 display when the display is closed.
by Paul Gofman 14 Oct '21

14 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 217174. X11DRV_ThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when, for instance, the window is still used for Vulkan rendering (even if only to tear down the device and swapchain). dlls/winex11.drv/window.c | 61 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 6 ++++ dlls/winex11.drv/x11drv_main.c | 3 ++ 3 files changed, 70 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0057a341525..5255b9f8ca6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -48,6 +48,7 @@ #include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" +#include "wine/heap.h" #include "mwm.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -88,6 +89,9 @@ XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ XContext win_data_context = 0; +/* X context to associate windows list with a display */ +XContext display_windows_context; + /* time of last user event and window where it's stored */ static Time last_user_time; static Window user_time_window; @@ -200,12 +204,30 @@ static BOOL has_owned_popups( HWND hwnd ) } +/*********************************************************************** + * init_display_window_list + */ +void init_display_window_list( Display *display ) +{ + struct list *window_list; + + if (!(window_list = heap_alloc( sizeof(*window_list) ))) + { + ERR( "No memory.\n" ); + return; + } + list_init( window_list ); + XSaveContext( gdi_display, (XID)display, display_windows_context, (char *)window_list ); +} + + /*********************************************************************** * alloc_win_data */ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; + struct list *window_list; if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { @@ -213,6 +235,12 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) data->vis = default_visual; data->hwnd = hwnd; EnterCriticalSection( &win_data_section ); + if (display != gdi_display + && !XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + list_add_tail( window_list, &data->display_entry ); + else if (display != gdi_display) + WARN( "No window list for display %p.\n", display ); + XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); } return data; @@ -1764,6 +1792,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (data->client_colormap) XFreeColormap( data->display, data->client_colormap ); HeapFree( GetProcessHeap(), 0, data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); + list_remove( &data->display_entry ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); destroy_gl_drawable( hwnd ); @@ -1771,6 +1800,38 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) } +/*********************************************************************** + * destroy_display_windows + */ +void destroy_display_windows( Display *display ) +{ + struct list *window_list, *head; + HWND hwnd; + + if (XFindContext( gdi_display, (XID)display, display_windows_context, (char **)&window_list )) + { + WARN( "No windows list for display %p.\n", display ); + return; + } + + while (1) + { + EnterCriticalSection( &win_data_section ); + if ((head = list_head( window_list ))) + hwnd = LIST_ENTRY( head, struct x11drv_win_data, display_entry )->hwnd; + else + hwnd = NULL; + LeaveCriticalSection( &win_data_section ); + if (!hwnd) break; + TRACE( "Destroying data for hwnd %p.\n", hwnd ); + X11DRV_DestroyWindow( hwnd ); + } + + XDeleteContext( gdi_display, (XID)display, display_windows_context ); + heap_free( window_list ); +} + + /*********************************************************************** * X11DRV_DestroyNotify */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5ed2fcf73fb..8e79bfd0d32 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -342,6 +342,7 @@ struct x11drv_thread_data struct x11drv_valuator_data y_rel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ + }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; @@ -555,6 +556,7 @@ enum x11drv_net_wm_state struct x11drv_win_data { Display *display; /* display connection for the thread owning the window */ + struct list display_entry; /* list entry in display window list */ XVisualInfo vis; /* X visual used by this window */ Colormap whole_colormap; /* colormap if non-default visual */ Colormap client_colormap; /* colormap for the client window */ @@ -583,6 +585,8 @@ struct x11drv_win_data unsigned int icon_size; }; +extern void init_display_window_list( Display *display ) DECLSPEC_HIDDEN; +extern void destroy_display_windows( Display *display ) DECLSPEC_HIDDEN; extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; @@ -619,6 +623,8 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) extern XContext winContext DECLSPEC_HIDDEN; /* X context to associate a struct x11drv_win_data to an hwnd */ extern XContext win_data_context DECLSPEC_HIDDEN; +/* X context to associate windows list with a display */ +extern XContext display_windows_context DECLSPEC_HIDDEN; /* X context to associate an X cursor to a Win32 cursor handle */ extern XContext cursor_context DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e8b273d055e..4be1137dc03 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -608,6 +608,7 @@ static BOOL process_attach(void) winContext = XUniqueContext(); win_data_context = XUniqueContext(); + display_windows_context = XUniqueContext(); cursor_context = XUniqueContext(); if (TRACE_ON(synchronous)) XSynchronize( display, True ); @@ -645,6 +646,7 @@ void CDECL X11DRV_ThreadDetach(void) if (data) { + destroy_display_windows( data->display ); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); @@ -700,6 +702,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); ExitProcess(1); } + init_display_window_list( data->display ); fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */ -- 2.31.1

1 0

[PATCH v3 1/3] nsiproxy: Convert the reply to ICMP_ECHO_REPLY in the output buffer.
by Gabriel Ivăncescu 14 Oct '21

14 Oct '21

Because iphlpapi has no opportunity to convert the buffer in async mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Handles architecture differences and family (can be easily extended to support IPv6's struct). dlls/iphlpapi/iphlpapi_main.c | 44 ++---------- dlls/nsiproxy.sys/device.c | 103 ++++++++++++++++++++++++--- dlls/nsiproxy.sys/nsiproxy_private.h | 55 ++++++++++++++ include/wine/nsi.h | 21 +----- 4 files changed, 155 insertions(+), 68 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d9a85be..a024224 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4579,33 +4579,6 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) return num_pkts; } -/************************************************************************* - * icmpv4_echo_reply_fixup - * - * Convert struct nsiproxy_icmpv4_echo_reply into ICMP_ECHO_REPLY. - * - * This is necessary due to the different sizes of ICMP_ECHO_REPLY on - * 32 and 64-bits. Despite mention of ICMP_ECHO_REPLY32, 64-bit Windows - * actually does return a full 64-bit version. - */ -static void icmpv4_echo_reply_fixup( ICMP_ECHO_REPLY *dst, struct nsiproxy_icmp_echo_reply *reply ) -{ - dst->Address = reply->addr.Ipv4.sin_addr.s_addr; - dst->Status = reply->status; - dst->RoundTripTime = reply->round_trip_time; - dst->DataSize = reply->data_size; - dst->Reserved = reply->num_of_pkts; - dst->Data = (BYTE *)(dst + 1) + ((reply->opts.options_size + 3) & ~3); - dst->Options.Ttl = reply->opts.ttl; - dst->Options.Tos = reply->opts.tos; - dst->Options.Flags = reply->opts.flags; - dst->Options.OptionsSize = reply->opts.options_size; - dst->Options.OptionsData = (BYTE *)(reply + 1); - - memcpy( dst->Options.OptionsData, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); - memcpy( dst->Data, (BYTE *)reply + reply->data_offset, reply->data_size ); -} - /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) */ @@ -4636,9 +4609,8 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; - DWORD opt_size, in_size, ret = 0, out_size; + DWORD opt_size, in_size, ret = 0; struct nsiproxy_icmp_echo *in; - struct nsiproxy_icmp_echo_reply *out; HANDLE request_event; IO_STATUS_BLOCK iosb; NTSTATUS status; @@ -4658,17 +4630,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); - out_size = reply_size - sizeof(ICMP_ECHO_REPLY) + sizeof(*out); - out = heap_alloc( out_size ); - if (!in || !out) + if (!in) { - heap_free( out ); - heap_free( in ); SetLastError( IP_NO_RESOURCES ); return 0; } + in->addr = (ULONG_PTR)reply; + in->bits = sizeof(void*) * 8; in->src.Ipv4.sin_family = AF_INET; in->src.Ipv4.sin_addr.s_addr = src; in->dst.Ipv4.sin_family = AF_INET; @@ -4689,19 +4659,15 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r status = NtDeviceIoControlFile( data->nsi_device, request_event, NULL, NULL, &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, - out, out_size ); + reply, reply_size ); if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) status = iosb.Status; if (!status) - { - icmpv4_echo_reply_fixup( reply, out ); ret = IcmpParseReplies( reply, reply_size ); - } CloseHandle( request_event ); - heap_free( out ); heap_free( in ); if (status) SetLastError( RtlNtStatusToDosError( status ) ); diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 90a7a3d..e310805 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -31,6 +31,7 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -211,6 +212,57 @@ static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) LeaveCriticalSection( &nsiproxy_cs ); } +static void icmp_echo_reply_fixup( void *out, struct nsiproxy_icmp_echo_reply *reply, ULONGLONG addr, ULONG family, ULONG bits ) +{ + void *data = out; + if (family == AF_INET) + { + void *options_data; + if (bits == 32) + { + struct icmp_echo_reply_32 *dst = out; + dst->addr = reply->addr.Ipv4.sin_addr.s_addr; + dst->status = reply->status; + dst->round_trip_time = reply->round_trip_time; + dst->data_size = reply->data_size; + dst->num_of_pkts = reply->num_of_pkts; + dst->data_ptr = addr + sizeof(*dst) + ((reply->opts.options_size + 3) & ~3); + dst->opts.ttl = reply->opts.ttl; + dst->opts.tos = reply->opts.tos; + dst->opts.flags = reply->opts.flags; + dst->opts.options_size = reply->opts.options_size; + dst->opts.options_ptr = addr + sizeof(*dst); + options_data = dst + 1; + } + else + { + struct icmp_echo_reply_64 *dst = out; + dst->addr = reply->addr.Ipv4.sin_addr.s_addr; + dst->status = reply->status; + dst->round_trip_time = reply->round_trip_time; + dst->data_size = reply->data_size; + dst->num_of_pkts = reply->num_of_pkts; + dst->data_ptr = addr + sizeof(*dst) + ((reply->opts.options_size + 3) & ~3); + dst->opts.ttl = reply->opts.ttl; + dst->opts.tos = reply->opts.tos; + dst->opts.flags = reply->opts.flags; + dst->opts.options_size = reply->opts.options_size; + dst->opts.options_ptr = addr + sizeof(*dst); + options_data = dst + 1; + } + memcpy( options_data, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); + data = (BYTE *)options_data + ((reply->opts.options_size + 3) & ~3); + } + memcpy( data, (BYTE *)reply + reply->data_offset, reply->data_size ); +} + +static int icmp_echo_reply_struct_len( ULONG family, ULONG bits ) +{ + if (family == AF_INET) + return (bits == 32) ? sizeof(struct icmp_echo_reply_32) : sizeof(struct icmp_echo_reply_64); + return 0; +} + static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -222,7 +274,7 @@ static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) if (in_len < offsetof(struct nsiproxy_icmp_echo, data[0]) || in_len < offsetof(struct nsiproxy_icmp_echo, data[((in->opt_size + 3) & ~3) + in->req_size]) || - out_len < sizeof(struct nsiproxy_icmp_echo_reply)) + out_len < icmp_echo_reply_struct_len( in->dst.si_family, in->bits )) return STATUS_INVALID_PARAMETER; switch (in->dst.si_family) @@ -320,19 +372,34 @@ static DWORD WINAPI listen_thread_proc( void *arg ) { IRP *irp = arg; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + unsigned int reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; struct nsiproxy_icmp_echo *in = irp->AssociatedIrp.SystemBuffer; struct icmp_listen_params params; + ULONG family = in->dst.si_family; + ULONGLONG addr = in->addr; + ULONG bits = in->bits; + ULONG struct_len; NTSTATUS status; TRACE( "\n" ); + struct_len = icmp_echo_reply_struct_len( family, bits ); params.handle = irp_get_icmp_handle( irp ); params.timeout = in->timeout; - params.reply = irp->AssociatedIrp.SystemBuffer; - params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + params.reply_len = reply_len - struct_len + sizeof(struct nsiproxy_icmp_echo_reply); + params.reply = heap_alloc( params.reply_len ); - status = nsiproxy_call( icmp_listen, &params ); - TRACE( "icmp_listen rets %08x\n", status ); + if (params.reply) + { + void *reply = irp->AssociatedIrp.SystemBuffer; + status = nsiproxy_call( icmp_listen, &params ); + TRACE( "icmp_listen rets %08x\n", status ); + + icmp_echo_reply_fixup( reply, params.reply, addr, family, bits ); + heap_free( params.reply ); + reply_len = params.reply_len - sizeof(struct nsiproxy_icmp_echo_reply) + struct_len; + } + else status = STATUS_NO_MEMORY; EnterCriticalSection( &nsiproxy_cs ); @@ -340,7 +407,7 @@ static DWORD WINAPI listen_thread_proc( void *arg ) irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) - irp->IoStatus.Information = params.reply_len; + irp->IoStatus.Information = reply_len; else irp->IoStatus.Information = 0; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -353,8 +420,10 @@ static DWORD WINAPI listen_thread_proc( void *arg ) static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; - struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)irp->AssociatedIrp.SystemBuffer; + void *out = irp->AssociatedIrp.SystemBuffer; struct icmp_send_echo_params params; + ULONG family = in->dst.si_family; + ULONG bits = in->bits; NTSTATUS status; TRACE( "\n" ); @@ -372,9 +441,23 @@ static void handle_queued_send_echo( IRP *irp ) irp->IoStatus.Status = status; if (status == STATUS_SUCCESS) { - memset( reply, 0, sizeof(*reply) ); - reply->status = params.ip_status; - irp->IoStatus.Information = sizeof(*reply); + if (family == AF_INET) + { + if (bits == 32) + { + struct icmp_echo_reply_32 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + else + { + struct icmp_echo_reply_64 *reply = out; + memset( reply, 0, sizeof(*reply) ); + reply->status = params.ip_status; + irp->IoStatus.Information = sizeof(*reply); + } + } } IoCompleteRequest( irp, IO_NO_INCREMENT ); } diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 91dd393..0694757 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -34,3 +34,58 @@ struct icmp_send_echo_params HANDLE handle; ULONG ip_status; }; + +/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ +struct nsiproxy_icmp_echo_reply +{ + SOCKADDR_INET addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + DWORD data_offset; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + DWORD options_offset; + } opts; +}; + +struct icmp_echo_reply_32 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONG options_ptr; + } opts; +}; + +struct icmp_echo_reply_64 +{ + ULONG addr; + ULONG status; + ULONG round_trip_time; + USHORT data_size; + USHORT num_of_pkts; + ULONGLONG data_ptr; + struct + { + BYTE ttl; + BYTE tos; + BYTE flags; + BYTE options_size; + ULONGLONG options_ptr; + } opts; +}; diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 9664b53..4e60ff6 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -426,6 +426,8 @@ struct nsiproxy_icmp_echo { SOCKADDR_INET src; SOCKADDR_INET dst; + ULONGLONG addr; /* user-mode reply buffer address */ + BYTE bits; BYTE ttl; BYTE tos; BYTE flags; @@ -435,25 +437,6 @@ struct nsiproxy_icmp_echo BYTE data[1]; /* ((opt_size + 3) & ~3) + req_size */ }; -/* output for IOCTL_NSIPROXY_WINE_ICMP_ECHO - cf. ICMP_ECHO_REPLY */ -struct nsiproxy_icmp_echo_reply -{ - SOCKADDR_INET addr; - ULONG status; - ULONG round_trip_time; - USHORT data_size; - USHORT num_of_pkts; - DWORD data_offset; - struct - { - BYTE ttl; - BYTE tos; - BYTE flags; - BYTE options_size; - DWORD options_offset; - } opts; -}; - /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0 -- 2.31.1

2 4

[PATCH 6/6] win32u: Move winstation initialization from user32.
by Jacek Caban 14 Oct '21

14 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 105 +------------------------- dlls/win32u/font.c | 16 +--- dlls/win32u/syscall.c | 4 +- dlls/win32u/win32u_private.h | 17 +++++ dlls/win32u/winstation.c | 138 ++++++++++++++++++++++++++++++++++- 5 files changed, 160 insertions(+), 120 deletions(-)

1 0

[PATCH 4/6] win32u: Move NtUserOpenDesktop implementation from user32.
by Jacek Caban 14 Oct '21

14 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winstation.c | 25 +++++++------------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 13 +++++++++++++ include/ntuser.h | 1 + 7 files changed, 48 insertions(+), 19 deletions(-)

1 0

[PATCH 3/6] win32u: Move NtUserCreateDesktopEx implementation from user32.
by Jacek Caban 14 Oct '21

14 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winstation.c | 27 ++++++++------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 32 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 19 +++++++++++++++++++ include/ntuser.h | 4 ++++ 7 files changed, 66 insertions(+), 20 deletions(-)

1 0

[PATCH 2/6] win32u: Move NtUserOpenWindowStation implementation from user32.
by Jacek Caban 14 Oct '21

14 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winstation.c | 33 +++++++++++---------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 19 +++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 44 insertions(+), 23 deletions(-)

1 0

[PATCH 1/6] win32u: Move NtUserCreateWindowStation implementation from user32.
by Jacek Caban 14 Oct '21

14 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winstation.c | 37 ++++++------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 28 +++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 17 ++++++++ dlls/wow64win/wow64win_private.h | 67 ++++++++++++++++++++++++++++++++ include/ntuser.h | 2 + 8 files changed, 128 insertions(+), 27 deletions(-)

1 0

[PATCH 1/4] dinput8/tests: Remove old packet report id checks in HID driver.
by Rémi Bernon 14 Oct '21

14 Oct '21

It's superseded with the new expect list, and generally invalid if report id is not 1. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/driver_hid.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 4a5bca85abc..45c9f3e14ab 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -498,7 +498,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -522,7 +521,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -547,7 +545,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -571,7 +568,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); -- 2.33.0

2 6

[v2 PATCH 1/7] d3d10/effect: Use shader variable directly from pass structure on Apply().
by Nikolay Sivov 14 Oct '21

14 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: added explicit test to show a difference between Set*Shader(NULL) and no shader being set. dlls/d3d10/d3d10_private.h | 15 --- dlls/d3d10/effect.c | 185 +++++++++++++------------------------ dlls/d3d10/tests/effect.c | 22 +++++ 3 files changed, 86 insertions(+), 136 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 6979d2a114e..fbcc36e5e06 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -73,19 +73,6 @@ struct d3d10_matrix float m[4][4]; }; -struct d3d10_effect_object -{ - struct d3d10_effect_pass *pass; - enum d3d10_effect_object_type type; - union - { - ID3D10VertexShader *vs; - ID3D10PixelShader *ps; - ID3D10GeometryShader *gs; - IUnknown *object; - } object; -}; - struct d3d10_effect_shader_resource { D3D10_SHADER_INPUT_TYPE in_type; @@ -236,9 +223,7 @@ struct d3d10_effect_pass struct d3d10_effect_technique *technique; char *name; - DWORD object_count; DWORD annotation_count; - struct d3d10_effect_object *objects; struct d3d10_effect_variable *annotations; struct d3d10_effect_pass_shader_desc vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0ba906375d7..d4e44a7f419 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1734,17 +1734,17 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size, } static HRESULT parse_fx10_object(const char *data, size_t data_size, - const char **ptr, struct d3d10_effect_object *o) + const char **ptr, struct d3d10_effect_pass *pass) { ID3D10EffectVariable *variable = &null_variable.ID3D10EffectVariable_iface; const char *data_ptr = NULL; DWORD offset, sodecl_offset; enum d3d10_effect_object_operation operation; HRESULT hr; - struct d3d10_effect *effect = o->pass->technique->effect; + struct d3d10_effect *effect = pass->technique->effect; ID3D10Effect *e = &effect->ID3D10Effect_iface; struct d3d10_effect_variable *v; - DWORD tmp, variable_idx = 0; + DWORD tmp, object_type, variable_idx = 0; const char *name; size_t name_len; @@ -1754,8 +1754,8 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, return E_FAIL; } - read_dword(ptr, &o->type); - TRACE("Effect object is of type %#x.\n", o->type); + read_dword(ptr, &object_type); + TRACE("Effect object is of type %#x.\n", object_type); read_dword(ptr, &tmp); TRACE("Effect object index %#x.\n", tmp); @@ -1771,7 +1771,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOO_CONST: TRACE("Copy variable values\n"); - switch (o->type) + switch (object_type) { case D3D10_EOT_VERTEXSHADER: TRACE("Vertex shader\n"); @@ -1789,7 +1789,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_STENCIL_REF: - if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->stencil_ref)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &pass->stencil_ref)) { ERR("Failed to read stencil ref.\n"); return E_FAIL; @@ -1797,7 +1797,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_SAMPLE_MASK: - if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->sample_mask)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &pass->sample_mask)) { FIXME("Failed to read sample mask.\n"); return E_FAIL; @@ -1805,7 +1805,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_BLEND_FACTOR: - if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &o->pass->blend_factor[0])) + if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &pass->blend_factor[0])) { FIXME("Failed to read blend factor.\n"); return E_FAIL; @@ -1813,7 +1813,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x\n", o->type); + FIXME("Unhandled object type %#x\n", object_type); return E_FAIL; } break; @@ -1873,7 +1873,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, read_dword(&data_ptr, &sodecl_offset); if (FAILED(hr = parse_fx10_anonymous_shader(effect, - &effect->anonymous_shaders[effect->anonymous_shader_current], o->type))) + &effect->anonymous_shaders[effect->anonymous_shader_current], object_type))) return hr; v = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; @@ -1893,7 +1893,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, TRACE("Stream output declaration: %s.\n", debugstr_a(v->u.shader.stream_output_declaration)); } - switch (o->type) + switch (object_type) { case D3D10_EOT_VERTEXSHADER: case D3D10_EOT_PIXELSHADER: @@ -1903,7 +1903,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x\n", o->type); + FIXME("Unhandled object type %#x\n", object_type); return E_FAIL; } break; @@ -1913,7 +1913,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, return E_FAIL; } - switch (o->type) + switch (object_type) { case D3D10_EOT_RASTERIZER_STATE: { @@ -1927,10 +1927,10 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->rasterizer = &v->elements[variable_idx]; + pass->rasterizer = &v->elements[variable_idx]; } else - o->pass->rasterizer = v; + pass->rasterizer = v; break; } @@ -1946,10 +1946,10 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->depth_stencil = &v->elements[variable_idx]; + pass->depth_stencil = &v->elements[variable_idx]; } else - o->pass->depth_stencil = v; + pass->depth_stencil = v; break; } @@ -1965,40 +1965,34 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->blend = &v->elements[variable_idx]; + pass->blend = &v->elements[variable_idx]; } else - o->pass->blend = v; + pass->blend = v; break; } case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetVertexShader(sv, variable_idx, &o->object.vs))) - return hr; - o->pass->vs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->vs.index = variable_idx; + pass->vs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->vs.index = variable_idx; break; } case D3D10_EOT_PIXELSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetPixelShader(sv, variable_idx, &o->object.ps))) - return hr; - o->pass->ps.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->ps.index = variable_idx; + pass->ps.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->ps.index = variable_idx; break; } case D3D10_EOT_GEOMETRYSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetGeometryShader(sv, variable_idx, &o->object.gs))) - return hr; - o->pass->gs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->gs.index = variable_idx; + pass->gs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->gs.index = variable_idx; break; } @@ -2008,7 +2002,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x.\n", o->type); + FIXME("Unhandled object type %#x.\n", object_type); return E_FAIL; } @@ -2018,9 +2012,9 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, static HRESULT parse_fx10_pass(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_pass *p) { + DWORD offset, object_count; HRESULT hr = S_OK; unsigned int i; - DWORD offset; read_dword(ptr, &offset); TRACE("Pass name at offset %#x.\n", offset); @@ -2032,8 +2026,8 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, } TRACE("Pass name: %s.\n", debugstr_a(p->name)); - read_dword(ptr, &p->object_count); - TRACE("Pass has %u effect objects.\n", p->object_count); + read_dword(ptr, &object_count); + TRACE("Pass has %u effect objects.\n", object_count); read_dword(ptr, &p->annotation_count); TRACE("Pass has %u annotations.\n", p->annotation_count); @@ -2045,23 +2039,13 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, return hr; } - if (!(p->objects = heap_calloc(p->object_count, sizeof(*p->objects)))) - { - ERR("Failed to allocate effect objects memory.\n"); - return E_OUTOFMEMORY; - } - p->vs.shader = &null_shader_variable; p->ps.shader = &null_shader_variable; p->gs.shader = &null_shader_variable; - for (i = 0; i < p->object_count; ++i) + for (i = 0; i < object_count; ++i) { - struct d3d10_effect_object *o = &p->objects[i]; - - o->pass = p; - - if (FAILED(hr = parse_fx10_object(data, data_size, ptr, o))) + if (FAILED(hr = parse_fx10_object(data, data_size, ptr, p))) return hr; } @@ -2927,42 +2911,6 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d return parse_dxbc(data, data_size, fx10_chunk_handler, This); } -static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) -{ - ID3D10Device *device = o->pass->technique->effect->device; - - TRACE("effect object %p, type %#x.\n", o, o->type); - - switch(o->type) - { - case D3D10_EOT_RASTERIZER_STATE: - case D3D10_EOT_DEPTH_STENCIL_STATE: - case D3D10_EOT_BLEND_STATE: - case D3D10_EOT_STENCIL_REF: - case D3D10_EOT_BLEND_FACTOR: - case D3D10_EOT_SAMPLE_MASK: - break; - - case D3D10_EOT_VERTEXSHADER: - ID3D10Device_VSSetShader(device, o->object.vs); - return S_OK; - - case D3D10_EOT_PIXELSHADER: - ID3D10Device_PSSetShader(device, o->object.ps); - return S_OK; - - case D3D10_EOT_GEOMETRYSHADER: - ID3D10Device_GSSetShader(device, o->object.gs); - return S_OK; - - default: - FIXME("Unhandled effect object type %#x.\n", o->type); - return E_FAIL; - } - - return S_OK; -} - static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, D3D10_SHADER_VARIABLE_TYPE type) { @@ -3087,25 +3035,6 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) } } -static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) -{ - switch (o->type) - { - case D3D10_EOT_RASTERIZER_STATE: - case D3D10_EOT_DEPTH_STENCIL_STATE: - case D3D10_EOT_BLEND_STATE: - case D3D10_EOT_VERTEXSHADER: - case D3D10_EOT_PIXELSHADER: - case D3D10_EOT_GEOMETRYSHADER: - if (o->object.object) - IUnknown_Release(o->object.object); - break; - - default: - break; - } -} - static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { unsigned int i; @@ -3114,15 +3043,6 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) heap_free(p->name); - if (p->objects) - { - for (i = 0; i < p->object_count; ++i) - { - d3d10_effect_object_destroy(&p->objects[i]); - } - heap_free(p->objects); - } - if (p->annotations) { for (i = 0; i < p->annotation_count; ++i) @@ -4109,12 +4029,35 @@ static void apply_shader_resources(ID3D10Device *device, struct d3d10_effect_var } } +static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, + const struct d3d10_effect_pass_shader_desc *shader_desc) +{ + ID3D10Device *device = pass->technique->effect->device; + struct d3d10_effect_variable *v = shader_desc->shader; + + if (v->type->element_count) + v = &v->elements[shader_desc->index]; + + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetShader(device, v->u.shader.shader.vs); + break; + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetShader(device, v->u.shader.shader.ps); + break; + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetShader(device, v->u.shader.shader.gs); + break; + default: + WARN("Unexpected shader type %u.\n", v->type->basetype); + } +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); ID3D10Device *device = pass->technique->effect->device; - HRESULT hr = S_OK; - unsigned int i; TRACE("iface %p, flags %#x\n", iface, flags); @@ -4134,14 +4077,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (pass->blend) ID3D10Device_OMSetBlendState(device, pass->blend->u.state.object.blend, pass->blend_factor, pass->sample_mask); + if (pass->vs.shader != &null_shader_variable) + d3d10_effect_pass_set_shader(pass, &pass->vs); + if (pass->ps.shader != &null_shader_variable) + d3d10_effect_pass_set_shader(pass, &pass->ps); + if (pass->gs.shader != &null_shader_variable) + d3d10_effect_pass_set_shader(pass, &pass->gs); - for (i = 0; i < pass->object_count; ++i) - { - hr = d3d10_effect_object_apply(&pass->objects[i]); - if (FAILED(hr)) break; - } - - return hr; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 781abb46745..6ad3f7421f4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2909,6 +2909,7 @@ static void test_effect_local_shader(void) D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs, *ps, *vs; + ID3D10PixelShader *ps_d3d, *ps_d3d_2; D3D10_EFFECT_SHADER_DESC shaderdesc; D3D10_SIGNATURE_PARAMETER_DESC sign; D3D10_STATE_BLOCK_MASK mask; @@ -3005,6 +3006,12 @@ if (0) hr = p->lpVtbl->GetGeometryShaderDesc(p, NULL); ok(hr == E_INVALIDARG, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + v = effect->lpVtbl->GetVariableByName(effect, "p"); + ps = v->lpVtbl->AsShader(v); + + hr = ps->lpVtbl->GetPixelShader(ps, 0, &ps_d3d); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* get the null_shader_variable */ v = effect->lpVtbl->GetVariableByIndex(effect, 10000); null_shader = v->lpVtbl->AsShader(v); @@ -3024,6 +3031,13 @@ if (0) ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); ok(!ret, "Unexpected mask.\n"); + ID3D10Device_PSSetShader(device, ps_d3d); + hr = p->lpVtbl->Apply(p, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_PSGetShader(device, &ps_d3d_2); + ok(ps_d3d_2 == ps_d3d, "Unexpected shader object.\n"); + ID3D10PixelShader_Release(ps_d3d_2); + hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); @@ -3051,6 +3065,12 @@ if (0) /* pass 1 */ p = t->lpVtbl->GetPassByIndex(t, 1); + ID3D10Device_PSSetShader(device, ps_d3d); + hr = p->lpVtbl->Apply(p, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_PSGetShader(device, &ps_d3d_2); + ok(!ps_d3d_2, "Unexpected shader object.\n"); + /* pass 1 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); @@ -3881,6 +3901,8 @@ todo_wine effect->lpVtbl->Release(effect); + ID3D10PixelShader_Release(ps_d3d); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } -- 2.33.0

3 16

[PATCH v3] wininet: Clear cached credentials after the first failed attempt.
by Alistair Leslie-Hughes 14 Oct '21

14 Oct '21

Windows when using cached credentials will use them on the first challenge, if then a second 403 (ACCESS_DENIED) is received, the user is prompted again but this time with the password and save checkbox cleared. v2: Use a BOOL flag variable. v3: Reset flags on success. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 24 +++++++++++++++++++++++- dlls/wininet/internet.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a48c75865ac..5837b9f95d3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -152,9 +152,25 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, p = wcschr( szUserPass, ':' ); if( p ) { + struct WININET_ErrorDlgParams *params; + HWND hwnd; + + params = (struct WININET_ErrorDlgParams*) + GetWindowLongPtrW( hdlg, GWLP_USERDATA ); + *p = 0; SetWindowTextW( hUserItem, szUserPass ); - SetWindowTextW( hPassItem, p+1 ); + + if (!params->req->clear_auth) + { + SetWindowTextW( hPassItem, p+1 ); + + hwnd = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); + if (hwnd) + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + } + else + WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } return TRUE; @@ -264,6 +280,8 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); WININET_SetAuthorization( params->req, username, password, TRUE ); + params->req->clear_auth = TRUE; + EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; } @@ -340,6 +358,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } WININET_SetAuthorization( params->req, username, password, FALSE ); + params->req->clear_auth = TRUE; EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; @@ -509,6 +528,9 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_AUTHDLG ), hWnd, WININET_PasswordDialog, (LPARAM) &params ); break; + case HTTP_STATUS_OK: + req->clear_auth = FALSE; + break; default: WARN("unhandled status %u\n", req->status_code); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b361c0d1b4d..141613dd120 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -361,6 +361,7 @@ typedef struct LPWSTR statusText; DWORD bytesToWrite; DWORD bytesWritten; + BOOL clear_auth; /* Flag to clear the password field on the authorization dialog */ CRITICAL_SECTION headers_section; /* section to protect the headers array */ HTTPHEADERW *custHeaders; -- 2.33.0

1 0

[PATCH] include: SYSTEM_INTERRUPT_INFORMATION use known variables names
by Alistair Leslie-Hughes 14 Oct '21

14 Oct '21

Based off information found here. https://www.geoffchappell.com/studies/windows/km/ntoskrnl/api/ex/sysinfo/in… Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winternl.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 46ee508e89f..6b1c5b11b4f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2469,7 +2469,12 @@ typedef struct _SYSTEM_CACHE_INFORMATION { /* System Information Class 0x17 */ typedef struct _SYSTEM_INTERRUPT_INFORMATION { - BYTE Reserved1[24]; + ULONG ContextSwitches; + ULONG DpcCount; + ULONG DpcRate; + ULONG TimeIncrement; + ULONG DpcBypassCount; + ULONG ApcBypassCount; } SYSTEM_INTERRUPT_INFORMATION, *PSYSTEM_INTERRUPT_INFORMATION; typedef struct _SYSTEM_CONFIGURATION_INFO { -- 2.33.0

1 0

[PATCH resend] dbghelp: Support UWOP_EPILOG in unwind
by Alistair Leslie-Hughes 14 Oct '21

14 Oct '21

This code is the same that appears in ntdll/signal_x86_64.c Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/cpu_x86_64.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 8e8ac85dd2f..4fd8d76e010 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -209,6 +209,19 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F case UWOP_PUSH_MACHFRAME: TRACE("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); break; + case UWOP_EPILOG: + if (info->Version == 2) + { + unsigned int offset; + if (info->UnwindCode[i].u.OpInfo) + offset = info->UnwindCode[i].u.CodeOffset; + else + offset = (info->UnwindCode[i+1].u.OpInfo << 8) + info->UnwindCode[i+1].u.CodeOffset; + TRACE("UWOP_EPILOG %u offset %u\n", info->UnwindCode[i].u.OpInfo, offset); + i += 1; + break; + } + /* Fall through */ default: FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); break; @@ -490,7 +503,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, return FALSE; } - if (info->Version != 1) + if (info->Version != 1 && info->Version != 2) { WARN("unknown unwind info version %u at %lx\n", info->Version, base + function->UnwindData); return FALSE; -- 2.33.0

1 0

[PATCH] wmp: The return value should be checked.
by Shao Ming 14 Oct '21

14 Oct '21

Signed-off-by: Shao Ming <shaoming(a)uniontech.com> --- dlls/wmp/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 04a9f204639..eb6466d1592 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -158,7 +158,7 @@ static HRESULT activate_inplace(WindowsMediaPlayer *This) IOleInPlaceSiteEx_OnInPlaceActivateEx(ipsiteex, &redraw, 0); ipsite = (IOleInPlaceSite*)ipsiteex; }else { - IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ipsite); + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ipsite); if(FAILED(hres)) { FIXME("No IOleInPlaceSite instance\n"); return hres; -- 2.20.1

1 0

[PATCH v2 1/7] wined3d: Return the map pitch from wined3d_device_context_emit_map().
by Zebediah Figura 13 Oct '21

13 Oct '21

Partially undoes 61024aa12f. We may want to be able to return an existing BO from context->ops->map_upload_bo(), in which case it is structurally awkward to request a specific memory layout. We may also want to give map_upload_bo() the freedom to allocate either a new (smaller) BO, or use an existing (larger) one, for partial uploads. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 37 ++++++++++++++++++++++------------ dlls/wined3d/device.c | 5 +---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 51718a8a4d0..ce9e6fca214 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2491,27 +2491,32 @@ static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) op->sub_resource_idx, op->map_ptr, op->box, op->flags); } -HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, struct wined3d_resource *resource, - unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags) +HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) { unsigned int row_pitch, slice_pitch; struct wined3d_cs_map *op; + void *map_ptr; HRESULT hr; - wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - - if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - && (*map_ptr = context->ops->map_upload_bo(context, resource, - sub_resource_idx, box, row_pitch, slice_pitch, flags))) - { - TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", *map_ptr, row_pitch, slice_pitch); - return WINED3D_OK; - } - /* Mapping resources from the worker thread isn't an issue by itself, but * increasing the map count would be visible to applications. */ wined3d_not_from_cs(context->device->cs); + wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); + + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + && (map_ptr = context->ops->map_upload_bo(context, resource, + sub_resource_idx, box, row_pitch, slice_pitch, flags))) + { + TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", map_ptr, row_pitch, slice_pitch); + map_desc->data = map_ptr; + map_desc->row_pitch = row_pitch; + map_desc->slice_pitch = slice_pitch; + return WINED3D_OK; + } + wined3d_resource_wait_idle(resource); if (!(op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP))) @@ -2519,7 +2524,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; - op->map_ptr = map_ptr; + op->map_ptr = &map_ptr; op->box = box; op->flags = flags; op->hr = &hr; @@ -2527,6 +2532,12 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_device_context_finish(context, WINED3D_CS_QUEUE_MAP); + if (FAILED(hr)) + return hr; + + map_desc->data = map_ptr; + map_desc->row_pitch = row_pitch; + map_desc->slice_pitch = slice_pitch; return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 436c4dfe854..b8c1630ee25 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4957,10 +4957,7 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, } wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_context_emit_map(context, resource, - sub_resource_idx, &map_desc->data, box, flags))) - wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, - &map_desc->row_pitch, &map_desc->slice_pitch); + hr = wined3d_device_context_emit_map(context, resource, sub_resource_idx, map_desc, box, flags); wined3d_mutex_unlock(); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56c90ba6606..a2899e6a778 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4867,7 +4867,7 @@ void wined3d_device_context_emit_execute_command_list(struct wined3d_device_cont void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, - struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, + struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; void wined3d_device_context_emit_reset_state(struct wined3d_device_context *context, bool invalidate) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, -- 2.33.0

3 14

[PATCH] wined3d: Count all bo's towards retired bo size.
by Jan Sikorski 13 Oct '21

13 Oct '21

Some memory may be counted more than once, as suballocations and as backing memory for these suballocations. It doesn't seem worth worrying about, since the threshold and the mechanism itself are heuristic. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8f0751785ad..af7b9fc1830 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -901,6 +901,9 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const TRACE("context_vk %p, bo %p.\n", context_vk, bo); + if (bo->command_buffer_id == context_vk->current_command_buffer.id) + context_vk->retired_bo_size += bo->size; + if ((slab_vk = bo->slab)) { if (bo->map_ptr) @@ -923,9 +926,6 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); - - if (bo->command_buffer_id == context_vk->current_command_buffer.id) - context_vk->retired_bo_size += bo->size; } void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) -- 2.30.2

2 1

[PATCH v2 1/3] wined3d: Make reference count decrementing functions thread safe.
by Jan Sikorski 13 Oct '21

13 Oct '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 ++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/palette.c | 4 ++++ dlls/wined3d/query.c | 2 ++ dlls/wined3d/sampler.c | 2 ++ dlls/wined3d/state.c | 6 ++++++ dlls/wined3d/texture.c | 7 +++++++ dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/view.c | 12 ++++++++++++ 10 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3ea3bf4b180..6a87393b8c8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -708,8 +708,10 @@ ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) if (!refcount) { + wined3d_mutex_lock(); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); buffer->resource.device->adapter->adapter_ops->adapter_destroy_buffer(buffer); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1b4ed519260..529ab4fd159 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -99,7 +99,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { SIZE_T i; - wined3d_mutex_lock(); for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) @@ -109,6 +108,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 436c4dfe854..3d3130777eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -263,8 +263,10 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) if (!refcount) { + wined3d_mutex_lock(); device->adapter->adapter_ops->adapter_destroy_device(device); TRACE("Destroyed device %p.\n", device); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 85105d1f8de..4bc453bde79 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -47,7 +47,11 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) + { + wined3d_mutex_lock(); wined3d_cs_destroy_object(palette->device->cs, wined3d_palette_destroy_object, palette); + wined3d_mutex_unlock(); + } return refcount; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8ee7ae07886..1b38eb5e311 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -444,9 +444,11 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) { struct wined3d_device *device = query->device; + wined3d_mutex_lock(); query->parent_ops->wined3d_object_destroyed(query->parent); wined3d_cs_destroy_object(device->cs, wined3d_query_destroy_object, query); device->adapter->adapter_ops->adapter_destroy_query(query); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 7eb3a2ae0be..bba3165316e 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -41,8 +41,10 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) if (!refcount) { + wined3d_mutex_lock(); sampler->parent_ops->wined3d_object_destroyed(sampler->parent); sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8316269afcf..c7f041066d1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -62,8 +62,10 @@ ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -136,8 +138,10 @@ ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_stat if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -199,8 +203,10 @@ ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *sta if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 339bf4e205a..f031daef373 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1536,6 +1536,11 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) if (!refcount) { + bool in_cs_thread = GetCurrentThreadId() == texture->resource.device->cs->thread_id; + + /* This is called from the CS thread to destroy temporary textures. */ + if (!in_cs_thread) + wined3d_mutex_lock(); /* Wait for the texture to become idle if it's using user memory, * since the application is allowed to free that memory once the * texture is destroyed. Note that this implies that @@ -1550,6 +1555,8 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) } } texture->resource.device->adapter->adapter_ops->adapter_destroy_texture(texture); + if (!in_cs_thread) + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 45a01f4bdd4..a778352d2cf 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -68,9 +68,11 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration if (!refcount) { + wined3d_mutex_lock(); declaration->parent_ops->wined3d_object_destroyed(declaration->parent); wined3d_cs_destroy_object(declaration->device->cs, wined3d_vertex_declaration_destroy_object, declaration); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 565d35d1c5a..03ac1a0d9ff 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -376,7 +376,11 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_rendertarget_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -923,7 +927,11 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -1441,7 +1449,11 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_unordered_access_view(view); + wined3d_mutex_unlock(); + } return refcount; } -- 2.30.2

3 5

[PATCH] mscoree/tests: remove unused parameter in sprintf
by Eric Pouech 13 Oct '21

13 Oct '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mscoree/tests/comtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 6c0d081cbd3..f6dc93c1070 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -166,7 +166,7 @@ static void run_registry_test(run_type run) if (run == run_type_exe_directory) result_expected = S_OK; else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test)); ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); if (ret == ERROR_ACCESS_DENIED && !IsUserAnAdmin()) {

2 1

[PATCH] user32: Reimplement destroy_thread_windows() on top of WIN_DestroyWindow().
by Paul Gofman 13 Oct '21

13 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 217103. USER_Driver->pThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when, for instance, the windows is still used for Vulkan rendering (even if only to tear down the device and swapchain). Besides, the windows destroyed in destroy_thread_windows() are still considered valid in the server until thread terminates and, e. g., calling IsWindow() on already destroyed window will still show that as valid between destroy_thread_windows() and thread termination. Then, it looks like a few objects referenced in WND structure are getting leaked. It looks like WIN_DestroyWindow() does everything which is needed. The message(s) it may send to the window being destroyed do not matter as the messages to the thread being destroyed are filtered out anyway. dlls/user32/user_main.c | 4 +++- dlls/user32/win.c | 51 +++++++++-------------------------------- 2 files changed, 14 insertions(+), 41 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 30e5d154d3d..f4b0f110dc2 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -358,9 +358,11 @@ static void thread_detach(void) exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); - USER_Driver->pThreadDetach(); destroy_thread_windows(); + + USER_Driver->pThreadDetach(); + CloseHandle( thread_info->server_queue ); HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); HeapFree( GetProcessHeap(), 0, thread_info->key_state ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5e89f4c2c97..43207484790 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1181,24 +1181,25 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) /*********************************************************************** * next_thread_window */ -static WND *next_thread_window( HWND *hwnd ) +static HWND first_thread_window(void) { struct user_object *ptr; + HWND ret = NULL; + WORD index; WND *win; - WORD index = *hwnd ? USER_HANDLE_TO_INDEX( *hwnd ) + 1 : 0; USER_Lock(); - while (index < NB_USER_HANDLES) + for (index = 0; index < NB_USER_HANDLES; ++index) { - if (!(ptr = user_handles[index++])) continue; + if (!(ptr = user_handles[index])) continue; if (ptr->type != USER_WINDOW) continue; win = (WND *)ptr; if (win->tid != GetCurrentThreadId()) continue; - *hwnd = ptr->handle; - return win; + ret = ptr->handle; + break; } USER_Unlock(); - return NULL; + return ret; } @@ -1209,40 +1210,10 @@ static WND *next_thread_window( HWND *hwnd ) */ void destroy_thread_windows(void) { - WND *wndPtr; - HWND hwnd = 0, *list; - HMENU menu, sys_menu; - struct window_surface *surface; - int i; - - while ((wndPtr = next_thread_window( &hwnd ))) - { - /* destroy the client-side storage */ + HWND hwnd; - list = WIN_ListChildren( hwnd ); - menu = ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) ? (HMENU)wndPtr->wIDmenu : 0; - sys_menu = wndPtr->hSysMenu; - free_dce( wndPtr->dce, hwnd ); - surface = wndPtr->surface; - InterlockedCompareExchangePointer( &user_handles[USER_HANDLE_TO_INDEX(hwnd)], NULL, wndPtr ); - WIN_ReleasePtr( wndPtr ); - HeapFree( GetProcessHeap(), 0, wndPtr ); - if (menu) DestroyMenu( menu ); - if (sys_menu) DestroyMenu( sys_menu ); - if (surface) - { - register_window_surface( surface, NULL ); - window_surface_release( surface ); - } - - /* free child windows */ - - if (!list) continue; - for (i = 0; list[i]; i++) - if (!WIN_IsCurrentThread( list[i] )) - SendNotifyMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 ); - HeapFree( GetProcessHeap(), 0, list ); - } + while ((hwnd = first_thread_window())) + WIN_DestroyWindow( hwnd ); } -- 2.31.1

2 2

[PATCH v3] ole32: Implement CreateObjrefMoniker().
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

v3: Use separate implementation from pointer moniker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/moniker.h | 4 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_objidl.idl | 6 + dlls/ole32/oleproxy.c | 13 + dlls/ole32/pointermoniker.c | 531 +++++++++++++++++++++++++++++++++++- dlls/ole32/tests/moniker.c | 221 ++++++++++++++- include/objidl.idl | 5 +- 7 files changed, 776 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 8549bd46c1e..2106e374394 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -26,15 +26,17 @@ DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 ); DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 ); DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 ); +DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); -DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); +DEFINE_OLEGUID( CLSID_ObjrefMoniker, 0x327, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); +HRESULT WINAPI ObjrefMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 8e73fdd16b4..d9ffd63585c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -103,7 +103,7 @@ @ stdcall CreateGenericComposite(ptr ptr ptr) @ stdcall CreateILockBytesOnHGlobal(ptr long ptr) @ stdcall CreateItemMoniker(wstr wstr ptr) -@ stub CreateObjrefMoniker +@ stdcall CreateObjrefMoniker(ptr ptr) @ stdcall CreateOleAdviseHolder(ptr) @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) combase.CreateStreamOnHGlobal diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index 0cc3ccea9e5..97f91224839 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -105,6 +105,12 @@ coclass ClassMoniker { interface IMoniker; } ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +[ + threading(both), + uuid(00000327-0000-0000-c000-000000000046) +] +coclass ObjrefMoniker { interface IMoniker; } + [ helpstring("Component Categories Manager"), threading(both), diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index e40e2b073e5..c429ce02b3b 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -137,6 +137,17 @@ static const IClassFactoryVtbl PointerMonikerCFVtbl = static IClassFactory PointerMonikerCF = { &PointerMonikerCFVtbl }; +static const IClassFactoryVtbl ObjrefMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ObjrefMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ObjrefMonikerCF = { &ObjrefMonikerCFVtbl }; + static const IClassFactoryVtbl ComCatCFVtbl = { ClassFactory_QueryInterface, @@ -198,6 +209,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return IClassFactory_QueryInterface(&CompositeMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) return IClassFactory_QueryInterface(&ClassMonikerCF, iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_ObjrefMoniker)) + return IClassFactory_QueryInterface(&ObjrefMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) return IClassFactory_QueryInterface(&PointerMonikerCF, iid, ppv); if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 051d42aca6d..f75c2e3f0f4 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -1,5 +1,5 @@ /* - * Pointer Moniker Implementation + * Pointer and Objref Monikers Implementation * * Copyright 1999 Noomen Hamza * Copyright 2008 Robert Shearman (for CodeWeavers) @@ -641,3 +641,532 @@ HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, return hr; } + +/* ObjrefMoniker implementation */ + +typedef struct ObjrefMonikerImpl +{ + IMoniker IMoniker_iface; + IMarshal IMarshal_iface; + + LONG refcount; + + IUnknown *pObject; +} ObjrefMonikerImpl; + +static inline ObjrefMonikerImpl *objref_impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, ObjrefMonikerImpl, IMoniker_iface); +} + +static ObjrefMonikerImpl *objref_impl_from_IMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, ObjrefMonikerImpl, IMarshal_iface); +} + +static ObjrefMonikerImpl *unsafe_objref_impl_from_IMoniker(IMoniker *iface); + +static HRESULT WINAPI ObjrefMonikerImpl_QueryInterface(IMoniker *iface, REFIID iid, void **obj) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), obj); + + if (!obj) + return E_INVALIDARG; + + *obj = 0; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IPersist) || + IsEqualIID(iid, &IID_IPersistStream) || + IsEqualIID(iid, &IID_IMoniker) || + IsEqualGUID(iid, &CLSID_ObjrefMoniker) || + IsEqualGUID(iid, &CLSID_PointerMoniker)) + { + *obj = iface; + } + else if (IsEqualIID(iid, &IID_IMarshal)) + *obj = &moniker->IMarshal_iface; + else + return E_NOINTERFACE; + + IMoniker_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI ObjrefMonikerImpl_AddRef(IMoniker *iface) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); + ULONG refcount = InterlockedIncrement(&moniker->refcount); + + TRACE("%p, refcount %u\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI ObjrefMonikerImpl_Release(IMoniker *iface) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->refcount); + + TRACE("%p, refcount %u\n", iface, refcount); + + if (!refcount) + { + if (moniker->pObject) IUnknown_Release(moniker->pObject); + heap_free(moniker); + } + + return refcount; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetClassID(IMoniker *iface, CLSID *clsid) +{ + TRACE("(%p,%p)\n", iface, clsid); + + if (!clsid) + return E_POINTER; + + *clsid = CLSID_ObjrefMoniker; + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_IsDirty(IMoniker *iface) +{ + /* Note that the OLE-provided implementations of the IPersistStream::IsDirty + method in the OLE-provided moniker interfaces always return S_FALSE because + their internal state never changes. */ + + TRACE("(%p)\n",iface); + + return S_FALSE; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Load(IMoniker *iface, IStream *stream) +{ + TRACE("(%p)\n", stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Save(IMoniker *iface, IStream *stream, BOOL dirty) +{ + FIXME("(%p,%p,%d): stub\n", iface, stream, dirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER *size) +{ + TRACE("(%p,%p)\n", iface, size); + + if (!size) + return E_POINTER; + + size->u.LowPart = 0; + size->u.HighPart = 0; + + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *left, + REFIID riid, void **result) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); + + TRACE("(%p,%p,%p,%s,%p)\n", iface, pbc, left, debugstr_guid(riid), result); + + if (!moniker->pObject) + return E_UNEXPECTED; + + return IUnknown_QueryInterface(moniker->pObject, riid, result); +} + +static HRESULT WINAPI ObjrefMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *left, + REFIID riid, void **result) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); + + TRACE("(%p,%p,%p,%s,%p)\n", iface, pbc, left, debugstr_guid(riid), result); + + if (!moniker->pObject) + return E_UNEXPECTED; + + return IUnknown_QueryInterface(moniker->pObject, riid, result); +} + +static HRESULT WINAPI ObjrefMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar, + IMoniker **left, IMoniker **reduced) +{ + TRACE("(%p,%p,%d,%p,%p)\n", iface, pbc, howfar, left, reduced); + + if (!reduced) + return E_POINTER; + + ObjrefMonikerImpl_AddRef(iface); + + *reduced = iface; + + return MK_S_REDUCED_TO_SELF; +} + +static HRESULT WINAPI ObjrefMonikerImpl_ComposeWith(IMoniker *iface, IMoniker *right, + BOOL only_if_not_generic, IMoniker **result) +{ + DWORD order; + + TRACE("(%p,%p,%d,%p)\n", iface, right, only_if_not_generic, result); + + if (!result || !right) + return E_POINTER; + + *result = NULL; + + if (is_anti_moniker(right, &order)) + return order > 1 ? create_anti_moniker(order - 1, result) : S_OK; + + return only_if_not_generic ? MK_E_NEEDGENERIC : CreateGenericComposite(iface, right, result); +} + +static HRESULT WINAPI ObjrefMonikerImpl_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **enummoniker) +{ + TRACE("(%p,%d,%p)\n", iface, forward, enummoniker); + + if (!enummoniker) + return E_POINTER; + + *enummoniker = NULL; + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_IsEqual(IMoniker *iface, IMoniker *other) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface), *other_moniker; + + TRACE("(%p,%p)\n", iface, other); + + if (!other) + return E_INVALIDARG; + + other_moniker = unsafe_objref_impl_from_IMoniker(other); + if (!other_moniker) + return S_FALSE; + + return moniker->pObject == other_moniker->pObject ? S_OK : S_FALSE; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Hash(IMoniker *iface, DWORD *hash) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); + + TRACE("(%p,%p)\n", iface, hash); + + if (!hash) + return E_POINTER; + + *hash = PtrToUlong(moniker->pObject); + + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_IsRunning(IMoniker *iface, IBindCtx *pbc, IMoniker *left, + IMoniker *running) +{ + TRACE("(%p,%p,%p,%p)\n", iface, pbc, left, running); + + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetTimeOfLastChange(IMoniker *iface, + IBindCtx *pbc, IMoniker *left, FILETIME *time) +{ + TRACE("(%p,%p,%p,%p)\n", iface, pbc, left, time); + return MK_E_UNAVAILABLE; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Inverse(IMoniker *iface, IMoniker **moniker) +{ + TRACE("(%p,%p)\n", iface, moniker); + + return CreateAntiMoniker(moniker); +} + +static HRESULT WINAPI ObjrefMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **prefix) +{ + TRACE("(%p,%p,%p)\n", iface, other, prefix); + + if (!prefix || !other) + return E_INVALIDARG; + + *prefix = NULL; + + if (ObjrefMonikerImpl_IsEqual(iface, other) == S_OK) + { + IMoniker_AddRef(iface); + + *prefix = iface; + + return MK_S_US; + } + else + return MK_E_NOPREFIX; +} + +static HRESULT WINAPI ObjrefMonikerImpl_RelativePathTo(IMoniker *iface, IMoniker *other, IMoniker **result) +{ + TRACE("(%p,%p,%p)\n", iface, other, result); + + if (!result) + return E_INVALIDARG; + + *result = NULL; + + return other ? E_NOTIMPL : E_INVALIDARG; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *left, LPOLESTR *name) +{ + FIXME("(%p,%p,%p,%p): stub\n", iface, pbc, left, name); + + if (!name) + return E_POINTER; + + *name = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *left, LPOLESTR name, ULONG *eaten, IMoniker **out) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface); + HRESULT hr; + IParseDisplayName *pdn; + + TRACE("(%p,%p,%p,%p,%p,%p)\n", iface, pbc, left, name, eaten, out); + + if (left) + return MK_E_SYNTAX; + + if (!moniker->pObject) + return E_UNEXPECTED; + + hr = IUnknown_QueryInterface(moniker->pObject, &IID_IParseDisplayName, (void **)&pdn); + if (FAILED(hr)) + return hr; + + hr = IParseDisplayName_ParseDisplayName(pdn, pbc, name, eaten, out); + IParseDisplayName_Release(pdn); + + return hr; +} + +static HRESULT WINAPI ObjrefMonikerImpl_IsSystemMoniker(IMoniker *iface, DWORD *mksys) +{ + TRACE("(%p,%p)\n", iface, mksys); + + if (!mksys) + return E_POINTER; + + *mksys = MKSYS_OBJREFMONIKER; + return S_OK; +} + +static const IMonikerVtbl VT_ObjrefMonikerImpl = +{ + ObjrefMonikerImpl_QueryInterface, + ObjrefMonikerImpl_AddRef, + ObjrefMonikerImpl_Release, + ObjrefMonikerImpl_GetClassID, + ObjrefMonikerImpl_IsDirty, + ObjrefMonikerImpl_Load, + ObjrefMonikerImpl_Save, + ObjrefMonikerImpl_GetSizeMax, + ObjrefMonikerImpl_BindToObject, + ObjrefMonikerImpl_BindToStorage, + ObjrefMonikerImpl_Reduce, + ObjrefMonikerImpl_ComposeWith, + ObjrefMonikerImpl_Enum, + ObjrefMonikerImpl_IsEqual, + ObjrefMonikerImpl_Hash, + ObjrefMonikerImpl_IsRunning, + ObjrefMonikerImpl_GetTimeOfLastChange, + ObjrefMonikerImpl_Inverse, + ObjrefMonikerImpl_CommonPrefixWith, + ObjrefMonikerImpl_RelativePathTo, + ObjrefMonikerImpl_GetDisplayName, + ObjrefMonikerImpl_ParseDisplayName, + ObjrefMonikerImpl_IsSystemMoniker +}; + +static ObjrefMonikerImpl *unsafe_objref_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_ObjrefMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, ObjrefMonikerImpl, IMoniker_iface); +} + +static HRESULT WINAPI objref_moniker_marshal_QueryInterface(IMarshal *iface, REFIID riid, LPVOID *ppv) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static ULONG WINAPI objref_moniker_marshal_AddRef(IMarshal *iface) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI objref_moniker_marshal_Release(IMarshal *iface) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI objref_moniker_marshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, clsid); + + return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid); +} + +static HRESULT WINAPI objref_moniker_marshal_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *size) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %d, %p, %#x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, size); + + return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags); +} + +static HRESULT WINAPI objref_moniker_marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, + void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x.\n", stream, debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags); + + return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext, + pvDestContext, mshlflags); +} + +static HRESULT WINAPI objref_moniker_marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, + REFIID riid, void **ppv) +{ + ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", iface, stream, debugstr_guid(riid), ppv); + + hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object); + if (FAILED(hr)) + { + ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr); + return hr; + } + + if (moniker->pObject) + IUnknown_Release(moniker->pObject); + moniker->pObject = object; + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static HRESULT WINAPI objref_moniker_marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + TRACE("%p, %p.\n", iface, stream); + + return S_OK; +} + +static HRESULT WINAPI objref_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved) +{ + TRACE("%p, %#x.\n", iface, reserved); + + return S_OK; +} + +static const IMarshalVtbl objref_moniker_marshal_vtbl = +{ + objref_moniker_marshal_QueryInterface, + objref_moniker_marshal_AddRef, + objref_moniker_marshal_Release, + objref_moniker_marshal_GetUnmarshalClass, + objref_moniker_marshal_GetMarshalSizeMax, + objref_moniker_marshal_MarshalInterface, + objref_moniker_marshal_UnmarshalInterface, + objref_moniker_marshal_ReleaseMarshalData, + objref_moniker_marshal_DisconnectObject +}; + +/*********************************************************************** + * CreateObjrefMoniker (OLE32.@) + */ +HRESULT WINAPI CreateObjrefMoniker(IUnknown *obj, IMoniker **ret) +{ + ObjrefMonikerImpl *moniker; + + TRACE("(%p,%p)\n", obj, ret); + + if (!ret) + return E_INVALIDARG; + + moniker = heap_alloc(sizeof(*moniker)); + if (!moniker) + { + *ret = NULL; + return E_OUTOFMEMORY; + } + + moniker->IMoniker_iface.lpVtbl = &VT_ObjrefMonikerImpl; + moniker->IMarshal_iface.lpVtbl = &objref_moniker_marshal_vtbl; + moniker->refcount = 1; + moniker->pObject = obj; + if (moniker->pObject) + IUnknown_AddRef(moniker->pObject); + + *ret = &moniker->IMoniker_iface; + + return S_OK; +} + +HRESULT WINAPI ObjrefMoniker_CreateInstance(IClassFactory *iface, IUnknown *unk, REFIID iid, void **obj) +{ + IMoniker *moniker; + HRESULT hr; + + TRACE("(%p,%s,%p)\n", unk, debugstr_guid(iid), obj); + + *obj = NULL; + + if (unk) + return CLASS_E_NOAGGREGATION; + + hr = CreateObjrefMoniker(NULL, &moniker); + if (FAILED(hr)) + return hr; + + hr = IMoniker_QueryInterface(moniker, iid, obj); + IMoniker_Release(moniker); + + return hr; +} diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8d3276651bc..53aa583c1cb 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -82,9 +82,10 @@ static const CLSID CLSID_TestMoniker = DEFINE_OLEGUID(CLSID_FileMoniker, 0x303, 0, 0); DEFINE_OLEGUID(CLSID_ItemMoniker, 0x304, 0, 0); DEFINE_OLEGUID(CLSID_AntiMoniker, 0x305, 0, 0); +DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0); DEFINE_OLEGUID(CLSID_ClassMoniker, 0x31a, 0, 0); -DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); +DEFINE_OLEGUID(CLSID_ObjrefMoniker, 0x327, 0, 0); #define TEST_MONIKER_TYPE_TODO(m,t) _test_moniker_type(m, t, TRUE, __LINE__) #define TEST_MONIKER_TYPE(m,t) _test_moniker_type(m, t, FALSE, __LINE__) @@ -3861,7 +3862,7 @@ todo_wine hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); - ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class.\n"); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class %s.\n", wine_dbgstr_guid(&clsid)); hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); @@ -4076,6 +4077,221 @@ todo_wine IMoniker_Release(moniker); } +static void test_objref_moniker(void) +{ + IMoniker *moniker, *moniker2, *prefix, *inverse, *anti; + struct test_factory factory; + IEnumMoniker *enummoniker; + DWORD hash, size; + HRESULT hr; + IBindCtx *bindctx; + FILETIME filetime; + IUnknown *unknown; + IStream *stream; + IROTData *rotdata; + LPOLESTR display_name; + IMarshal *marshal; + LARGE_INTEGER pos; + CLSID clsid; + + test_factory_init(&factory); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + + hr = IMoniker_QueryInterface(moniker, &CLSID_ObjrefMoniker, (void **)&unknown); + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + + hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); + ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_ObjrefMoniker), "Unexpected class %s.\n", wine_dbgstr_guid(&clsid)); + + hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); + ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); + ok(size > 0, "Unexpected size %d.\n", size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "Failed to marshal moniker, hr %#x.\n", hr); + + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2); + ok(hr == S_OK, "Failed to unmarshal, hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Expected equal moniker, hr %#x.\n", hr); + IMoniker_Release(moniker2); + + IStream_Release(stream); + + IMarshal_Release(marshal); + + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); + + /* Display Name */ + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); +todo_wine + ok(hr == S_OK, "IMoniker_GetDisplayName failed: 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); + + /* IROTData::GetComparisonData test */ + + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + /* Saving */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: 0x%08x\n", hr); + + hr = IMoniker_Save(moniker, stream, TRUE); +todo_wine + ok(hr == S_OK, "IMoniker_Save failed: 0x%08x\n", hr); + + IStream_Release(stream); + + /* Hashing */ + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "IMoniker_Hash failed: 0x%08x\n", hr); + ok(hash == PtrToUlong(&factory.IClassFactory_iface), "Unexpected hash value %#x.\n", hash); + + /* IsSystemMoniker test */ + TEST_MONIKER_TYPE(moniker, MKSYS_OBJREFMONIKER); + + hr = IMoniker_Inverse(moniker, &inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + TEST_MONIKER_TYPE(inverse, MKSYS_ANTIMONIKER); + IMoniker_Release(inverse); + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); + IUnknown_Release(unknown); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); + IUnknown_Release(unknown); + + IMoniker_Release(moniker); + +todo_wine + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); + + hr = CreateObjrefMoniker(NULL, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed, hr %#x.\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(enummoniker == NULL, "got %p\n", enummoniker); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(enummoniker == NULL, "got %p\n", enummoniker); + + IMoniker_Release(moniker); + + /* CommonPrefixWith() */ + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker2); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, NULL, &prefix); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(prefix == moniker, "Unexpected pointer.\n"); + IMoniker_Release(prefix); + + IMoniker_Release(moniker2); + + hr = CreateObjrefMoniker((IUnknown *)moniker, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + + /* ComposeWith() */ + + /* P + A -> () */ + anti = create_antimoniker(1); + hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); + ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + IMoniker_Release(anti); + + /* P + A2 -> A */ + anti = create_antimoniker(2); + hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); + ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker2, MKSYS_ANTIMONIKER); + IMoniker_Release(moniker2); + + IMoniker_Release(anti); + + IMoniker_Release(moniker); +} + static void test_bind_context(void) { IRunningObjectTable *rot, *rot2; @@ -4385,6 +4601,7 @@ START_TEST(moniker) test_anti_moniker(); test_generic_composite_moniker(); test_pointer_moniker(); + test_objref_moniker(); test_save_load_filemoniker(); test_MonikerCommonPrefixWith(); diff --git a/include/objidl.idl b/include/objidl.idl index 7576a686aeb..cd11729b292 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -330,7 +330,10 @@ interface IMoniker : IPersistStream MKSYS_ITEMMONIKER = 4, MKSYS_POINTERMONIKER = 5, /* MKSYS_URLMONIKER = 6, */ /* defined in urlmon.idl */ - MKSYS_CLASSMONIKER = 7 + MKSYS_CLASSMONIKER = 7, + MKSYS_OBJREFMONIKER = 8, + MKSYS_SESSIONMONIKER = 9, + MKSYS_LUAMONIKER = 10 } MKSYS; typedef [v1_enum] enum tagMKREDUCE { -- 2.31.1

2 2

[PATCH] make_unicode: Update vertical.c path.
by Jacek Caban 13 Oct '21

13 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/make_unicode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

Failing vkd3d tests/d3d12
by Rafał Miłecki 13 Oct '21

13 Oct '21

Hi, I'm trying to run Diablo II: Resurrected for 3 days now and it keeps failing with the: "Failed to initialize graphics device. Please ensure your PC meets the minimum system requirements and your drivers are up to date." I use openSUSE 15.3 with: 1. Wine updated to the 6.19 2. vkd3d 1.2 (installed as Wine dependency) 3. Mesa updated to the 21.2.3 I suspect that Direct3D 12 simply doesn't work for some reason. I decided to verify that using vkd3d tests. I downloaded vkd3d 1.2 sources and exectued: ./configure make check That gave me a failing tests/d3d12 and a lot of fixme-s & some d3d12 debugging messages in the test-suite.log . My laptop is AMD Ryzen 5 PRO 2500U (so integrated GPU). > glxinfo | grep --max-count=4 OpenGL OpenGL vendor string: AMD OpenGL renderer string: AMD Radeon(TM) Vega 8 Graphics (RAVEN, DRM 3.39.0, 5.3.18-59.24-default, LLVM 11.0.1) OpenGL core profile version string: 4.6 (Core Profile) Mesa 21.2.3 OpenGL core profile shading language version string: 4.60 I would like to kindly ask for your help and some suggestion on what may I be missing in my system that breaks vkd3d. ================================= vkd3d 1.2: ./test-suite.log ================================= # TOTAL: 5 # PASS: 4 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: tests/d3d12 ================= fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_device_CheckFeatureSupport: Multi-adapter not supported. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x42. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x43. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x44. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x45. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x55. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x56. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x59. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x64. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x65. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x66. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x67. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x68. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x69. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x6a. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x6b. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x6c. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x6d. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x6e. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x6f. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x70. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x71. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x72. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0x73. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_device_CheckFeatureSupport: Unhandled format 0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_device_get_vkd3d_queue: Unhandled command list type 0x1. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_device_get_vkd3d_queue: Unhandled command list type 0x1. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:blend_attachment_from_d3d12: Ignoring LogicOpEnable 0x1. fixme:d3d12_pipeline_state_init_graphics: Format 0x1c is not depth/stencil format. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. d3d12:579: Driver name: radv, driver info: Mesa 21.2.3. d3d12:1043: Node count: 1. d3d12:1111: UMA 0, cache coherent UMA 0, tile based renderer 0. d3d12:1135: Max supported feature level 0xb100. d3d12:1227:format 0x43: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x43: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x44: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x44: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x45: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x45: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x55: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x55: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x56: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x56: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x59: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x59: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x64: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x64: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x65: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x65: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x66: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x66: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x67: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x67: Todo: Got plane count 0, expected 2. d3d12:1227:format 0x68: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x68: Todo: Got plane count 0, expected 2. d3d12:1227:format 0x69: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x69: Todo: Got plane count 0, expected 2. d3d12:1227:format 0x6a: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x6a: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x6b: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x6b: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x6c: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x6c: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x6d: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x6d: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x6e: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x6e: Todo: Got plane count 0, expected 2. d3d12:1227:format 0x6f: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x6f: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x70: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x70: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x71: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x71: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x72: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x72: Todo: Got plane count 0, expected 1. d3d12:1227:format 0x73: Todo: Failed to get format info, hr 0x80070057. d3d12:1230:format 0x73: Todo: Got plane count 0, expected 1. d3d12:1240: GPU virtual address bits per resource: 40. d3d12:1242: GPU virtual address bits per process: 40. d3d12:1293: Todo: Got unexpected hr 0x80070057. d3d12:1294: Todo: Got unexpected support1 0. d3d12:1866: Todo: Got unexpected hr 0. d3d12:2432: Test skipped: Tiled resources are not supported. d3d12:2645: Sampler descriptor handle increment size: 32. d3d12:2672: MinMaxFiltering: 0. d3d12:2713: CBV/SRV/UAV descriptor size: 32. d3d12:2848: Todo: Got unexpected hr 0. d3d12:2883: Todo: Got unexpected hr 0. d3d12:4476: DSV descriptor handle increment size: 48. d3d12:4610: RTV descriptor handle increment size: 48. d3d12:4983:Test 20: Todo: Got 0x0000ffff, expected 0x00000000 at (0, 0, 0). d3d12:4983:Test 28: Todo: Got 0x000000ff, expected 0x00000000 at (0, 0, 0). d3d12:5257:Dim 0, Test 13: Todo: At layer 0, (0,0,0), expected 0x2345, got 0xffff. d3d12:5257:Dim 0, Test 17: Todo: At layer 0, (0,0,0), expected 0x23, got 0xff. d3d12:5257:Dim 1, Test 13: Todo: At lafixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_rtv_desc_create_rtv: NULL resource RTV not implemented. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_resource_Map: Not implemented for textures. fixme:d3d12_resource_Map: Not implemented for textures. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_desc_create_srv: Ignoring plane slice 1. fixme:d3d12_desc_create_srv: Ignoring plane slice 1. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_dsv_desc_create_dsv: Ignoring flags 0x1. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_desc_create_srv: Ignoring plane slice 1. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_dxbc_compiler_emit_dcl_resource_structured: Unhandled UAV flags 0x100. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:vkd3d_dxbc_compiler_emit_dcl_resource_structured: Unhandled UAV flags 0x100. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_dxbc_compiler_emit_dcl_resource_structured: Unhandled UAV flags 0x100. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_command_list_ResolveQueryData: D3D12 guarantees binary occlusion queries result in only 0 and 1. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 3. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 2. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 4. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 2. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 3. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 4. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 2. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:vkd3d_dxbc_compiler_check_index_range: Unhandled index range write mask 0x1 (0xf). fixme:vkd3d_dxbc_compiler_emit_dcl_index_range: Ignoring dcl_index_range 0x6 3. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_set_view_swizzle_for_format: Alpha swizzle is not supported. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_command_list_check_index_buffer_strip_cut_value: Strip cut value 0xffff is not supported with index buffer format 0x2a. fixme:d3d12_command_list_check_index_buffer_strip_cut_value: Strip cut value 0xffff is not supported with index buffer format 0x2a. fixme:d3d12_command_list_check_index_buffer_strip_cut_value: Strip cut value 0xffffffff is not supported with index buffer format 0x39. fixme:d3d12_command_list_check_index_buffer_strip_cut_value: Strip cut value 0xffffffff is not supported with index buffer format 0x39. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_command_list_SetPredication: Predication doesn't support clear and copy commands, and predication values are treated as 32-bit values. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xb. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:shader_sm4_read_instruction_modifier: Unhandled resource type 0xc. fixme:shader_sm4_read_instruction_modifier: Unhandled data type 0x6. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:d3d12_command_list_WriteBufferImmediate: iface 0x4631ef0, count 2, parameters 0x7fffb04ec600, modes (nil) stub! fixme:d3d12_command_list_WriteBufferImmediate: iface 0x4631ef0, count 2, parameters 0x7fffb04ec600, modes 0x7fffb04ec5f8 stub! fixme:d3d12_command_list_WriteBufferImmediate: iface 0x4631ef0, count 2, parameters 0x7fffb04ec600, modes 0x7fffb04ec5f8 stub! fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:vkd3d_dxbc_compiler_emit_dcl_resource_structured: Unhandled UAV flags 0x100. fixme:vkd3d_dxbc_compiler_emit_dcl_resource_structured: Unhandled UAV flags 0x100. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. fixme:debug_vk_memory_property_flags: Unrecognized flag(s) 0xc0. yer 0, (0,0,0), expected 0x2345, got 0xffff. d3d12:5257:Dim 1, Test 17: Todo: At layer 0, (0,0,0), expected 0x23, got 0xff. d3d12:5257:Dim 2, Test 13: Todo: At layer 0, (0,0,0), expected 0x2345, got 0xffff. d3d12:5257:Dim 2, Test 17: Todo: At layer 0, (0,0,0), expected 0x23, got 0xff. d3d12:6956: Fixed bug: Got 0x000001f4, expected 0x000001f4 at (1, 1, 1). d3d12:7113: Todo: Got unexpected hr 0. d3d12:7190: Todo: Got unexpected hr 0x80070057. d3d12:7452: Test skipped: Bundles are not implemented yet. d3d12:9967:31:if_return: Fixed bug: Got {1.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 0.00000000e+00, 0.00000000e+00, 0.00000000e+00} at (32, 32). d3d12:9967:34:if_return: Fixed bug: Got {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00} at (32, 32). d3d12:9967:37:if_return: Fixed bug: Got {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 0.00000000e+00} at (32, 32). d3d12:9967:41:if_return: Fixed bug: Got {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00} at (32, 32). d3d12:9967:48:if_return: Fixed bug: Got {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00}, expected {1.00000000e+00, 1.00000000e+00, 1.00000000e+00, 1.00000000e+00} at (32, 32). d3d12:16235: Todo: Got unexpected value 0xff0000ff. d3d12:22297: Todo succeeded: Test 0: Got 0 (0), expected 0 (0) for 'atomic_imax' with inputs (1, 0), (-1), 0 (0). d3d12:22297: Todo succeeded: Test 0: Got 0xffffffff (-1), expected 0xffffffff (-1) for 'atomic_imin' with inputs (1, 0), (-1), 0 (0). d3d12:22317: Todo succeeded: Test 0: Got 0 (0), expected 0 (0) for 'imm_atomic_imax' with inputs (1, 0), (-1), 0 (0). d3d12:22317: Todo succeeded: Test 0: Got 0xffffffff (-1), expected 0xffffffff (-1) for 'imm_atomic_imin' with inputs (1, 0), (-1), 0 (0). d3d12:23209: Todo: Got unexpected result 0. d3d12:29617: Size 4096, alignment 4096. d3d12:30894:Test 8: Todo: Got 0xff00ff00, expected 0xffffffff at (16, 0, 0). d3d12:30888:Test 10: Todo: Got 0xffffffff, expected 0xff00ff00 at (0, 0, 0). d3d12:31443: Test skipped: Wait() is not implemented yet. d3d12:32059: Bug: Got 0xffffffff, expected 0xffffffff at (32, 32, 1). d3d12:32111: Todo: Got 0xff00ff00, expected 0xffffffff at (0, 0, 0). d3d12:32228: Todo: Got 0x28384858, expected 0x39495969 at (0, 0, 0). d3d12:32294: Bug: Got 0x39495969, expected 0x39495969 at (1, 1, 1). d3d12:32791: Todo: Got unexpected value 0xdeadbeef, expected 0x1020304. d3d12:32793: Todo: Got unexpected value 0xf00baa, expected 0xc0d0e0f. d3d12:32810: Todo: Got unexpected value 0xdeadbeef, expected 0x2030405. d3d12:32812: Todo: Got unexpected value 0xf00baa, expected 0xb0c0d0e. d3d12:32819: Todo: Got unexpected hr 0. d3d12: 2452893 tests executed (4 failures, 3 skipped, 70 todo, 8 bugs). FAIL tests/d3d12 (exit status: 1)

2 4

[PATCH] user32: Add an exception handler to GetWindowText.
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 29 ++++++++++++++++---- dlls/user32/win.c | 59 ++++++++++++++++++++++++++++++----------- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6b13d93be14..2679ea0813f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7923,17 +7923,36 @@ static void test_gettext(void) if (0) { r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000); - ok( r == 0, "settext should return zero\n"); + ok(r == 0, "WM_GETTEXT should return zero (%ld)\n", r); r = SendMessageA( hwnd, WM_GETTEXT, 0x10000, 0); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok(r == 0, "WM_GETTEXT should return zero (%ld)\n", r); r = SendMessageA( hwnd, WM_GETTEXT, 0xff000000, 0x1000); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok(r == 0, "WM_GETTEXT should return zero (%ld)\n", r); r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000); - ok( r == 0, "settext should return zero (%ld)\n", r); - } + ok(r == 0, "WM_GETTEXT should return zero (%ld)\n", r); + } + + /* GetWindowText doesn't crash */ + r = GetWindowTextA(hwnd, (LPSTR)0x10, 0x1000); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); + r = GetWindowTextA(hwnd, (LPSTR)0x10000, 0); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); + r = GetWindowTextA(hwnd, (LPSTR)0xff000000, 0x1000); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); + r = GetWindowTextA(hwnd, (LPSTR)0x1000, 0xff000000); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); + + r = GetWindowTextW(hwnd, (LPWSTR)0x10, 0x1000); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); + r = GetWindowTextW(hwnd, (LPWSTR)0x10000, 0); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); + r = GetWindowTextW(hwnd, (LPWSTR)0xff000000, 0x1000); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); + r = GetWindowTextW(hwnd, (LPWSTR)0x1000, 0xff000000); + ok(r == 0, "GetWindowText should return zero (%ld)\n", r); DestroyWindow(hwnd); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5e89f4c2c97..e57f291be35 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -35,6 +35,7 @@ #include "controls.h" #include "winerror.h" #include "wine/gdi_driver.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -3001,22 +3002,34 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) { WCHAR *buffer; + int ret = 0; if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { - lpString[0] = 0; - return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + if (WIN_IsCurrentProcess( hwnd )) + { + lpString[0] = 0; + ret = (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else if ((buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, buffer, nMaxCount ); + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) + lpString[nMaxCount-1] = 0; + HeapFree( GetProcessHeap(), 0, buffer ); + ret = strlen(lpString); + } + } + __EXCEPT_ALL + { + ret = 0; } + __ENDTRY - /* when window belongs to other process, don't send a message */ - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) return 0; - get_server_window_text( hwnd, buffer, nMaxCount ); - if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) - lpString[nMaxCount-1] = 0; - HeapFree( GetProcessHeap(), 0, buffer ); - return strlen(lpString); + return ret; } @@ -3049,17 +3062,31 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) */ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) { + int ret; + if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { - lpString[0] = 0; - return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + if (WIN_IsCurrentProcess( hwnd )) + { + lpString[0] = 0; + ret = (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, lpString, nMaxCount ); + ret = lstrlenW(lpString); + } } + __EXCEPT_ALL + { + ret = 0; + } + __ENDTRY - /* when window belongs to other process, don't send a message */ - get_server_window_text( hwnd, lpString, nMaxCount ); - return lstrlenW(lpString); + return ret; } -- 2.31.1

4 8

[PATCH 6/8] win32u: Move NtUserOpenInputDesktop implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user32.spec | 2 +- dlls/user32/winstation.c | 25 ------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 28 ++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 8 files changed, 42 insertions(+), 27 deletions(-)

2 1

[PATCH 5/8] win32u: Move NtUserSetThreadDesktop implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

2 1

[PATCH v4] winex11.drv: Add video adapter description to the registry.
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

v2: Without setting "HardwareInformation.MemorySize" key. v3: strlen() -> sizeof(). v4: Perform string size calculation ealier. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/display.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c8c216c8302..65336888c13 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -463,6 +463,11 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -538,9 +543,9 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + size = (strlenW(gpu->name) + 1) * sizeof(WCHAR); /* Write DriverDesc value */ - if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, - (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, size)) goto done; /* Write DriverDateData value, using current time as driver date, needed by Evoland */ GetSystemTimeAsFileTime(&filetime); @@ -551,6 +556,14 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_SZ, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_SZ, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_SZ, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_SZ, (const BYTE *)ramdacW, sizeof(ramdacW))) + goto done; RegCloseKey(hkey); -- 2.31.1

1 0

[PATCH v3] winex11.drv: Add video adapter description to the registry.
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

v2: Without setting "HardwareInformation.MemorySize" key. v3: strlen() -> sizeof(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/display.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c8c216c8302..2930f6062c7 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -463,6 +463,11 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -551,6 +556,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + size = (strlenW(gpu->name) + 1) * sizeof(WCHAR); + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_SZ, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_SZ, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_SZ, (const BYTE *)gpu->name, size)) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_SZ, (const BYTE *)ramdacW, sizeof(ramdacW))) + goto done; RegCloseKey(hkey); -- 2.31.1

3 3

[PATCH] winevulkan: Update to VK spec version 1.2.196.
by Georg Lehmann 13 Oct '21

13 Oct '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9f0380ae619..0a22834dc4d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.195" +VK_XML_VERSION = "1.2.196" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.33.0

1 0

[PATCH v2] winex11.drv: Add video adapter description to the registry.
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

v2: Without setting "HardwareInformation.MemorySize" key. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/display.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c8c216c8302..74431a92a6b 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -463,6 +463,11 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -551,6 +556,14 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_SZ, (const BYTE *)ramdacW, (strlenW(ramdacW) + 1) * sizeof(WCHAR))) + goto done; RegCloseKey(hkey); -- 2.31.1

2 4

[PATCH 1/5] tools/winedump: fix incorrect alignment
by Eric Pouech 13 Oct '21

13 Oct '21

(BTW dbghelp is already doing the right thing) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 2c3d406347e..b7b7eb435ff 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1161,7 +1161,7 @@ BOOL codeview_dump_types_from_block(const void* table, unsigned long len) codeview_dump_one_type(curr_type, type); curr_type++; - ptr += (type->generic.len + 2 + 3) & ~3; + ptr += type->generic.len + 2; } return TRUE;

1 4

[PATCH v2 6/7] win32u: Move NtUserCloseWindowStation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed comment in the new user.c file. Thanks, Nikolay. dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/winstation.c | 16 -------------- dlls/win32u/Makefile.in | 1 + dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 45 ++++++++++++++++++++++++++++++++++++++ dlls/wow64win/Makefile.in | 3 ++- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 35 +++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntuser.h | 27 +++++++++++++++++++++++ 13 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 dlls/win32u/winstation.c create mode 100644 dlls/wow64win/user.c create mode 100644 include/ntuser.h

2 2

[PATCH v2] ole32: Implement CreateObjrefMoniker().
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

v2: Fix module refcount test failure under Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/moniker.h | 4 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_objidl.idl | 6 + dlls/ole32/oleproxy.c | 13 +++ dlls/ole32/pointermoniker.c | 186 ++++++++++++++++++++++++++++-- dlls/ole32/tests/moniker.c | 220 +++++++++++++++++++++++++++++++++++- include/objidl.idl | 5 +- 7 files changed, 423 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 8549bd46c1e..2106e374394 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -26,15 +26,17 @@ DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 ); DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 ); DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 ); +DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); -DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); +DEFINE_OLEGUID( CLSID_ObjrefMoniker, 0x327, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); +HRESULT WINAPI ObjrefMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 8e73fdd16b4..d9ffd63585c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -103,7 +103,7 @@ @ stdcall CreateGenericComposite(ptr ptr ptr) @ stdcall CreateILockBytesOnHGlobal(ptr long ptr) @ stdcall CreateItemMoniker(wstr wstr ptr) -@ stub CreateObjrefMoniker +@ stdcall CreateObjrefMoniker(ptr ptr) @ stdcall CreateOleAdviseHolder(ptr) @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) combase.CreateStreamOnHGlobal diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index 0cc3ccea9e5..97f91224839 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -105,6 +105,12 @@ coclass ClassMoniker { interface IMoniker; } ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +[ + threading(both), + uuid(00000327-0000-0000-c000-000000000046) +] +coclass ObjrefMoniker { interface IMoniker; } + [ helpstring("Component Categories Manager"), threading(both), diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index e40e2b073e5..c429ce02b3b 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -137,6 +137,17 @@ static const IClassFactoryVtbl PointerMonikerCFVtbl = static IClassFactory PointerMonikerCF = { &PointerMonikerCFVtbl }; +static const IClassFactoryVtbl ObjrefMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ObjrefMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ObjrefMonikerCF = { &ObjrefMonikerCFVtbl }; + static const IClassFactoryVtbl ComCatCFVtbl = { ClassFactory_QueryInterface, @@ -198,6 +209,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return IClassFactory_QueryInterface(&CompositeMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) return IClassFactory_QueryInterface(&ClassMonikerCF, iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_ObjrefMoniker)) + return IClassFactory_QueryInterface(&ObjrefMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) return IClassFactory_QueryInterface(&PointerMonikerCF, iid, ppv); if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 051d42aca6d..ea145b8b9c0 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -1,5 +1,5 @@ /* - * Pointer Moniker Implementation + * Pointer and Objref Monikers Implementation * * Copyright 1999 Noomen Hamza * Copyright 2008 Robert Shearman (for CodeWeavers) @@ -470,13 +470,6 @@ static const IMonikerVtbl VT_PointerMonikerImpl = PointerMonikerImpl_IsSystemMoniker }; -static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) -{ - if (iface->lpVtbl != &VT_PointerMonikerImpl) - return NULL; - return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); -} - static HRESULT WINAPI pointer_moniker_marshal_QueryInterface(IMarshal *iface, REFIID riid, LPVOID *ppv) { PointerMonikerImpl *moniker = impl_from_IMarshal(iface); @@ -641,3 +634,180 @@ HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, return hr; } + +/* ObjrefMoniker implementation */ + +static HRESULT WINAPI ObjrefMonikerImpl_QueryInterface(IMoniker *iface, REFIID iid, void **obj) +{ + PointerMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), obj); + + if (!obj) + return E_INVALIDARG; + + *obj = 0; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IPersist) || + IsEqualIID(iid, &IID_IPersistStream) || + IsEqualIID(iid, &IID_IMoniker) || + IsEqualGUID(iid, &CLSID_ObjrefMoniker) || + IsEqualGUID(iid, &CLSID_PointerMoniker)) + { + *obj = iface; + } + else if (IsEqualIID(iid, &IID_IMarshal)) + *obj = &moniker->IMarshal_iface; + else + return E_NOINTERFACE; + + IMoniker_AddRef(iface); + + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetClassID(IMoniker *iface, CLSID *clsid) +{ + TRACE("(%p,%p)\n", iface, clsid); + + if (!clsid) + return E_POINTER; + + *clsid = CLSID_ObjrefMoniker; + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Save(IMoniker *iface, IStream *stream, BOOL dirty) +{ + FIXME("(%p,%p,%d): stub\n", iface, stream, dirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **enummoniker) +{ + TRACE("(%p,%d,%p)\n", iface, forward, enummoniker); + + if (!enummoniker) + return E_POINTER; + + *enummoniker = NULL; + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetTimeOfLastChange(IMoniker *iface, + IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *pAntiTime) +{ + TRACE("(%p,%p,%p,%p)\n", iface, pbc, pmkToLeft, pAntiTime); + return MK_E_UNAVAILABLE; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) +{ + FIXME("(%p,%p,%p,%p): stub\n", iface, pbc, pmkToLeft, ppszDisplayName); + + if (!ppszDisplayName) + return E_POINTER; + + *ppszDisplayName = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_IsSystemMoniker(IMoniker *iface, DWORD *mksys) +{ + TRACE("(%p,%p)\n", iface, mksys); + + if (!mksys) + return E_POINTER; + + *mksys = MKSYS_OBJREFMONIKER; + return S_OK; +} + +static const IMonikerVtbl VT_ObjrefMonikerImpl = +{ + ObjrefMonikerImpl_QueryInterface, + PointerMonikerImpl_AddRef, + PointerMonikerImpl_Release, + ObjrefMonikerImpl_GetClassID, + PointerMonikerImpl_IsDirty, + PointerMonikerImpl_Load, + ObjrefMonikerImpl_Save, + PointerMonikerImpl_GetSizeMax, + PointerMonikerImpl_BindToObject, + PointerMonikerImpl_BindToStorage, + PointerMonikerImpl_Reduce, + PointerMonikerImpl_ComposeWith, + ObjrefMonikerImpl_Enum, + PointerMonikerImpl_IsEqual, + PointerMonikerImpl_Hash, + PointerMonikerImpl_IsRunning, + ObjrefMonikerImpl_GetTimeOfLastChange, + PointerMonikerImpl_Inverse, + PointerMonikerImpl_CommonPrefixWith, + PointerMonikerImpl_RelativePathTo, + ObjrefMonikerImpl_GetDisplayName, + PointerMonikerImpl_ParseDisplayName, + ObjrefMonikerImpl_IsSystemMoniker +}; + +static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_PointerMonikerImpl && iface->lpVtbl != &VT_ObjrefMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); +} + +/*********************************************************************** + * CreateObjrefMoniker (OLE32.@) + */ +HRESULT WINAPI CreateObjrefMoniker(IUnknown *obj, IMoniker **ret) +{ + PointerMonikerImpl *moniker; + + TRACE("(%p,%p)\n", obj, ret); + + if (!ret) + return E_INVALIDARG; + + moniker = heap_alloc(sizeof(*moniker)); + if (!moniker) + { + *ret = NULL; + return E_OUTOFMEMORY; + } + + moniker->IMoniker_iface.lpVtbl = &VT_ObjrefMonikerImpl; + moniker->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl; + moniker->refcount = 1; + moniker->pObject = obj; + if (moniker->pObject) + IUnknown_AddRef(moniker->pObject); + + *ret = &moniker->IMoniker_iface; + + return S_OK; +} + +HRESULT WINAPI ObjrefMoniker_CreateInstance(IClassFactory *iface, IUnknown *unk, REFIID iid, void **obj) +{ + IMoniker *moniker; + HRESULT hr; + + TRACE("(%p,%s,%p)\n", unk, debugstr_guid(iid), obj); + + *obj = NULL; + + if (unk) + return CLASS_E_NOAGGREGATION; + + hr = CreateObjrefMoniker(NULL, &moniker); + if (FAILED(hr)) + return hr; + + hr = IMoniker_QueryInterface(moniker, iid, obj); + IMoniker_Release(moniker); + + return hr; +} diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8d3276651bc..cda4e8bf212 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -82,9 +82,10 @@ static const CLSID CLSID_TestMoniker = DEFINE_OLEGUID(CLSID_FileMoniker, 0x303, 0, 0); DEFINE_OLEGUID(CLSID_ItemMoniker, 0x304, 0, 0); DEFINE_OLEGUID(CLSID_AntiMoniker, 0x305, 0, 0); +DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0); DEFINE_OLEGUID(CLSID_ClassMoniker, 0x31a, 0, 0); -DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); +DEFINE_OLEGUID(CLSID_ObjrefMoniker, 0x327, 0, 0); #define TEST_MONIKER_TYPE_TODO(m,t) _test_moniker_type(m, t, TRUE, __LINE__) #define TEST_MONIKER_TYPE(m,t) _test_moniker_type(m, t, FALSE, __LINE__) @@ -3861,7 +3862,7 @@ todo_wine hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); - ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class.\n"); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class %s.\n", wine_dbgstr_guid(&clsid)); hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); @@ -4076,6 +4077,220 @@ todo_wine IMoniker_Release(moniker); } +static void test_objref_moniker(void) +{ + IMoniker *moniker, *moniker2, *prefix, *inverse, *anti; + struct test_factory factory; + IEnumMoniker *enummoniker; + DWORD hash, size; + HRESULT hr; + IBindCtx *bindctx; + FILETIME filetime; + IUnknown *unknown; + IStream *stream; + IROTData *rotdata; + LPOLESTR display_name; + IMarshal *marshal; + LARGE_INTEGER pos; + CLSID clsid; + + test_factory_init(&factory); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, NULL); + ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + + hr = IMoniker_QueryInterface(moniker, &CLSID_ObjrefMoniker, (void **)&unknown); + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + + hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); + ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_ObjrefMoniker), "Unexpected class %s.\n", wine_dbgstr_guid(&clsid)); + + hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); + ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); + ok(size > 0, "Unexpected size %d.\n", size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "Failed to marshal moniker, hr %#x.\n", hr); + + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2); + ok(hr == S_OK, "Failed to unmarshal, hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Expected equal moniker, hr %#x.\n", hr); + IMoniker_Release(moniker2); + + IStream_Release(stream); + + IMarshal_Release(marshal); + + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); + + /* Display Name */ + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); +todo_wine + ok(hr == S_OK, "IMoniker_GetDisplayName failed: 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); + + /* IROTData::GetComparisonData test */ + + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + /* Saving */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: 0x%08x\n", hr); + + hr = IMoniker_Save(moniker, stream, TRUE); +todo_wine + ok(hr == S_OK, "IMoniker_Save failed: 0x%08x\n", hr); + + IStream_Release(stream); + + /* Hashing */ + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "IMoniker_Hash failed: 0x%08x\n", hr); + ok(hash == PtrToUlong(&factory.IClassFactory_iface), "Unexpected hash value %#x.\n", hash); + + /* IsSystemMoniker test */ + TEST_MONIKER_TYPE(moniker, MKSYS_OBJREFMONIKER); + + hr = IMoniker_Inverse(moniker, &inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + TEST_MONIKER_TYPE(inverse, MKSYS_ANTIMONIKER); + IMoniker_Release(inverse); + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); + IUnknown_Release(unknown); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); + IUnknown_Release(unknown); + + IMoniker_Release(moniker); + + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); + + hr = CreateObjrefMoniker(NULL, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed, hr %#x.\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(enummoniker == NULL, "got %p\n", enummoniker); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(enummoniker == NULL, "got %p\n", enummoniker); + + IMoniker_Release(moniker); + + /* CommonPrefixWith() */ + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker2); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, NULL, &prefix); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(prefix == moniker, "Unexpected pointer.\n"); + IMoniker_Release(prefix); + + IMoniker_Release(moniker2); + + hr = CreateObjrefMoniker((IUnknown *)moniker, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + + /* ComposeWith() */ + + /* P + A -> () */ + anti = create_antimoniker(1); + hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); + ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + IMoniker_Release(anti); + + /* P + A2 -> A */ + anti = create_antimoniker(2); + hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); + ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker2, MKSYS_ANTIMONIKER); + IMoniker_Release(moniker2); + + IMoniker_Release(anti); + + IMoniker_Release(moniker); +} + static void test_bind_context(void) { IRunningObjectTable *rot, *rot2; @@ -4385,6 +4600,7 @@ START_TEST(moniker) test_anti_moniker(); test_generic_composite_moniker(); test_pointer_moniker(); + test_objref_moniker(); test_save_load_filemoniker(); test_MonikerCommonPrefixWith(); diff --git a/include/objidl.idl b/include/objidl.idl index 7576a686aeb..cd11729b292 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -330,7 +330,10 @@ interface IMoniker : IPersistStream MKSYS_ITEMMONIKER = 4, MKSYS_POINTERMONIKER = 5, /* MKSYS_URLMONIKER = 6, */ /* defined in urlmon.idl */ - MKSYS_CLASSMONIKER = 7 + MKSYS_CLASSMONIKER = 7, + MKSYS_OBJREFMONIKER = 8, + MKSYS_SESSIONMONIKER = 9, + MKSYS_LUAMONIKER = 10 } MKSYS; typedef [v1_enum] enum tagMKREDUCE { -- 2.31.1

2 1

[PATCH 8/8] win32u: Move NtUserSetObjectInformation implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

1 0

[PATCH 7/8] win32u: Move NtUserGetObjectInformation implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winstation.c | 95 +--------------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 94 +++++++++++++++++++++++++++++++++++++++ dlls/wow64win/user.c | 11 +++++ include/ntuser.h | 2 + 8 files changed, 113 insertions(+), 96 deletions(-)

1 0

[PATCH 4/8] win32u: Move NtUserGetThreadDesktop implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

1 0

[PATCH 3/8] win32u: Move NtUserCloseDesktop implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

1 0

[PATCH 2/8] win32u: Move NtUserSetProcessWindowStation implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

1 0

[PATCH 1/8] win32u: Move NtUserGetProcessWindowStation implementation from user32.
by Jacek Caban 13 Oct '21

13 Oct '21

1 0

[PATCH] ole32: Implement CreateObjrefMoniker().
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

test_objref_moniker() is a copy of test_pointer_moniker() with appropriate changes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/moniker.h | 4 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_objidl.idl | 6 + dlls/ole32/oleproxy.c | 13 +++ dlls/ole32/pointermoniker.c | 186 ++++++++++++++++++++++++++++-- dlls/ole32/tests/moniker.c | 220 +++++++++++++++++++++++++++++++++++- include/objidl.idl | 5 +- 7 files changed, 423 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 8549bd46c1e..2106e374394 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -26,15 +26,17 @@ DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 ); DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 ); DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 ); +DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); -DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); +DEFINE_OLEGUID( CLSID_ObjrefMoniker, 0x327, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); +HRESULT WINAPI ObjrefMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 8e73fdd16b4..d9ffd63585c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -103,7 +103,7 @@ @ stdcall CreateGenericComposite(ptr ptr ptr) @ stdcall CreateILockBytesOnHGlobal(ptr long ptr) @ stdcall CreateItemMoniker(wstr wstr ptr) -@ stub CreateObjrefMoniker +@ stdcall CreateObjrefMoniker(ptr ptr) @ stdcall CreateOleAdviseHolder(ptr) @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) combase.CreateStreamOnHGlobal diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index 0cc3ccea9e5..97f91224839 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -105,6 +105,12 @@ coclass ClassMoniker { interface IMoniker; } ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +[ + threading(both), + uuid(00000327-0000-0000-c000-000000000046) +] +coclass ObjrefMoniker { interface IMoniker; } + [ helpstring("Component Categories Manager"), threading(both), diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index e40e2b073e5..c429ce02b3b 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -137,6 +137,17 @@ static const IClassFactoryVtbl PointerMonikerCFVtbl = static IClassFactory PointerMonikerCF = { &PointerMonikerCFVtbl }; +static const IClassFactoryVtbl ObjrefMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ObjrefMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ObjrefMonikerCF = { &ObjrefMonikerCFVtbl }; + static const IClassFactoryVtbl ComCatCFVtbl = { ClassFactory_QueryInterface, @@ -198,6 +209,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return IClassFactory_QueryInterface(&CompositeMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) return IClassFactory_QueryInterface(&ClassMonikerCF, iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_ObjrefMoniker)) + return IClassFactory_QueryInterface(&ObjrefMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) return IClassFactory_QueryInterface(&PointerMonikerCF, iid, ppv); if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 051d42aca6d..ea145b8b9c0 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -1,5 +1,5 @@ /* - * Pointer Moniker Implementation + * Pointer and Objref Monikers Implementation * * Copyright 1999 Noomen Hamza * Copyright 2008 Robert Shearman (for CodeWeavers) @@ -470,13 +470,6 @@ static const IMonikerVtbl VT_PointerMonikerImpl = PointerMonikerImpl_IsSystemMoniker }; -static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) -{ - if (iface->lpVtbl != &VT_PointerMonikerImpl) - return NULL; - return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); -} - static HRESULT WINAPI pointer_moniker_marshal_QueryInterface(IMarshal *iface, REFIID riid, LPVOID *ppv) { PointerMonikerImpl *moniker = impl_from_IMarshal(iface); @@ -641,3 +634,180 @@ HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, return hr; } + +/* ObjrefMoniker implementation */ + +static HRESULT WINAPI ObjrefMonikerImpl_QueryInterface(IMoniker *iface, REFIID iid, void **obj) +{ + PointerMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), obj); + + if (!obj) + return E_INVALIDARG; + + *obj = 0; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IPersist) || + IsEqualIID(iid, &IID_IPersistStream) || + IsEqualIID(iid, &IID_IMoniker) || + IsEqualGUID(iid, &CLSID_ObjrefMoniker) || + IsEqualGUID(iid, &CLSID_PointerMoniker)) + { + *obj = iface; + } + else if (IsEqualIID(iid, &IID_IMarshal)) + *obj = &moniker->IMarshal_iface; + else + return E_NOINTERFACE; + + IMoniker_AddRef(iface); + + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetClassID(IMoniker *iface, CLSID *clsid) +{ + TRACE("(%p,%p)\n", iface, clsid); + + if (!clsid) + return E_POINTER; + + *clsid = CLSID_ObjrefMoniker; + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Save(IMoniker *iface, IStream *stream, BOOL dirty) +{ + FIXME("(%p,%p,%d): stub\n", iface, stream, dirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **enummoniker) +{ + TRACE("(%p,%d,%p)\n", iface, forward, enummoniker); + + if (!enummoniker) + return E_POINTER; + + *enummoniker = NULL; + return S_OK; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetTimeOfLastChange(IMoniker *iface, + IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *pAntiTime) +{ + TRACE("(%p,%p,%p,%p)\n", iface, pbc, pmkToLeft, pAntiTime); + return MK_E_UNAVAILABLE; +} + +static HRESULT WINAPI ObjrefMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) +{ + FIXME("(%p,%p,%p,%p): stub\n", iface, pbc, pmkToLeft, ppszDisplayName); + + if (!ppszDisplayName) + return E_POINTER; + + *ppszDisplayName = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjrefMonikerImpl_IsSystemMoniker(IMoniker *iface, DWORD *mksys) +{ + TRACE("(%p,%p)\n", iface, mksys); + + if (!mksys) + return E_POINTER; + + *mksys = MKSYS_OBJREFMONIKER; + return S_OK; +} + +static const IMonikerVtbl VT_ObjrefMonikerImpl = +{ + ObjrefMonikerImpl_QueryInterface, + PointerMonikerImpl_AddRef, + PointerMonikerImpl_Release, + ObjrefMonikerImpl_GetClassID, + PointerMonikerImpl_IsDirty, + PointerMonikerImpl_Load, + ObjrefMonikerImpl_Save, + PointerMonikerImpl_GetSizeMax, + PointerMonikerImpl_BindToObject, + PointerMonikerImpl_BindToStorage, + PointerMonikerImpl_Reduce, + PointerMonikerImpl_ComposeWith, + ObjrefMonikerImpl_Enum, + PointerMonikerImpl_IsEqual, + PointerMonikerImpl_Hash, + PointerMonikerImpl_IsRunning, + ObjrefMonikerImpl_GetTimeOfLastChange, + PointerMonikerImpl_Inverse, + PointerMonikerImpl_CommonPrefixWith, + PointerMonikerImpl_RelativePathTo, + ObjrefMonikerImpl_GetDisplayName, + PointerMonikerImpl_ParseDisplayName, + ObjrefMonikerImpl_IsSystemMoniker +}; + +static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &VT_PointerMonikerImpl && iface->lpVtbl != &VT_ObjrefMonikerImpl) + return NULL; + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); +} + +/*********************************************************************** + * CreateObjrefMoniker (OLE32.@) + */ +HRESULT WINAPI CreateObjrefMoniker(IUnknown *obj, IMoniker **ret) +{ + PointerMonikerImpl *moniker; + + TRACE("(%p,%p)\n", obj, ret); + + if (!ret) + return E_INVALIDARG; + + moniker = heap_alloc(sizeof(*moniker)); + if (!moniker) + { + *ret = NULL; + return E_OUTOFMEMORY; + } + + moniker->IMoniker_iface.lpVtbl = &VT_ObjrefMonikerImpl; + moniker->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl; + moniker->refcount = 1; + moniker->pObject = obj; + if (moniker->pObject) + IUnknown_AddRef(moniker->pObject); + + *ret = &moniker->IMoniker_iface; + + return S_OK; +} + +HRESULT WINAPI ObjrefMoniker_CreateInstance(IClassFactory *iface, IUnknown *unk, REFIID iid, void **obj) +{ + IMoniker *moniker; + HRESULT hr; + + TRACE("(%p,%s,%p)\n", unk, debugstr_guid(iid), obj); + + *obj = NULL; + + if (unk) + return CLASS_E_NOAGGREGATION; + + hr = CreateObjrefMoniker(NULL, &moniker); + if (FAILED(hr)) + return hr; + + hr = IMoniker_QueryInterface(moniker, iid, obj); + IMoniker_Release(moniker); + + return hr; +} diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 8d3276651bc..cda4e8bf212 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -82,9 +82,10 @@ static const CLSID CLSID_TestMoniker = DEFINE_OLEGUID(CLSID_FileMoniker, 0x303, 0, 0); DEFINE_OLEGUID(CLSID_ItemMoniker, 0x304, 0, 0); DEFINE_OLEGUID(CLSID_AntiMoniker, 0x305, 0, 0); +DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0); DEFINE_OLEGUID(CLSID_ClassMoniker, 0x31a, 0, 0); -DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); +DEFINE_OLEGUID(CLSID_ObjrefMoniker, 0x327, 0, 0); #define TEST_MONIKER_TYPE_TODO(m,t) _test_moniker_type(m, t, TRUE, __LINE__) #define TEST_MONIKER_TYPE(m,t) _test_moniker_type(m, t, FALSE, __LINE__) @@ -3861,7 +3862,7 @@ todo_wine hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); - ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class.\n"); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class %s.\n", wine_dbgstr_guid(&clsid)); hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); @@ -4076,6 +4077,220 @@ todo_wine IMoniker_Release(moniker); } +static void test_objref_moniker(void) +{ + IMoniker *moniker, *moniker2, *prefix, *inverse, *anti; + struct test_factory factory; + IEnumMoniker *enummoniker; + DWORD hash, size; + HRESULT hr; + IBindCtx *bindctx; + FILETIME filetime; + IUnknown *unknown; + IStream *stream; + IROTData *rotdata; + LPOLESTR display_name; + IMarshal *marshal; + LARGE_INTEGER pos; + CLSID clsid; + + test_factory_init(&factory); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, NULL); + ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + + hr = IMoniker_QueryInterface(moniker, &CLSID_ObjrefMoniker, (void **)&unknown); + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + + hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); + ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_ObjrefMoniker), "Unexpected class %s.\n", wine_dbgstr_guid(&clsid)); + + hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); + ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); + ok(size > 0, "Unexpected size %d.\n", size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "Failed to marshal moniker, hr %#x.\n", hr); + + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2); + ok(hr == S_OK, "Failed to unmarshal, hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Expected equal moniker, hr %#x.\n", hr); + IMoniker_Release(moniker2); + + IStream_Release(stream); + + IMarshal_Release(marshal); + + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); + + /* Display Name */ + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); +todo_wine + ok(hr == S_OK, "IMoniker_GetDisplayName failed: 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); + + /* IROTData::GetComparisonData test */ + + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + /* Saving */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: 0x%08x\n", hr); + + hr = IMoniker_Save(moniker, stream, TRUE); +todo_wine + ok(hr == S_OK, "IMoniker_Save failed: 0x%08x\n", hr); + + IStream_Release(stream); + + /* Hashing */ + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "IMoniker_Hash failed: 0x%08x\n", hr); + ok(hash == PtrToUlong(&factory.IClassFactory_iface), "Unexpected hash value %#x.\n", hash); + + /* IsSystemMoniker test */ + TEST_MONIKER_TYPE(moniker, MKSYS_OBJREFMONIKER); + + hr = IMoniker_Inverse(moniker, &inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + TEST_MONIKER_TYPE(inverse, MKSYS_ANTIMONIKER); + IMoniker_Release(inverse); + + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); + IUnknown_Release(unknown); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr); + IUnknown_Release(unknown); + + IMoniker_Release(moniker); + + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); + + hr = CreateObjrefMoniker(NULL, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed, hr %#x.\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(enummoniker == NULL, "got %p\n", enummoniker); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(enummoniker == NULL, "got %p\n", enummoniker); + + IMoniker_Release(moniker); + + /* CommonPrefixWith() */ + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = CreateObjrefMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker2); + ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, NULL, &prefix); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(prefix == moniker, "Unexpected pointer.\n"); + IMoniker_Release(prefix); + + IMoniker_Release(moniker2); + + hr = CreateObjrefMoniker((IUnknown *)moniker, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker2); + + /* ComposeWith() */ + + /* P + A -> () */ + anti = create_antimoniker(1); + hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); + ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); + ok(!moniker2, "Unexpected pointer.\n"); + IMoniker_Release(anti); + + /* P + A2 -> A */ + anti = create_antimoniker(2); + hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); + ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker2, MKSYS_ANTIMONIKER); + IMoniker_Release(moniker2); + + IMoniker_Release(anti); + + IMoniker_Release(moniker); +} + static void test_bind_context(void) { IRunningObjectTable *rot, *rot2; @@ -4385,6 +4600,7 @@ START_TEST(moniker) test_anti_moniker(); test_generic_composite_moniker(); test_pointer_moniker(); + test_objref_moniker(); test_save_load_filemoniker(); test_MonikerCommonPrefixWith(); diff --git a/include/objidl.idl b/include/objidl.idl index 7576a686aeb..cd11729b292 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -330,7 +330,10 @@ interface IMoniker : IPersistStream MKSYS_ITEMMONIKER = 4, MKSYS_POINTERMONIKER = 5, /* MKSYS_URLMONIKER = 6, */ /* defined in urlmon.idl */ - MKSYS_CLASSMONIKER = 7 + MKSYS_CLASSMONIKER = 7, + MKSYS_OBJREFMONIKER = 8, + MKSYS_SESSIONMONIKER = 9, + MKSYS_LUAMONIKER = 10 } MKSYS; typedef [v1_enum] enum tagMKREDUCE { -- 2.31.1

3 4

[PATCH] user32: Call driver's DestroyWindow in destroy_thread_windows().
by Paul Gofman 13 Oct '21

13 Oct '21

USER_Driver->pThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when, for instance, the windows is still used for Vulkan rendering (even if only to tear down the device and swapchain). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/user32/user_main.c | 4 +++- dlls/user32/win.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 30e5d154d3d..f4b0f110dc2 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -358,9 +358,11 @@ static void thread_detach(void) exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); - USER_Driver->pThreadDetach(); destroy_thread_windows(); + + USER_Driver->pThreadDetach(); + CloseHandle( thread_info->server_queue ); HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); HeapFree( GetProcessHeap(), 0, thread_info->key_state ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5e89f4c2c97..bafd0a3a7f0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1218,7 +1218,6 @@ void destroy_thread_windows(void) while ((wndPtr = next_thread_window( &hwnd ))) { /* destroy the client-side storage */ - list = WIN_ListChildren( hwnd ); menu = ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) ? (HMENU)wndPtr->wIDmenu : 0; sys_menu = wndPtr->hSysMenu; @@ -1235,6 +1234,8 @@ void destroy_thread_windows(void) window_surface_release( surface ); } + USER_Driver->pDestroyWindow( hwnd ); + /* free child windows */ if (!list) continue; -- 2.31.1

2 2

[PATCH] winex11.drv: Add video adapter description to the registry.
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/display.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c8c216c8302..2da9b09c653 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -463,6 +463,12 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; + static const WCHAR memory_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -551,6 +557,16 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_SZ, (const BYTE *)ramdacW, (strlenW(ramdacW) + 1) * sizeof(WCHAR))) + size = 0x7fffffff; /* FIXME */ + if (RegSetValueExW(hkey, memory_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; RegCloseKey(hkey); -- 2.31.1

2 4

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