April 2023 - Wine-commits - list.winehq.org

Connor McAdams : uiautomationcore: Implement IUIAutomation::GetRootElement.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: b532f695c1cf9adf8f4a8ac60f216716ef079e3c URL: https://gitlab.winehq.org/wine/wine/-/commit/b532f695c1cf9adf8f4a8ac60f2167… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 23 15:19:04 2023 -0400 uiautomationcore: Implement IUIAutomation::GetRootElement. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 60 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 17 ++++++++- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index a3153eff7ab..25b975fa280 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -12199,6 +12199,65 @@ static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) UnregisterClassA("test_CUIAutomation_TreeWalker_ifaces class", NULL); } +static void test_GetRootElement(IUIAutomation *uia_iface) +{ + IUIAutomationElement *element; + HRESULT hr; + VARIANT v; + + hr = IUIAutomation_GetRootElement(uia_iface, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + UiaRegisterProviderCallback(test_uia_provider_callback); + + initialize_provider(&Provider_hwnd, ProviderOptions_ClientSideProvider, GetDesktopWindow(), TRUE); + initialize_provider(&Provider_nc, ProviderOptions_ClientSideProvider | ProviderOptions_NonClientAreaProvider, + GetDesktopWindow(), TRUE); + initialize_provider(&Provider_proxy, ProviderOptions_ClientSideProvider, GetDesktopWindow(), TRUE); + Provider_proxy.ignore_hwnd_prop = TRUE; + + base_hwnd_prov = &Provider_hwnd.IRawElementProviderSimple_iface; + proxy_prov = &Provider_proxy.IRawElementProviderSimple_iface; + nc_prov = &Provider_nc.IRawElementProviderSimple_iface; + + /* Retrieve an element representing the desktop HWND. */ + method_sequences_enabled = FALSE; + SET_EXPECT(prov_callback_base_hwnd); + SET_EXPECT(prov_callback_nonclient); + SET_EXPECT(prov_callback_proxy); + hr = IUIAutomation_GetRootElement(uia_iface, &element); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!element, "Node == NULL.\n"); + ok(Provider_proxy.ref == 2, "Unexpected refcnt %ld\n", Provider_proxy.ref); + ok(Provider_hwnd.ref == 2, "Unexpected refcnt %ld\n", Provider_hwnd.ref); + ok(Provider_nc.ref == 2, "Unexpected refcnt %ld\n", Provider_nc.ref); + CHECK_CALLED(prov_callback_base_hwnd); + CHECK_CALLED(prov_callback_nonclient); + CHECK_CALLED(prov_callback_proxy); + + hr = IUIAutomationElement_GetCurrentPropertyValueEx(element, UIA_ProviderDescriptionPropertyId, TRUE, &v); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + check_node_provider_desc_prefix(V_BSTR(&v), GetCurrentProcessId(), GetDesktopWindow()); + check_node_provider_desc(V_BSTR(&v), L"Main", L"Provider_proxy", TRUE); + check_node_provider_desc(V_BSTR(&v), L"Hwnd", L"Provider_hwnd", FALSE); + check_node_provider_desc(V_BSTR(&v), L"Nonclient", L"Provider_nc", FALSE); + VariantClear(&v); + + IUIAutomationElement_Release(element); + ok(Provider_proxy.ref == 1, "Unexpected refcnt %ld\n", Provider_proxy.ref); + ok(Provider_hwnd.ref == 1, "Unexpected refcnt %ld\n", Provider_hwnd.ref); + ok(Provider_nc.ref == 1, "Unexpected refcnt %ld\n", Provider_nc.ref); + + initialize_provider(&Provider_hwnd, ProviderOptions_ClientSideProvider, NULL, TRUE); + initialize_provider(&Provider_nc, ProviderOptions_ClientSideProvider | ProviderOptions_NonClientAreaProvider, NULL, + TRUE); + initialize_provider(&Provider_proxy, ProviderOptions_ClientSideProvider, NULL, TRUE); + base_hwnd_prov = proxy_prov = nc_prov = NULL; + + method_sequences_enabled = TRUE; + UiaRegisterProviderCallback(NULL); +} + struct uia_com_classes { const GUID *clsid; const GUID *iid; @@ -12305,6 +12364,7 @@ static void test_CUIAutomation(void) test_Element_GetPropertyValue(uia_iface); test_Element_cache_methods(uia_iface); test_Element_Find(uia_iface); + test_GetRootElement(uia_iface); IUIAutomation_Release(uia_iface); CoUninitialize(); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index f1c28e81aa8..6cba9fd46db 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -2776,8 +2776,21 @@ static HRESULT WINAPI uia_iface_CompareRuntimeIds(IUIAutomation6 *iface, SAFEARR static HRESULT WINAPI uia_iface_GetRootElement(IUIAutomation6 *iface, IUIAutomationElement **root) { - FIXME("%p, %p: stub\n", iface, root); - return E_NOTIMPL; + struct uia_iface *uia_iface = impl_from_IUIAutomation6(iface); + HUIANODE node; + HRESULT hr; + + TRACE("%p, %p\n", iface, root); + + if (!root) + return E_POINTER; + + *root = NULL; + hr = UiaGetRootNode(&node); + if (FAILED(hr)) + return hr; + + return create_uia_element(root, uia_iface->is_cui8, node); } static HRESULT WINAPI uia_iface_ElementFromHandle(IUIAutomation6 *iface, UIA_HWND hwnd, IUIAutomationElement **out_elem)

