- Wine-Commits - list.winehq.org

Fabian Maurer : widl: In type_has_full_pointer recurse for pointer types as well.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: dbf303b00bd2635900da7a2b79c6ff183a4ba38a URL: https://gitlab.winehq.org/wine/wine/-/commit/dbf303b00bd2635900da7a2b79c6ff… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 18 19:33:21 2023 +0200 widl: In type_has_full_pointer recurse for pointer types as well. --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2d735b1cb65..195ef49f102 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -789,7 +789,7 @@ static int type_has_full_pointer_recurse(const type_t *type, const attr_list_t * if (get_pointer_fc(type, attrs, toplevel_param) == FC_FP) return TRUE; else - return FALSE; + return type_has_full_pointer_recurse(type_pointer_get_ref_type(type), NULL, FALSE, visited_structs); case TGT_ARRAY: if (get_pointer_fc(type, attrs, toplevel_param) == FC_FP) return TRUE;

1 0

Fabian Maurer : widl: Prevent infinite loop when structure contains array of itself.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: f59807c587042f518499261f4d32f43bcbd44859 URL: https://gitlab.winehq.org/wine/wine/-/commit/f59807c587042f518499261f4d32f4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jun 23 22:53:23 2023 +0200 widl: Prevent infinite loop when structure contains array of itself. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55115 --- tools/widl/typegen.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 23db6555e9d..2d735b1cb65 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -745,8 +745,41 @@ static int type_has_pointers(const type_t *type) return FALSE; } -static int type_has_full_pointer(const type_t *type, const attr_list_t *attrs, - int toplevel_param) +struct visited_struct_array +{ + const type_t **structs; + size_t count; + size_t capacity; +}; + +static inline int array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(size_t)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + +static int type_has_full_pointer_recurse(const type_t *type, const attr_list_t *attrs, + int toplevel_param, struct visited_struct_array *visited_structs) { switch (typegen_detect_type(type, NULL, TDT_IGNORE_STRINGS)) { @@ -761,17 +794,38 @@ static int type_has_full_pointer(const type_t *type, const attr_list_t *attrs, if (get_pointer_fc(type, attrs, toplevel_param) == FC_FP) return TRUE; else - return type_has_full_pointer(type_array_get_element_type(type), NULL, FALSE); + return type_has_full_pointer_recurse(type_array_get_element_type(type), NULL, FALSE, visited_structs); case TGT_STRUCT: { + unsigned int i; + int ret = FALSE; var_list_t *fields = type_struct_get_fields(type); const var_t *field; + + for (i = 0; i < visited_structs->count; i++) + { + if (visited_structs->structs[i] == type) + { + /* Found struct we visited already, abort to prevent infinite loop. + * Can't be at the first struct we visit, so we can skip cleanup and just return */ + return FALSE; + } + } + + array_reserve((void**)&visited_structs->structs, &visited_structs->capacity, visited_structs->count + 1, sizeof(struct type_t*)); + visited_structs->structs[visited_structs->count] = type; + + visited_structs->count++; if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { - if (type_has_full_pointer(field->declspec.type, field->attrs, FALSE)) - return TRUE; + if (type_has_full_pointer_recurse(field->declspec.type, field->attrs, FALSE, visited_structs)) + { + ret = TRUE; + break; + } } - break; + visited_structs->count--; + return ret; } case TGT_UNION: { @@ -780,7 +834,7 @@ static int type_has_full_pointer(const type_t *type, const attr_list_t *attrs, fields = type_union_get_cases(type); if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { - if (field->declspec.type && type_has_full_pointer(field->declspec.type, field->attrs, FALSE)) + if (field->declspec.type && type_has_full_pointer_recurse(field->declspec.type, field->attrs, FALSE, visited_structs)) return TRUE; } break; @@ -799,6 +853,15 @@ static int type_has_full_pointer(const type_t *type, const attr_list_t *attrs, return FALSE; } +static int type_has_full_pointer(const type_t *type, const attr_list_t *attrs, int toplevel_param) +{ + int ret; + struct visited_struct_array visited_structs = {0}; + ret = type_has_full_pointer_recurse(type, attrs, toplevel_param, &visited_structs); + free(visited_structs.structs); + return ret; +} + static unsigned short user_type_offset(const char *name) { user_type_t *ut;