1 0

Connor McAdams : uiautomationcore: Implement conditional NavigateDirection_Parent navigation.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: f93bd3ff2c93ec8caaf6aceb9c16c9d28248dc31 URL: https://gitlab.winehq.org/wine/wine/-/commit/f93bd3ff2c93ec8caaf6aceb9c16c9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 23 15:56:45 2023 -0400 uiautomationcore: Implement conditional NavigateDirection_Parent navigation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 106 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 72 ++++++++++++++++---- 2 files changed, 166 insertions(+), 12 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add normalization navigation to UiaGetUpdatedCache.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: cd9f3e5d05b3cd6b7f71e4a8337df55531651ff4 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd9f3e5d05b3cd6b7f71e4a8337df5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Mar 24 11:29:16 2023 -0400 uiautomationcore: Add normalization navigation to UiaGetUpdatedCache. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 86 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 80 ++++++++++++++++----------- 2 files changed, 134 insertions(+), 32 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 193f1470029..40f6cdd9f38 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -7873,6 +7873,34 @@ static const struct prov_method_sequence cache_req_seq7[] = { { 0 } }; +static const struct prov_method_sequence cache_req_seq8[] = { + NODE_CREATE_SEQ(&Provider_child), + { 0 } +}; + +static const struct prov_method_sequence cache_req_seq9[] = { + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId */ + /* Done twice on Windows, but we shouldn't need to replicate this. */ + { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_IsControlElementPropertyId */ + { &Provider_child, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ + NODE_CREATE_SEQ(&Provider), + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId */ + /* Only done on Win10v1507 and below. */ + { &Provider, FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ + { 0 } +}; + +static const struct prov_method_sequence cache_req_seq10[] = { + { &Provider_child, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId */ + /* Done twice on Windows, but we shouldn't need to replicate this. */ + { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_IsControlElementPropertyId */ + { &Provider_child, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ + NODE_CREATE_SEQ(&Provider), + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_IsControlElementPropertyId */ + { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_ProviderDescriptionPropertyId. */ + { 0 } +}; + static const struct UiaCondition UiaTrueCondition = { ConditionType_True }; static const struct UiaCondition UiaFalseCondition = { ConditionType_False }; static void test_UiaGetUpdatedCache(void) @@ -8419,7 +8447,65 @@ static void test_UiaGetUpdatedCache(void) ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + + /* Normalization navigation tests. */ initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE); + initialize_provider(&Provider_child, ProviderOptions_ServerSideProvider, NULL, FALSE); + + hr = UiaNodeFromProvider(&Provider_child.IRawElementProviderSimple_iface, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); + ok_method_sequence(cache_req_seq8, "cache_req_seq8"); + + /* + * Neither Provider_child or Provider match this condition, return + * nothing. + */ + variant_init_bool(&v, FALSE); + set_property_condition(&prop_cond, UIA_IsControlElementPropertyId, &v, PropertyConditionFlags_None); + set_cache_request(&cache_req, (struct UiaCondition *)&prop_cond, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!out_req, "out_req != NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + SysFreeString(tree_struct); + ok_method_sequence(cache_req_seq9, "cache_req_seq9"); + + /* + * Provider now matches our condition, we'll get Provider in the cache + * request. + */ + variant_init_bool(&v, FALSE); + set_property_override(&prop_override, UIA_IsControlElementPropertyId, &v); + set_provider_prop_override(&Provider, &prop_override, 1); + init_node_provider_desc(&exp_node_desc[0], GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); + + set_cache_request(&cache_req, (struct UiaCondition *)&prop_cond, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq10, "cache_req_seq10"); + + ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + VariantClear(&v); + + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); + ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); + initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE); + initialize_provider(&Provider_child, ProviderOptions_ServerSideProvider, NULL, FALSE); IUnknown_Release(unk_ns); CoUninitialize(); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 9b3d734defd..64fd8b3b1cb 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -2992,6 +2992,31 @@ static HRESULT uia_condition_check(HUIANODE node, struct UiaCondition *condition } } +static HRESULT uia_node_normalize(HUIANODE huianode, struct UiaCondition *cond, HUIANODE *normalized_node) +{ + struct uia_node *node = impl_from_IWineUiaNode((IWineUiaNode *)huianode); + HRESULT hr; + + *normalized_node = NULL; + if (cond) + { + hr = uia_condition_check(huianode, cond); + if (FAILED(hr)) + return hr; + + /* + * If our initial node doesn't match our normalization condition, need + * to get the nearest ancestor that does. + */ + if (!uia_condition_matched(hr)) + return conditional_navigate_uia_node(node, NavigateDirection_Parent, cond, normalized_node); + } + + *normalized_node = huianode; + IWineUiaNode_AddRef(&node->IWineUiaNode_iface); + return S_OK; +} + /*********************************************************************** * UiaGetUpdatedCache (uiautomationcore.@) */ @@ -3001,6 +3026,7 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac struct uia_node *node = unsafe_impl_from_IWineUiaNode((IWineUiaNode *)huianode); struct UiaCondition *cond; SAFEARRAYBOUND sabound[2]; + HUIANODE ret_node; SAFEARRAY *sa; LONG idx[2]; HRESULT hr; @@ -3052,17 +3078,14 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac return E_INVALIDARG; } - if (cond) - { - hr = uia_condition_check(huianode, cond); - if (FAILED(hr)) - return hr; + hr = uia_node_normalize(huianode, cond, &ret_node); + if (FAILED(hr)) + return hr; - if (!uia_condition_matched(hr)) - { - *tree_struct = SysAllocString(L""); - return S_OK; - } + if (!ret_node) + { + *tree_struct = SysAllocString(L""); + return S_OK; } sabound[0].cElements = 1; @@ -3071,51 +3094,44 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac if (!(sa = SafeArrayCreate(VT_VARIANT, 2, sabound))) { WARN("Failed to create safearray\n"); - return E_FAIL; + hr = E_FAIL; + goto exit; } - get_variant_for_node(huianode, &v); + get_variant_for_node(ret_node, &v); idx[0] = idx[1] = 0; hr = SafeArrayPutElement(sa, idx, &v); if (FAILED(hr)) - { - SafeArrayDestroy(sa); - return hr; - } + goto exit; idx[0] = 0; VariantClear(&v); for (i = 0; i < cache_req->cProperties; i++) { - hr = UiaGetPropertyValue(huianode, cache_req->pProperties[i], &v); + hr = UiaGetPropertyValue(ret_node, cache_req->pProperties[i], &v); /* Don't fail on unimplemented properties. */ if (FAILED(hr) && hr != E_NOTIMPL) - { - SafeArrayDestroy(sa); - return hr; - } + goto exit; idx[1] = 1 + i; hr = SafeArrayPutElement(sa, idx, &v); VariantClear(&v); if (FAILED(hr)) - { - SafeArrayDestroy(sa); - return hr; - } + goto exit; } - /* - * AddRef huianode since we're returning a reference to the same node we - * passed in, rather than creating a new one. - */ - IWineUiaNode_AddRef(&node->IWineUiaNode_iface); - *out_req = sa; *tree_struct = SysAllocString(L"P)"); - return S_OK; +exit: + if (FAILED(hr)) + { + SafeArrayDestroy(sa); + UiaNodeRelease(ret_node); + } + + return hr; } /***********************************************************************