1 0

Alexandros Frantzis : winewayland.drv: Apply client subsurface position on creation.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: 34f392bcfe46a9c864ce0af24e3ca1de4f966d96 URL: https://gitlab.winehq.org/wine/wine/-/commit/34f392bcfe46a9c864ce0af24e3ca1… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Nov 20 15:39:41 2023 +0200 winewayland.drv: Apply client subsurface position on creation. We cannot depend on the main surface being committed to after the client subsurface is created, so perform a commit to ensure the subsurface position takes effect on creation. --- dlls/winewayland.drv/wayland_surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 57585927914..285fb9a38c5 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -820,6 +820,8 @@ struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface } wayland_surface_reconfigure_client(surface); + /* Commit to apply subsurface positioning. */ + wl_surface_commit(surface->wl_surface); return surface->client;

1 0

Alexandros Frantzis : winewayland.drv: Ensure Vulkan parent surface is mapped with proper size.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: dc35c8a7b96f663e47326efc9bc39cad049bf777 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc35c8a7b96f663e47326efc9bc39c… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 7 08:15:36 2023 +0200 winewayland.drv: Ensure Vulkan parent surface is mapped with proper size. The client area subsurface (the target of Vulkan rendering) is not going to be presented properly (or at all) by the compositor if its parent surface is not mapped or doesn't have the right size, even though the window may be visible from Wine's perspective. To avoid this issue, ensure that the parent surface has up-to-date contents in terms of size, in case these haven't been provided yet, or will never be provided (e.g., when the Vulkan rendering is fullscreen). --- dlls/winewayland.drv/vulkan.c | 2 + dlls/winewayland.drv/wayland_surface.c | 68 ++++++++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 3 ++ dlls/winewayland.drv/window.c | 1 + 4 files changed, 74 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 2eaec3af3c9..cb945986cba 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -266,6 +266,8 @@ static VkResult check_queue_present(const VkPresentInfoKHR *present_info, int client_height = wayland_surface->window.client_rect.bottom - wayland_surface->window.client_rect.top; + wayland_surface_ensure_contents(wayland_surface); + pthread_mutex_unlock(&wayland_surface->mutex); if (client_width == wine_vk_swapchain->extent.width && diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index f71e15f2f9a..57585927914 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -293,6 +293,9 @@ void wayland_surface_clear_role(struct wayland_surface *surface) wl_surface_attach(surface->wl_surface, NULL, 0, 0); wl_surface_commit(surface->wl_surface); + surface->buffer_width = 0; + surface->buffer_height = 0; + wl_display_flush(process_wayland.wl_display); } @@ -336,6 +339,9 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, } free(surface_damage); } + + surface->buffer_width = shm_buffer->width; + surface->buffer_height = shm_buffer->height; } /********************************************************************** @@ -825,3 +831,65 @@ err: } return NULL; } + +static void dummy_buffer_release(void *data, struct wl_buffer *buffer) +{ + struct wayland_shm_buffer *shm_buffer = data; + TRACE("shm_buffer=%p\n", shm_buffer); + wayland_shm_buffer_unref(shm_buffer); +} + +static const struct wl_buffer_listener dummy_buffer_listener = +{ + dummy_buffer_release +}; + +/********************************************************************** + * wayland_surface_ensure_contents + * + * Ensure that the wayland surface has up-to-date contents, by committing + * a dummy buffer if necessary. + */ +void wayland_surface_ensure_contents(struct wayland_surface *surface) +{ + struct wayland_shm_buffer *dummy_shm_buffer; + HRGN damage; + int width, height; + BOOL needs_contents; + + width = surface->window.rect.right - surface->window.rect.left; + height = surface->window.rect.bottom - surface->window.rect.top; + needs_contents = surface->window.visible && + (surface->buffer_width != width || + surface->buffer_height != height); + + TRACE("surface=%p hwnd=%p needs_contents=%d\n", + surface, surface->hwnd, needs_contents); + + if (!needs_contents) return; + + /* Create a transparent dummy buffer. */ + dummy_shm_buffer = wayland_shm_buffer_create(width, height, WL_SHM_FORMAT_ARGB8888); + if (!dummy_shm_buffer) + { + ERR("Failed to create dummy buffer\n"); + return; + } + wl_buffer_add_listener(dummy_shm_buffer->wl_buffer, &dummy_buffer_listener, + dummy_shm_buffer); + + if (!(damage = NtGdiCreateRectRgn(0, 0, width, height))) + WARN("Failed to create damage region for dummy buffer\n"); + + if (wayland_surface_reconfigure(surface)) + { + wayland_surface_attach_shm(surface, dummy_shm_buffer, damage); + wl_surface_commit(surface->wl_surface); + } + else + { + wayland_shm_buffer_unref(dummy_shm_buffer); + } + + if (damage) NtGdiDeleteObjectApp(damage); +} diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index c7d730fbd3e..383c79a23fe 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -164,6 +164,7 @@ struct wayland_window_config enum wayland_surface_config_state state; /* The scale (i.e., normalized dpi) the window is rendering at. */ double scale; + BOOL visible; }; struct wayland_client_surface @@ -187,6 +188,7 @@ struct wayland_surface BOOL resizing; struct wayland_window_config window; struct wayland_client_surface *client; + int buffer_width, buffer_height; }; struct wayland_shm_buffer @@ -240,6 +242,7 @@ void wayland_surface_coords_to_window(struct wayland_surface *surface, int *window_x, int *window_y) DECLSPEC_HIDDEN; struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface *surface) DECLSPEC_HIDDEN; BOOL wayland_client_surface_release(struct wayland_client_surface *client) DECLSPEC_HIDDEN; +void wayland_surface_ensure_contents(struct wayland_surface *surface) DECLSPEC_HIDDEN; /********************************************************************** * Wayland SHM buffer diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index fff3749e9ad..31ecb6542c6 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -181,6 +181,7 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, conf->state = window_state; conf->scale = NtUserGetDpiForWindow(data->hwnd) / 96.0; + conf->visible = (style & WS_VISIBLE) == WS_VISIBLE; } static void wayland_win_data_update_wayland_surface(struct wayland_win_data *data)

1 0

Robert Wilhelm : oleaut32: Fix VarR8Round for negative numbers.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: 0d6c905add980db7902164d59576977d41b9230d URL: https://gitlab.winehq.org/wine/wine/-/commit/0d6c905add980db7902164d5957697… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Nov 28 21:28:33 2023 +0100 oleaut32: Fix VarR8Round for negative numbers. Floats with fractional part 0.5000 should be rounded to next even number. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55185 --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/vartype.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 36b04aead81..9426272d7be 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2716,6 +2716,13 @@ static void test_VarR8Round(void) MATHRND(1.4999, 0); EXPECT(1); MATHRND(1.5000, 0); EXPECT(2); MATHRND(1.5001, 0); EXPECT(2); + + MATHRND(-0.4999, 0); EXPECT(0); + MATHRND(-0.5000, 0); EXPECT(0); + MATHRND(-0.5001, 0); EXPECT(-1); + MATHRND(-1.4999, 0); EXPECT(-1); + MATHRND(-1.5000, 0); EXPECT(-2); + MATHRND(-1.5001, 0); EXPECT(-2); } /* diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 7dd6cb8c4a6..d51cee3ee82 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3379,7 +3379,7 @@ HRESULT WINAPI VarR8Round(double dblIn, int nDig, double *pDblOut) else if (fract >= 0.0) dblIn = whole; else if (fract == -0.5) - dblIn = whole - fmod(whole, 2.0); + dblIn = whole + fmod(whole, 2.0); else if (fract > -0.5) dblIn = whole; else

1 0