1 0

Henri Verbeet : wined3d: Implement shader_extract_from_dxbc() on top of vkd3d_shader_parse_dxbc().
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: 11fe071d51824f09e58b3ceac1717644bc2751c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/11fe071d51824f09e58b3ceac17176… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 10:05:40 2023 +0200 wined3d: Implement shader_extract_from_dxbc() on top of vkd3d_shader_parse_dxbc(). --- dlls/wined3d/shader_sm4.c | 131 ++++++++++++---------------------------------- 1 file changed, 34 insertions(+), 97 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a55bc2df3f5..b87d45b0fb7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -17,6 +17,8 @@ */ #include "wined3d_private.h" +#define LIBVKD3D_SHADER_SOURCE +#include <vkd3d_shader.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); @@ -1823,7 +1825,6 @@ const struct wined3d_shader_frontend sm4_shader_frontend = }; #define TAG_AON9 WINEMAKEFOURCC('A', 'o', 'n', '9') -#define TAG_DXBC WINEMAKEFOURCC('D', 'X', 'B', 'C') #define TAG_ISG1 WINEMAKEFOURCC('I', 'S', 'G', '1') #define TAG_ISGN WINEMAKEFOURCC('I', 'S', 'G', 'N') #define TAG_OSG1 WINEMAKEFOURCC('O', 'S', 'G', '1') @@ -1842,13 +1843,6 @@ struct aon9_header unsigned int byte_code_offset; }; -struct shader_handler_context -{ - struct wined3d_shader *shader; - enum vkd3d_shader_source_type *source_type; - unsigned int max_version; -}; - static void read_dword(const char **ptr, unsigned int *d) { memcpy(d, *ptr, sizeof(*d)); @@ -1873,77 +1867,6 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } -static HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, unsigned int data_size, unsigned int tag, void *ctx), void *ctx) -{ - const char *ptr = data; - HRESULT hr = S_OK; - unsigned int chunk_count; - unsigned int total_size; - unsigned int i; - unsigned int version; - unsigned int tag; - - read_dword(&ptr, &tag); - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - if (tag != TAG_DXBC) - { - WARN("Wrong tag.\n"); - return E_INVALIDARG; - } - - WARN("Ignoring DXBC checksum.\n"); - skip_dword_unknown(&ptr, 4); - - read_dword(&ptr, &version); - TRACE("version: %#x.\n", version); - if (version != 0x00000001) - { - WARN("Got unexpected DXBC version %#x.\n", version); - return E_INVALIDARG; - } - - read_dword(&ptr, &total_size); - TRACE("total size: %#x\n", total_size); - - read_dword(&ptr, &chunk_count); - TRACE("chunk count: %#x\n", chunk_count); - - for (i = 0; i < chunk_count; ++i) - { - unsigned int chunk_tag, chunk_size; - const char *chunk_ptr; - unsigned int chunk_offset; - - read_dword(&ptr, &chunk_offset); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); - - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) - { - WARN("Invalid chunk offset %#x (data size %#Ix).\n", chunk_offset, data_size); - return E_FAIL; - } - - chunk_ptr = data + chunk_offset; - - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); - - if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) - { - WARN("Invalid chunk size %#x (data size %#Ix, chunk offset %#x).\n", - chunk_size, data_size, chunk_offset); - return E_FAIL; - } - - if (FAILED(hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx))) - break; - } - - return hr; -} - static const char *shader_get_string(const char *data, size_t data_size, unsigned int offset) { if (offset >= data_size) @@ -2031,17 +1954,19 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int return S_OK; } -static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_size, unsigned int tag, void *context) +static HRESULT shader_dxbc_process_section(struct wined3d_shader *shader, unsigned int max_version, + enum vkd3d_shader_source_type *source_type, const struct vkd3d_shader_dxbc_section_desc *section) { - struct shader_handler_context *ctx = context; - struct wined3d_shader *shader = ctx->shader; + unsigned int data_size = section->data.size; + const void *data = section->data.code; + uint32_t tag = section->tag; HRESULT hr; switch (tag) { case TAG_ISGN: case TAG_ISG1: - if (ctx->max_version < 4) + if (max_version < 4) { TRACE("Skipping shader input signature.\n"); break; @@ -2058,7 +1983,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz case TAG_OSGN: case TAG_OSG1: case TAG_OSG5: - if (ctx->max_version < 4) + if (max_version < 4) { TRACE("Skipping shader output signature.\n"); break; @@ -2085,22 +2010,22 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz case TAG_SHDR: case TAG_SHEX: - if (ctx->max_version < 4) + if (max_version < 4) { TRACE("Skipping SM4+ shader.\n"); break; } if (shader->function) FIXME("Multiple shader code chunks.\n"); - shader->function = (const DWORD *)data; + shader->function = data; shader->functionLength = data_size; - *ctx->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + *source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; break; case TAG_AON9: - if (ctx->max_version < 4) + if (max_version < 4) { - const struct aon9_header *header = (const struct aon9_header *)data; + const struct aon9_header *header = data; unsigned int unknown_dword_count; const char *byte_code; @@ -2109,7 +2034,8 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz WARN("Invalid Aon9 data size %#x.\n", data_size); return E_FAIL; } - byte_code = data + header->byte_code_offset; + byte_code = data; + byte_code += header->byte_code_offset; unknown_dword_count = (header->byte_code_offset - sizeof(*header)) / sizeof(DWORD); if (data_size - 2 * sizeof(DWORD) < header->byte_code_offset) @@ -2123,7 +2049,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz FIXME("Multiple shader code chunks.\n"); shader->function = (const DWORD *)byte_code; shader->functionLength = data_size - header->byte_code_offset; - *ctx->source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + *source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; TRACE("Feature level 9 shader version 0%08x, 0%08lx.\n", header->shader_version, *shader->function); } @@ -2144,14 +2070,25 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) { - struct shader_handler_context ctx; - HRESULT hr; + const struct vkd3d_shader_code dxbc = {.code = shader->byte_code, .size = shader->byte_code_size}; + struct vkd3d_shader_dxbc_desc dxbc_desc; + HRESULT hr = WINED3D_OK; + unsigned int i; + int ret; - ctx.shader = shader; - ctx.source_type = source_type; - ctx.max_version = max_shader_version; + if ((ret = vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, NULL)) < 0) + { + WARN("Failed to parse DXBC, ret %d.\n", ret); + return E_INVALIDARG; + } + + for (i = 0; i < dxbc_desc.section_count; ++i) + { + if (FAILED(hr = shader_dxbc_process_section(shader, max_shader_version, source_type, &dxbc_desc.sections[i]))) + break; + } + vkd3d_shader_free_dxbc(&dxbc_desc); - hr = parse_dxbc(shader->byte_code, shader->byte_code_size, shader_dxbc_chunk_handler, &ctx); if (!shader->function) hr = E_INVALIDARG;

1 0

Piotr Caban : wineps: Rename handle count parameter in hmf_proc.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: c15add32104ccb5b9294f81c314f3e03d82f5a9d URL: https://gitlab.winehq.org/wine/wine/-/commit/c15add32104ccb5b9294f81c314f3e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:45:28 2023 +0200 wineps: Rename handle count parameter in hmf_proc. --- dlls/wineps.drv/printproc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 84d7539b963..d4c6d95b003 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1008,12 +1008,12 @@ static BOOL is_path_record(int type) } static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, - const ENHMETARECORD *rec, int n, LPARAM arg) + const ENHMETARECORD *rec, int handle_count, LPARAM arg) { struct pp_data *data = (struct pp_data *)arg; if (data->path && is_path_record(rec->iType)) - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); switch (rec->iType) { @@ -1113,9 +1113,9 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_RESTOREDC: { HDC hdc = data->pdev->dev.hdc; - int ret = PlayEnhMetaFileRecord(hdc, htable, rec, n); + int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); - select_hbrush(data, htable, n, GetCurrentObject(hdc, OBJ_BRUSH)); + select_hbrush(data, htable, handle_count, GetCurrentObject(hdc, OBJ_BRUSH)); /* TODO: reselect font */ PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); @@ -1145,7 +1145,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const EMRDELETEOBJECT *p = (const EMRDELETEOBJECT *)rec; memset(&data->patterns[p->ihObject], 0, sizeof(*data->patterns)); - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_ANGLEARC: { @@ -1169,7 +1169,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, arcto.ptlEnd.y = GDI_ROUND(p->ptlCenter.y - sin((p->eStartAngle + p->eSweepAngle) * M_PI / 180) * p->nRadius); - ret = hmf_proc(hdc, htable, (ENHMETARECORD *)&arcto, n, arg); + ret = hmf_proc(hdc, htable, (ENHMETARECORD *)&arcto, handle_count, arg); SetArcDirection(data->pdev->dev.hdc, arc_dir); return ret; } @@ -1266,12 +1266,12 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_BEGINPATH: { data->path = TRUE; - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_ENDPATH: { data->path = FALSE; - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_FILLPATH: return PSDRV_FillPath(&data->pdev->dev); @@ -1282,7 +1282,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_ABORTPATH: { data->path = FALSE; - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_FILLRGN: { @@ -1291,7 +1291,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, int ret; rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); - ret = fill_rgn(data, htable, n, p->ihBrush, rgn); + ret = fill_rgn(data, htable, handle_count, p->ihBrush, rgn); DeleteObject(rgn); return ret; } @@ -1315,7 +1315,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, OffsetRgn(rgn, 0, -p->szlStroke.cy); CombineRgn(frame, rgn, frame, RGN_DIFF); - ret = fill_rgn(data, htable, n, p->ihBrush, frame); + ret = fill_rgn(data, htable, handle_count, p->ihBrush, frame); DeleteObject(rgn); DeleteObject(frame); return ret; @@ -1328,7 +1328,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); old_rop = SetROP2(data->pdev->dev.hdc, R2_NOT); - ret = fill_rgn(data, htable, n, 0x80000000 | BLACK_BRUSH, rgn); + ret = fill_rgn(data, htable, handle_count, 0x80000000 | BLACK_BRUSH, rgn); SetROP2(data->pdev->dev.hdc, old_rop); DeleteObject(rgn); return ret; @@ -1541,7 +1541,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec; - if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count)) return 0; data->patterns[p->ihBrush].usage = p->iUsage; data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); @@ -1552,7 +1552,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { const EMRCREATEDIBPATTERNBRUSHPT *p = (const EMRCREATEDIBPATTERNBRUSHPT *)rec; - if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count)) return 0; data->patterns[p->ihBrush].usage = p->iUsage; data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); @@ -1615,7 +1615,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_EXTSELECTCLIPRGN: case EMR_SETLAYOUT: case EMR_SETTEXTJUSTIFICATION: - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); default: FIXME("unsupported record: %ld\n", rec->iType); }