Louis Lenders : shell32: Add stub for SHSetTemporaryPropertyForItem.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: e83ca9b772c656768ee2a900891afc2ca2338f57 URL: https://gitlab.winehq.org/wine/wine/-/commit/e83ca9b772c656768ee2a900891afc… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Nov 29 07:19:37 2023 +0100 shell32: Add stub for SHSetTemporaryPropertyForItem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55536 --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 60bd63ab7a8..8155365318d 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -425,6 +425,7 @@ @ stdcall SHQueryUserNotificationState(ptr) @ stdcall SHRemoveLocalizedName(wstr) @ stdcall SHSetLocalizedName(wstr wstr long) +@ stdcall SHSetTemporaryPropertyForItem(ptr ptr ptr) @ stdcall SHSetUnreadMailCountW(wstr long wstr) @ stdcall SHUpdateRecycleBinIcon() @ stdcall SheChangeDirA(str) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d8720734e22..93a60d63bd1 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1658,3 +1658,10 @@ HRESULT WINAPI CustomDestinationList_Constructor(IUnknown *outer, REFIID riid, v ICustomDestinationList_Release(&list->ICustomDestinationList_iface); return hr; } + +HRESULT WINAPI SHSetTemporaryPropertyForItem(IShellItem *psi, REFPROPERTYKEY propkey, REFPROPVARIANT propvar) +{ + FIXME("%p %p %p: stub\n", psi, propkey, propvar); + + return E_NOTIMPL; +}

1 0