1 0

Piotr Caban : wineps: Set text and background color during device creation.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: a2c644a8f1b77a67f67e6c664d2472b7dfccf818 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2c644a8f1b77a67f67e6c664d2472… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:49:03 2023 +0200 wineps: Set text and background color during device creation. --- dlls/wineps.drv/printproc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index d4c6d95b003..8c32808dcdd 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1748,6 +1748,9 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) return NULL; } data->pdev->dev.hdc = hdc; + + PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); return (HANDLE)data; }

1 0

Piotr Caban : wineps: Handle EMR_EXTCREATEFONTINDIRECTW record in spool files.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: 16a8da44f11f56f1196f179a5502f14dd4727adf URL: https://gitlab.winehq.org/wine/wine/-/commit/16a8da44f11f56f1196f179a5502f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:50:12 2023 +0200 wineps: Handle EMR_EXTCREATEFONTINDIRECTW record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8c32808dcdd..71dd28239e1 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1613,6 +1613,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_WIDENPATH: case EMR_SELECTCLIPPATH: case EMR_EXTSELECTCLIPRGN: + case EMR_EXTCREATEFONTINDIRECTW: case EMR_SETLAYOUT: case EMR_SETTEXTJUSTIFICATION: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count);

1 0

Piotr Caban : wineps: Handle font selection in spool files.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: f2f90fae67673b3cb2fde19a6e9668682cbf2007 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2f90fae67673b3cb2fde19a6e9668… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:59:47 2023 +0200 wineps: Handle font selection in spool files. --- dlls/wineps.drv/Makefile.in | 2 +- dlls/wineps.drv/printproc.c | 67 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 52eb27923d9..aa8d15759b4 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineps.drv -IMPORTS = user32 gdi32 winspool advapi32 +IMPORTS = user32 gdi32 winspool advapi32 win32u C_SRCS = \ afm.c \ diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 71dd28239e1..449748c8b22 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <windows.h> +#include <ntgdi.h> #include <winspool.h> #include <ddk/winsplp.h> @@ -40,7 +41,10 @@ struct pp_data HANDLE hport; WCHAR *doc_name; WCHAR *out_file; + PSDRV_PDEVICE *pdev; + struct gdi_physdev font_dev; + struct brush_pattern *patterns; BOOL path; }; @@ -133,6 +137,50 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } +static BOOL CDECL font_EnumFonts(PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lp) +{ + return EnumFontFamiliesExW(dev->hdc, lf, proc, lp, 0); +} + +static BOOL CDECL font_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) +{ + XFORM old, xform = { .eM11 = 1.0f }; + BOOL ret; + + GetWorldTransform(dev->hdc, &old); + SetWorldTransform(dev->hdc, &xform); + ret = NtGdiGetCharWidthW(dev->hdc, first, count, (WCHAR *)chars, NTGDI_GETCHARWIDTH_INT, buffer); + SetWorldTransform(dev->hdc, &old); + return ret; +} + +static BOOL CDECL font_GetTextExtentExPoint(PHYSDEV dev, const WCHAR *str, INT count, INT *dxs) +{ + SIZE size; + return GetTextExtentExPointW(dev->hdc, str, count, -1, NULL, dxs, &size); +} + +static BOOL CDECL font_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) +{ + return GetTextMetricsW(dev->hdc, metrics); +} + +static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) +{ + *aa_flags = GGO_BITMAP; + return SelectObject(dev->hdc, hfont) ? hfont : 0; +} + +static const struct gdi_dc_funcs font_funcs = +{ + .pEnumFonts = font_EnumFonts, + .pGetCharWidth = font_GetCharWidth, + .pGetTextExtentExPoint = font_GetTextExtentExPoint, + .pGetTextMetrics = font_GetTextMetrics, + .pSelectFont = font_SelectFont, + .priority = GDI_PRIORITY_FONT_DRV +}; + static inline INT GDI_ROUND(double val) { return (int)floor(val + 0.5); @@ -1114,18 +1162,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { HDC hdc = data->pdev->dev.hdc; int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); + UINT aa_flags; - select_hbrush(data, htable, handle_count, GetCurrentObject(hdc, OBJ_BRUSH)); - /* TODO: reselect font */ - PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); - PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); - PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + if (ret) + { + select_hbrush(data, htable, handle_count, GetCurrentObject(hdc, OBJ_BRUSH)); + PSDRV_SelectFont(&data->pdev->dev, GetCurrentObject(hdc, OBJ_FONT), &aa_flags); + PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); + PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); + PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + } return ret; } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec; struct brush_pattern *pattern; + UINT aa_flags; HGDIOBJ obj; obj = get_object_handle(data, htable, so->ihObject, &pattern); @@ -1135,6 +1188,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { case OBJ_PEN: return PSDRV_SelectPen(&data->pdev->dev, obj, NULL) != NULL; case OBJ_BRUSH: return PSDRV_SelectBrush(&data->pdev->dev, obj, pattern) != NULL; + case OBJ_FONT: return PSDRV_SelectFont(&data->pdev->dev, obj, &aa_flags) != NULL; default: FIXME("unhandled object type %ld\n", GetObjectType(obj)); return 1; @@ -1749,6 +1803,9 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) return NULL; } data->pdev->dev.hdc = hdc; + data->pdev->dev.next = &data->font_dev; + data->font_dev.funcs = &font_funcs; + data->font_dev.hdc = hdc; PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc));

1 0

Piotr Caban : wineps: Store text justification info in print processor data.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: ac13b9502053c7a3955d00e53b0fff550b56c181 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac13b9502053c7a3955d00e53b0fff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 20:03:04 2023 +0200 wineps: Store text justification info in print processor data. --- dlls/wineps.drv/printproc.c | 67 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 449748c8b22..0452e19845a 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -47,6 +47,16 @@ struct pp_data struct brush_pattern *patterns; BOOL path; + INT break_extra; + INT break_rem; + + INT saved_dc_size; + INT saved_dc_top; + struct + { + INT break_extra; + INT break_rem; + } *saved_dc; }; typedef enum @@ -88,6 +98,13 @@ typedef struct unsigned int cjSize; } record_hdr; +typedef struct +{ + EMR emr; + INT break_extra; + INT break_count; +} EMRSETTEXTJUSTIFICATION; + BOOL WINAPI SeekPrinter(HANDLE, LARGE_INTEGER, LARGE_INTEGER*, DWORD, BOOL); static const WCHAR emf_1003[] = L"NT EMF 1.003"; @@ -1158,8 +1175,37 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, PSDRV_SetBkColor(&data->pdev->dev, p->crColor); return 1; } + case EMR_SAVEDC: + { + int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); + + if (!data->saved_dc_size) + { + data->saved_dc = malloc(8 * sizeof(*data->saved_dc)); + if (data->saved_dc) + data->saved_dc_size = 8; + } + else if (data->saved_dc_size == data->saved_dc_top) + { + void *alloc = realloc(data->saved_dc, data->saved_dc_size * 2); + + if (alloc) + { + data->saved_dc = alloc; + data->saved_dc_size *= 2; + } + } + if (data->saved_dc_size == data->saved_dc_top) + return 0; + + data->saved_dc[data->saved_dc_top].break_extra = data->break_extra; + data->saved_dc[data->saved_dc_top].break_rem = data->break_rem; + data->saved_dc_top++; + return ret; + } case EMR_RESTOREDC: { + const EMRRESTOREDC *p = (const EMRRESTOREDC *)rec; HDC hdc = data->pdev->dev.hdc; int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); UINT aa_flags; @@ -1171,6 +1217,12 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + + if (p->iRelative >= 0 || data->saved_dc_top + p->iRelative < 0) + return 0; + data->saved_dc_top += p->iRelative; + data->break_extra = data->saved_dc[data->saved_dc_top].break_extra; + data->break_rem = data->saved_dc[data->saved_dc_top].break_rem; } return ret; } @@ -1633,6 +1685,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return gradient_fill(&data->pdev->dev, p->Ver, p->nVer, p->Ver + p->nVer, p->nTri, p->ulMode); } + case EMR_SETTEXTJUSTIFICATION: + { + const EMRSETTEXTJUSTIFICATION *p = (const EMRSETTEXTJUSTIFICATION *)rec; + + data->break_extra = p->break_extra / p->break_count; + data->break_rem = p->break_extra - data->break_extra * p->break_count; + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); + } case EMR_EXTFLOODFILL: case EMR_ALPHABLEND: @@ -1656,7 +1716,6 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_INTERSECTCLIPRECT: case EMR_SCALEVIEWPORTEXTEX: case EMR_SCALEWINDOWEXTEX: - case EMR_SAVEDC: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: case EMR_CREATEPEN: @@ -1669,7 +1728,6 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_EXTSELECTCLIPRGN: case EMR_EXTCREATEFONTINDIRECTW: case EMR_SETLAYOUT: - case EMR_SETTEXTJUSTIFICATION: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); default: FIXME("unsupported record: %ld\n", rec->iType); @@ -1719,6 +1777,10 @@ static BOOL print_metafile(struct pp_data *data, HANDLE hdata) DeleteEnhMetaFile(hmf); free(data->patterns); data->patterns = NULL; + data->path = FALSE; + data->break_extra = 0; + data->break_rem = 0; + data->saved_dc_top = 0; return ret; } @@ -1959,6 +2021,7 @@ BOOL WINAPI ClosePrintProcessor(HANDLE pp) DeleteDC(data->pdev->dev.hdc); HeapFree(GetProcessHeap(), 0, data->pdev->Devmode); HeapFree(GetProcessHeap(), 0, data->pdev); + free(data->saved_dc); memset(data, 0, sizeof(*data)); LocalFree(data);

1 0

Piotr Caban : wineps: Handle EMR_EXTTEXTOUTW record in spool files.
by Alexandre Julliard 19 Apr '23

19 Apr '23

Module: wine Branch: master Commit: 2df476c11fe10e306ca5f4130d73658e3cb581c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2df476c11fe10e306ca5f4130d7365… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 20:12:54 2023 +0200 wineps: Handle EMR_EXTTEXTOUTW record in spool files. --- dlls/wineps.drv/printproc.c | 515 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 515 insertions(+)

1 0