Piotr Caban : msvcrt: Fix string size passed to CompareString in _mbsnbcoll_l.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: 6a78f71f3c3d6b0298c556858dcd1ff7f2878e14 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a78f71f3c3d6b0298c556858dcd1f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 29 12:06:02 2023 +0100 msvcrt: Fix string size passed to CompareString in _mbsnbcoll_l. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55959 --- dlls/msvcrt/mbcs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2e228d77811..ce8a3115eeb 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1110,7 +1110,9 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si if(!mbcinfo->ismbcodepage) return _strnicoll_l((const char*)str1, (const char*)str2, len, locale); - return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; + return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, + (const char*)str1, strnlen((const char*)str1, len), + (const char*)str2, strnlen((const char*)str2, len)) - CSTR_EQUAL; } /********************************************************************* @@ -1156,7 +1158,9 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz if(!mbcinfo->ismbcodepage) return _strncoll_l((const char*)str1, (const char*)str2, len, locale); - return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; + return CompareStringA(mbcinfo->mblcid, 0, + (const char*)str1, strnlen((const char*)str1, len), + (const char*)str2, strnlen((const char*)str2, len)) - CSTR_EQUAL; } /*********************************************************************

1 0

Piotr Caban : winedump: Fix EMR_EXTTEXTOUTW record dumping when ETO_PDY flag is specified.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: 244b63566a02e1a42e06af8a51cf1d6ec7952928 URL: https://gitlab.winehq.org/wine/wine/-/commit/244b63566a02e1a42e06af8a51cf1d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 18:31:26 2023 +0100 winedump: Fix EMR_EXTTEXTOUTW record dumping when ETO_PDY flag is specified. --- tools/winedump/emf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 42b1f9469af..253e7c658c2 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -384,6 +384,7 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) { const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); const int *dx = (const int *)((const BYTE *)etoW + etoW->emrtext.offDx); + int dx_size; printf("%s%-20s %08x\n", pfx, "EMR_EXTTEXTOUTW", length); printf("%sbounds (%s) mode %#x x_scale %f y_scale %f pt (%d,%d) rect (%s) flags %#x, %s\n", @@ -392,10 +393,13 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) debugstr_rect( &etoW->emrtext.rcl ), (UINT)etoW->emrtext.fOptions, debugstr_wn((LPCWSTR)((const BYTE *)etoW + etoW->emrtext.offString), etoW->emrtext.nChars)); printf("%sdx_offset %u {", pfx, (UINT)etoW->emrtext.offDx); - for (i = 0; i < etoW->emrtext.nChars; ++i) + dx_size = etoW->emrtext.nChars; + if (etoW->emrtext.fOptions & ETO_PDY) + dx_size *= 2; + for (i = 0; i < dx_size; ++i) { printf("%d", dx[i]); - if (i != etoW->emrtext.nChars - 1) + if (i != dx_size - 1) putchar(','); } printf("}\n");

1 0

Biswapriyo Nath : include: Update d3d12sdklayers.idl from vkd3d.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: 56e19e2c5e6e8bb3c6d8fc09a7feebf5e282af52 URL: https://gitlab.winehq.org/wine/wine/-/commit/56e19e2c5e6e8bb3c6d8fc09a7feeb… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Nov 29 04:31:45 2023 +0000 include: Update d3d12sdklayers.idl from vkd3d. This corresponds to vkd3d as of a52604da8cae8ce5639eeb20ef263c12bf70e1df commit. --- include/d3d12sdklayers.idl | 176 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl index 59b67ebe830..abfd25c6ffa 100644 --- a/include/d3d12sdklayers.idl +++ b/include/d3d12sdklayers.idl @@ -903,6 +903,68 @@ typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = 0x4, } D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; +typedef enum D3D12_GPU_BASED_VALIDATION_FLAGS +{ + D3D12_GPU_BASED_VALIDATION_FLAGS_NONE = 0x00, + D3D12_GPU_BASED_VALIDATION_FLAGS_DISABLE_STATE_TRACKING = 0x01, +} D3D12_GPU_BASED_VALIDATION_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_FLAGS)") + +typedef enum D3D12_RLDO_FLAGS +{ + D3D12_RLDO_NONE = 0x0, + D3D12_RLDO_SUMMARY = 0x1, + D3D12_RLDO_DETAIL = 0x2, + D3D12_RLDO_IGNORE_INTERNAL = 0x4, +} D3D12_RLDO_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RLDO_FLAGS)") + +typedef enum D3D12_DEBUG_DEVICE_PARAMETER_TYPE +{ + D3D12_DEBUG_DEVICE_PARAMETER_FEATURE_FLAGS, + D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS, + D3D12_DEBUG_DEVICE_PARAMETER_GPU_SLOWDOWN_PERFORMANCE_FACTOR, +} D3D12_DEBUG_DEVICE_PARAMETER_TYPE; + +typedef enum D3D12_DEBUG_FEATURE +{ + D3D12_DEBUG_FEATURE_NONE = 0x00, + D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS = 0x01, + D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING = 0x02, + D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION = 0x04, + D3D12_DEBUG_FEATURE_EMULATE_WINDOWS7 = 0x08, +} D3D12_DEBUG_FEATURE; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEBUG_FEATURE)") + +typedef enum D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS +{ + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_NONE = 0x00, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_TRACKING_ONLY_SHADERS = 0x01, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_UNGUARDED_VALIDATION_SHADERS = 0x02, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_GUARDED_VALIDATION_SHADERS = 0x04, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS_VALID_MASK = 0x07 +} D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS)") + +typedef enum D3D12_MESSAGE_CALLBACK_FLAGS +{ + D3D12_MESSAGE_CALLBACK_FLAG_NONE = 0x00, + D3D12_MESSAGE_CALLBACK_IGNORE_FILTERS = 0x01, +} D3D12_MESSAGE_CALLBACK_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_MESSAGE_CALLBACK_FLAGS)") + +typedef struct D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS +{ + UINT MaxMessagesPerCommandList; + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE DefaultShaderPatchMode; + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS PipelineStateCreateFlags; +} D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS; + +typedef struct D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR +{ + FLOAT SlowdownFactor; +} D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR; + typedef struct D3D12_MESSAGE { D3D12_MESSAGE_CATEGORY Category; @@ -952,6 +1014,104 @@ interface ID3D12Debug1 : IUnknown void SetEnableSynchronizedCommandQueueValidation(BOOL enable); } +[ + uuid(93a665c4-a3b2-4e5d-b692-a26ae14e3374), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug2 : IUnknown +{ + void SetGPUBasedValidationFlags(D3D12_GPU_BASED_VALIDATION_FLAGS flags); +} + +[ + uuid(5cf4e58f-f671-4ff1-a542-3686e3d153d1), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug3 : ID3D12Debug +{ + void SetEnableGPUBasedValidation(BOOL enable); + void SetEnableSynchronizedCommandQueueValidation(BOOL enable); + void SetGPUBasedValidationFlags(D3D12_GPU_BASED_VALIDATION_FLAGS flags); +} + +[ + uuid(014b816e-9ec5-4a2f-a845-ffbe441ce13a), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug4 : ID3D12Debug3 +{ + void DisableDebugLayer(); +} + +[ + uuid(548d6b12-09fa-40e0-9069-5dcd589a52c9), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug5 : ID3D12Debug4 +{ + void SetEnableAutoName(BOOL enable); +} + +[ + uuid(3febd6dd-4973-4787-8194-e45f9e28923e), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice : IUnknown +{ + HRESULT SetFeatureMask(D3D12_DEBUG_FEATURE mask); + D3D12_DEBUG_FEATURE GetFeatureMask(); + HRESULT ReportLiveDeviceObjects(D3D12_RLDO_FLAGS flags); +} + +[ + uuid(a9b71770-d099-4a65-a698-3dee10020f88), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice1 : IUnknown +{ + HRESULT SetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, const void *data, UINT size); + HRESULT GetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, void *data, UINT size); + HRESULT ReportLiveDeviceObjects(D3D12_RLDO_FLAGS flags); +} + +[ + uuid(60eccbc1-378d-4df1-894c-f8ac5ce4d7dd), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice2 : ID3D12DebugDevice +{ + HRESULT SetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, const void *data, UINT size); + HRESULT GetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, void *data, UINT size); +} + +[ + uuid(0adf7d52-929c-4e61-addb-ffed30de66ef), + object, + local, + pointer_default(unique) +] +interface ID3D12SharingContract : IUnknown +{ + void Present(ID3D12Resource *resource, UINT sub_resource, HWND window); + void SharedFenceSignal(ID3D12Fence *fence, UINT64 fence_value); + void BeginCapturableWork(REFGUID guid); + void EndCapturableWork(REFGUID guid); +} + [ uuid(0742a90b-c387-483f-b946-30a7e4e61458), object, @@ -997,3 +1157,19 @@ interface ID3D12InfoQueue : IUnknown void SetMuteDebugOutput([in] BOOL mute); BOOL GetMuteDebugOutput(); } + +typedef void (__stdcall *D3D12MessageFunc)(D3D12_MESSAGE_CATEGORY category, + D3D12_MESSAGE_SEVERITY severity, D3D12_MESSAGE_ID id, const char *description, void *context); + +[ + uuid(2852dd88-b484-4c0c-b6b1-67168500e600), + object, + local, + pointer_default(unique) +] +interface ID3D12InfoQueue1 : ID3D12InfoQueue +{ + HRESULT RegisterMessageCallback([in] D3D12MessageFunc func, + [in] D3D12_MESSAGE_CALLBACK_FLAGS flags, [in] void *context, [in, out] DWORD *cookie); + HRESULT UnregisterMessageCallback([in] DWORD cookie); +}

1 0

Zebediah Figura : ntdll: Print a warning when LdrGetProcedureAddress() fails.
by Alexandre Julliard Nov. 29, 2023

Nov. 29, 2023

Module: wine Branch: master Commit: c80f806e868bee642d4d3dea326409ee911fdbc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c80f806e868bee642d4d3dea326409… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 18:48:54 2023 -0600 ntdll: Print a warning when LdrGetProcedureAddress() fails. --- dlls/ntdll/loader.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a3de8791498..59624bc70f8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2006,13 +2006,14 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, ULONG ord, PVOID *address) { IMAGE_EXPORT_DIRECTORY *exports; + WINE_MODREF *wm; DWORD exp_size; NTSTATUS ret = STATUS_PROCEDURE_NOT_FOUND; RtlEnterCriticalSection( &loader_section ); /* check if the module itself is invalid to return the proper error */ - if (!get_modref( module )) ret = STATUS_DLL_NOT_FOUND; + if (!(wm = get_modref( module ))) ret = STATUS_DLL_NOT_FOUND; else if ((exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) { @@ -2023,6 +2024,11 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, *address = proc; ret = STATUS_SUCCESS; } + else + { + WARN( "%s (ordinal %lu) not found in %s\n", debugstr_a(name ? name->Buffer : NULL), + ord, debugstr_us(&wm->ldr.FullDllName) ); + } } RtlLeaveCriticalSection( &loader_section );

1 0