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

Jinoh Kang : combase: Compare AddRef() return value against 1 instead of 0 in find_proxy_manager.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: f55f0b834292eff17b232cf293372a0de80b14f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f55f0b834292eff17b232cf293372a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed May 17 23:30:16 2023 +0900 combase: Compare AddRef() return value against 1 instead of 0 in find_proxy_manager. Today, find_proxy_manager() tests if AddRef() returns 0 in an attempt to protect against a race condition bug. Note that AddRef does not return zero in normal circumstances, since AddRef returns the reference count after the increment, not before. Fix this by comparing the return value of AddRef() against 1, not 0. --- dlls/combase/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index a3da851b139..360c2c3e987 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -1949,7 +1949,7 @@ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struc /* be careful of a race with ClientIdentity_Release, which would * cause us to return a proxy which is in the process of being * destroyed */ - if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 0) + if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 1) { *proxy_found = proxy; found = TRUE;

1 0

Jinoh Kang : combase: Prevent use-after-free due to a race with proxy_manager_destroy.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: e308b19ac82c5bbd9472d8b86a2ff35a0f191d33 URL: https://gitlab.winehq.org/wine/wine/-/commit/e308b19ac82c5bbd9472d8b86a2ff3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed May 17 23:30:16 2023 +0900 combase: Prevent use-after-free due to a race with proxy_manager_destroy. Today, find_proxy_manager() may return a proxy manager that is about to be freed. This happens when the proxy manager's reference count reaches zero, but proxy_manager_destroy() has not removed the proxy manager from the apartment proxy list. Fix this by incrementing the reference count only if it is already nonzero. If the reference count is zero, any reference to the proxy manager will become invalid after the current thread leaves the critical section (apt->cs). This is because proxy_manager_destroy() will proceed to destroy the proxy manager after the apartment lock (apt->cs) is released. An alternative solution would be to prevent find_proxy_manager from observing the zero reference count in the first place. Multiple approaches have been considered for implementing this solution, but were eventually dropped due to several disadvantages when applied to the current Wine codebase: 1. Always acquire the apartment lock from the proxy manager's Release() method, and hold the lock until the proxy manager is completely removed from the list if the reference count drops to zero. This requires handling the special case when the proxy manager's parent apartment has been destroyed. When an apartment is destroyed, it sets the `parent` field of each proxy manager that was previously owned by the apartment to NULL. This means that each access to `This->parent->cs` has to be guarded by a NULL check for `This->parent`. Even if `parent` were never NULL, unconditionally acquiring a lock may unnecessarily block the subroutine and introduce contention. 2. Opportunistically decrement the reference count without holding the lock, but only if the count is greater than 1. This approach is still not free from the NULL parent apartment problem. 3. Check for any concurrent reference count change from proxy_manager_destroy(), and bail out if such change has occurred. This makes it possible for the proxy manager's AddRef() method to return 1, which is unusual. --- dlls/combase/marshal.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 360c2c3e987..e2f6a57d8e1 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -75,7 +75,7 @@ struct proxy_manager OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ OID oid; /* object ID (RO) */ struct list interfaces; /* imported interfaces (CS cs) */ - LONG refs; /* proxy reference count (LOCK) */ + LONG refs; /* proxy reference count (LOCK); 0 if about to be removed from list */ CRITICAL_SECTION cs; /* thread safety for this object and children */ ULONG sorflags; /* STDOBJREF flags (RO) */ IRemUnknown *remunk; /* proxy to IRemUnknown used for lifecycle management (CS cs) */ @@ -1887,6 +1887,32 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk return hr; } +/* + * Safely increment the reference count of a proxy manager obtained from an + * apartment proxy list. + * + * This function shall be called inside the apartment's critical section. + */ +static LONG proxy_manager_addref_if_alive(struct proxy_manager * This) +{ + LONG refs = ReadNoFence(&This->refs); + LONG old_refs, new_refs; + + do + { + if (refs == 0) + { + /* This proxy manager is about to be destroyed */ + return 0; + } + + old_refs = refs; + new_refs = refs + 1; + } while ((refs = InterlockedCompareExchange(&This->refs, new_refs, old_refs)) != old_refs); + + return new_refs; +} + /* destroys a proxy manager, freeing the memory it used. * Note: this function should not be called from a list iteration in the * apartment, due to the fact that it removes itself from the apartment and @@ -1949,7 +1975,7 @@ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struc /* be careful of a race with ClientIdentity_Release, which would * cause us to return a proxy which is in the process of being * destroyed */ - if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 1) + if (proxy_manager_addref_if_alive(proxy) != 0) { *proxy_found = proxy; found = TRUE;

1 0

Zhiyi Zhang : d2d1/tests: Add some IsSupported() tests for HWND target.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: 4150d7282e1813dd7120b95f851a2091ab4f7668 URL: https://gitlab.winehq.org/wine/wine/-/commit/4150d7282e1813dd7120b95f851a20… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 17 09:19:43 2023 +0200 d2d1/tests: Add some IsSupported() tests for HWND target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 248 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+)

1 0

Nikolay Sivov : d2d1: Implement IsSupported() for HWND target.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: c9b68daf4419338ec1fef55748703ea9b810bafa URL: https://gitlab.winehq.org/wine/wine/-/commit/c9b68daf4419338ec1fef55748703e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 17 09:30:01 2023 +0200 d2d1: Implement IsSupported() for HWND target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/hwnd_render_target.c | 29 ++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 6 ------ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5dab3fbb2a8..c3714a92511 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -264,6 +264,8 @@ struct d2d_hwnd_render_target IDXGISwapChain *swapchain; UINT sync_interval; HWND hwnd; + + D2D1_RENDER_TARGET_PROPERTIES desc; }; HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target, ID2D1Factory1 *factory, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 4d3fe43a1b3..325eb941782 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -652,10 +652,32 @@ static BOOL STDMETHODCALLTYPE d2d_hwnd_render_target_IsSupported(ID2D1HwndRender const D2D1_RENDER_TARGET_PROPERTIES *desc) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); + const D2D1_RENDER_TARGET_PROPERTIES *target_desc = &render_target->desc; + D2D1_PIXEL_FORMAT pixel_format; TRACE("iface %p, desc %p.\n", iface, desc); - return ID2D1RenderTarget_IsSupported(render_target->dxgi_target, desc); + if (desc->type != D2D1_RENDER_TARGET_TYPE_DEFAULT + && target_desc->type != desc->type) + { + return FALSE; + } + + pixel_format = ID2D1RenderTarget_GetPixelFormat(render_target->dxgi_target); + + if (desc->pixelFormat.format != DXGI_FORMAT_UNKNOWN + && pixel_format.format != desc->pixelFormat.format) + { + return FALSE; + } + + if (desc->pixelFormat.alphaMode != D2D1_ALPHA_MODE_UNKNOWN + && pixel_format.alphaMode != desc->pixelFormat.alphaMode) + { + return FALSE; + } + + return (target_desc->usage & desc->usage) == desc->usage; } static D2D1_WINDOW_STATE STDMETHODCALLTYPE d2d_hwnd_render_target_CheckWindowState(ID2D1HwndRenderTarget *iface) @@ -840,6 +862,11 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target if (dxgi_rt_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) dxgi_rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + render_target->desc = dxgi_rt_desc; + /* FIXME: should be resolved to either HW or SW type. */ + if (render_target->desc.type == D2D1_RENDER_TARGET_TYPE_DEFAULT) + render_target->desc.type = D2D1_RENDER_TARGET_TYPE_HARDWARE; + swapchain_desc.BufferDesc.Width = hwnd_rt_desc->pixelSize.width; swapchain_desc.BufferDesc.Height = hwnd_rt_desc->pixelSize.height; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ecbabe83b77..df1b99776e4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -13429,7 +13429,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) hr = ID2D1Factory_CreateHwndRenderTarget(ctx.factory, &template_desc, &hwnd_rt_desc, &rt); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); supported = ID2D1HwndRenderTarget_IsSupported(rt, &template_desc); - todo_wine ok(supported, "Expected supported.\n"); ID2D1HwndRenderTarget_Release(rt); @@ -13476,7 +13475,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) ok(pixel_format.format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected format %#x.\n", pixel_format.format); ok(pixel_format.alphaMode == D2D1_ALPHA_MODE_PREMULTIPLIED, "Got unexpected alpha %u.\n", pixel_format.alphaMode); supported = ID2D1HwndRenderTarget_IsSupported(rt, &test_desc); - todo_wine ok(supported, "Expected supported.\n"); ID2D1Bitmap1_Release(bitmap); @@ -13497,7 +13495,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) test_desc = template_desc; test_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; supported = ID2D1HwndRenderTarget_IsSupported(rt, &test_desc); - todo_wine ok(supported, "Unexpected return value %d.\n", supported); } else @@ -13514,7 +13511,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) supported = ID2D1HwndRenderTarget_IsSupported(rt, &test_desc); expected = target_types[j] == D2D1_RENDER_TARGET_TYPE_DEFAULT || target_types[i] == target_types[j]; - todo_wine_if(expected) ok(supported == expected, "Unexpected return value %d.\n", supported); winetest_pop_context(); @@ -13556,7 +13552,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) alpha_mode_supported = pixel_formats[j].alphaMode == D2D1_ALPHA_MODE_UNKNOWN || pixel_formats[j].alphaMode == desc.pixelFormat.alphaMode; expected = format_supported && alpha_mode_supported; - todo_wine_if(expected) ok(supported == expected, "Unexpected return value.\n"); winetest_pop_context(); @@ -13589,7 +13584,6 @@ static void test_hwnd_target_is_supported(BOOL d3d11) desc.usage = usages[j]; supported = ID2D1HwndRenderTarget_IsSupported(rt, &desc); expected = (usages[i] & usages[j]) == usages[j]; - todo_wine_if(expected) ok(supported == expected, "Unexpected result %d.\n", supported); winetest_pop_context();

1 0

Hans Leidekker : webservices: Handle WS_XML_BUFFER_TYPE in get_field_read_option().
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: a894528071e2cb4492e53e070b488371a3cff0b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a894528071e2cb4492e53e070b4883… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 16 13:17:31 2023 +0200 webservices: Handle WS_XML_BUFFER_TYPE in get_field_read_option(). --- dlls/webservices/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b28a5cc107c..41b2adc8724 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6184,6 +6184,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) case WS_BYTES_TYPE: case WS_XML_STRING_TYPE: case WS_XML_QNAME_TYPE: + case WS_XML_BUFFER_TYPE: case WS_STRUCT_TYPE: case WS_ENUM_TYPE: case WS_UNION_TYPE:

1 0

Piotr Caban : wineps: Introduce wine_driver_open_dc wine specific export used to create printer DC.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: ec6062c572509d1b916045f078c55663592ee52a URL: https://gitlab.winehq.org/wine/wine/-/commit/ec6062c572509d1b916045f078c556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 13:43:28 2023 +0200 wineps: Introduce wine_driver_open_dc wine specific export used to create printer DC. Doing it this way avoids passing Unix library pointers throught PE. --- dlls/gdi32/dc.c | 13 +++++++++---- dlls/win32u/dc.c | 9 ++++----- dlls/wineps.drv/init.c | 35 +++++++++++++++++++---------------- dlls/wineps.drv/unixlib.c | 25 +++++++++++++++++-------- dlls/wineps.drv/unixlib.h | 14 ++++++++------ dlls/wineps.drv/wineps.drv.spec | 2 +- 6 files changed, 58 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 91ab6c43bde..e7f2d8526d1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -42,7 +42,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -typedef const void * (CDECL *driver_entry_point)( unsigned int version, const WCHAR *device ); +typedef HDC (CDECL *driver_entry_point)( const WCHAR *device, + const DEVMODEW *devmode, const WCHAR *output ); struct graphics_driver { @@ -138,7 +139,7 @@ static struct graphics_driver *create_driver( HMODULE module ) driver->module = module; if (module) - driver->entry_point = (void *)GetProcAddress( module, "wine_get_gdi_driver" ); + driver->entry_point = (void *)GetProcAddress( module, "wine_driver_open_dc" ); else driver->entry_point = NULL; @@ -312,8 +313,12 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, device_str.Buffer = (WCHAR *)device; } - ret = NtGdiOpenDCW( device || display ? &device_str : NULL, devmode, output ? &output_str : NULL, - 0, is_display, entry_point, NULL, NULL ); + if (entry_point) + ret = entry_point( device, devmode, output ); + else + ret = NtGdiOpenDCW( device || display ? &device_str : NULL, devmode, + output ? &output_str : NULL, + 0, is_display, entry_point, NULL, NULL ); if (ret && hspool && (dc_attr = get_dc_attr( ret ))) { diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index bcfbed29426..9e8e2f65212 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -717,11 +717,10 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD /* gdi_lock should not be locked */ if (is_display) funcs = get_display_driver(); - else if (hspool) - { - const struct gdi_dc_funcs * (CDECL *wine_get_gdi_driver)( unsigned int, const WCHAR * ) = hspool; - funcs = wine_get_gdi_driver( WINE_GDI_DRIVER_VERSION, device ? device->Buffer : NULL ); - } + else if (type != WINE_GDI_DRIVER_VERSION) + ERR( "version mismatch: %u\n", (unsigned int)type ); + else + funcs = hspool; if (!funcs) { ERR( "no driver found\n" ); diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 136856d5dc0..ec015e1c871 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -897,24 +897,27 @@ fail: } /****************************************************************************** - * PSDRV_get_gdi_driver + * PSDRV_open_printer_dc */ -const struct gdi_dc_funcs * CDECL PSDRV_get_gdi_driver( unsigned int version, const WCHAR *name ) +HDC CDECL PSDRV_open_printer_dc( const WCHAR *device, + const DEVMODEW *devmode, const WCHAR *output ) { - PRINTERINFO *pi = PSDRV_FindPrinterInfo( name ); - struct init_dc_params params; + struct open_dc_params params; + PRINTERINFO *pi; + + if (!device) + return 0; + pi = PSDRV_FindPrinterInfo( device ); if (!pi) - return NULL; - if (version != WINE_GDI_DRIVER_VERSION) - { - ERR( "version mismatch, gdi32 wants %u but wineps has %u\n", version, WINE_GDI_DRIVER_VERSION ); - return NULL; - } - params.name = pi->friendly_name; - params.devmode = pi->Devmode; - params.funcs = NULL; - if (!WINE_UNIX_CALL( unix_init_dc, &params )) - return FALSE; - return params.funcs; + return 0; + + params.device = pi->friendly_name; + params.devmode = devmode; + params.output = output; + params.def_devmode = pi->Devmode; + params.hdc = 0; + if (!WINE_UNIX_CALL( unix_open_dc, &params )) + return 0; + return params.hdc; } diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 68509025eac..80331372572 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1688,23 +1688,32 @@ static NTSTATUS import_ntf(void *arg) return add_ntf_fonts(params->data, params->size); } -static NTSTATUS init_dc(void *arg) +static NTSTATUS open_dc(void *arg) { - struct init_dc_params *params = arg; + UNICODE_STRING device_str, output_str; + struct open_dc_params *params = arg; struct printer_info *pi; - pi = find_printer_info(params->name); + pi = find_printer_info(params->device); if (!pi) { pi = malloc(sizeof(*pi)); if (!pi) return FALSE; - pi->name = params->name; - pi->devmode = params->devmode; + pi->name = params->device; + pi->devmode = params->def_devmode; list_add_head(&printer_info_list, &pi->entry); } - params->funcs = &psdrv_funcs; + device_str.Length = device_str.MaximumLength = lstrlenW(params->device) + 1; + device_str.Buffer = (WCHAR *)params->device; + if (params->output) + { + output_str.Length = output_str.MaximumLength = lstrlenW(params->output) + 1; + output_str.Buffer = (WCHAR *)params->output; + } + params->hdc = NtGdiOpenDCW(&device_str, params->devmode, params->output ? &output_str : NULL, + WINE_GDI_DRIVER_VERSION, 0, (HANDLE)&psdrv_funcs, NULL, NULL); return TRUE; } @@ -1727,9 +1736,9 @@ static NTSTATUS free_printer_info(void *arg) const unixlib_entry_t __wine_unix_call_funcs[] = { - import_ntf, - init_dc, free_printer_info, + import_ntf, + open_dc, }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count); diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index 03459590dc6..e28a4416d09 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -74,9 +74,9 @@ struct installed_font /* Unix calls */ enum wineps_funcs { - unix_import_ntf, - unix_init_dc, unix_free_printer_info, + unix_import_ntf, + unix_open_dc, unix_funcs_count, }; @@ -86,9 +86,11 @@ struct import_ntf_params int size; }; -struct init_dc_params +struct open_dc_params { - const WCHAR *name; - PSDRV_DEVMODE *devmode; - const struct gdi_dc_funcs *funcs; + const WCHAR *device; + const DEVMODEW *devmode; + const WCHAR *output; + PSDRV_DEVMODE *def_devmode; + HDC hdc; }; diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index aca8ed2d10f..f193930a9fe 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -1,4 +1,4 @@ -@ cdecl wine_get_gdi_driver(long str) PSDRV_get_gdi_driver +@ cdecl wine_driver_open_dc(wstr ptr wstr) PSDRV_open_printer_dc @ stdcall -private DllRegisterServer() # Printer driver config exports

1 0

Piotr Caban : wineps: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: 407b01c4c35e07707451d1ae9eb92a9a78be172b URL: https://gitlab.winehq.org/wine/wine/-/commit/407b01c4c35e07707451d1ae9eb92a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 13:56:21 2023 +0200 wineps: Implement Wow64 entry points in the Unix library. --- dlls/wineps.drv/unixlib.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 80331372572..e90d3c31531 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1742,3 +1742,55 @@ const unixlib_entry_t __wine_unix_call_funcs[] = }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count); + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_import_ntf(void *args) +{ + struct + { + PTR32 data; + int size; + } const *params32 = args; + struct import_ntf_params params = { ULongToPtr(params32->data), params32->size }; + + return import_ntf(&params); +} + +static NTSTATUS wow64_open_dc(void *args) +{ + struct + { + PTR32 device; + PTR32 devmode; + PTR32 output; + PTR32 def_devmode; + PTR32 hdc; + } *params32 = args; + struct open_dc_params params = + { + ULongToPtr(params32->device), + ULongToPtr(params32->devmode), + ULongToPtr(params32->output), + ULongToPtr(params32->def_devmode), + 0 + }; + NTSTATUS ret; + + ret = open_dc(&params); + params32->hdc = PtrToUlong(params.hdc); + return ret; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + free_printer_info, + wow64_import_ntf, + wow64_open_dc, +}; + +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count); + +#endif /* _WIN64 */

1 0

Piotr Caban : wineps: Use default devmode if winspool returns fake data.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: 9f578f6a30c37cf550c3085136ea17020106ea91 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f578f6a30c37cf550c3085136ea17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 15:49:09 2023 +0200 wineps: Use default devmode if winspool returns fake data. Fixes regression caused by aa3699dd59c9. --- dlls/wineps.drv/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index ec015e1c871..78a72303708 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -644,14 +644,16 @@ static PSDRV_DEVMODE *get_devmode( HANDLE printer, const WCHAR *name, BOOL *is_d *is_default = FALSE; - if (dm) + if (dm && (dm->dmPublic.dmFields & DefaultDevmode.dmPublic.dmFields) == + DefaultDevmode.dmPublic.dmFields) { TRACE( "Retrieved devmode from winspool\n" ); return dm; } TRACE( "Using default devmode\n" ); - dm = HeapAlloc( PSDRV_Heap, 0, size ); + if (!dm) + dm = HeapAlloc( PSDRV_Heap, 0, size ); if (dm) { memcpy( dm, &DefaultDevmode, min(sizeof(DefaultDevmode), size) );

1 0

Piotr Caban : winspool: Register wineps print processor before adding printer.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: 9fd82b6156c395f85731291afd57b47ef79dbb55 URL: https://gitlab.winehq.org/wine/wine/-/commit/9fd82b6156c395f85731291afd57b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 16:14:46 2023 +0200 winspool: Register wineps print processor before adding printer. --- dlls/winspool.drv/info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2f2529ea01b..3c513f1c0e8 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -649,6 +649,8 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) res = !UNIX_CALL( get_ppd, &ppd_params ) || get_internal_fallback_ppd( ppd ); if (!res) goto end; + AddPrintProcessorW(NULL, NULL, driver_nt, (WCHAR *)L"wineps"); + memset( &di3, 0, sizeof(DRIVER_INFO_3W) ); di3.cVersion = 3; di3.pName = (WCHAR *)name;

1 0

Nikolay Sivov : wineps: Fix names in paper sizes list.
by Alexandre Julliard 18 May '23

18 May '23

Module: wine Branch: master Commit: c627c168c2faef3ad20d7159de5b26d547908c01 URL: https://gitlab.winehq.org/wine/wine/-/commit/c627c168c2faef3ad20d7159de5b26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 17 11:47:43 2023 +0200 wineps: Fix names in paper sizes list. This is likely a regression from cd4f48f22966. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wineps.drv/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 3f8ce902a0e..67209fbec2b 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -255,8 +255,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, i = Cursel = 0; LIST_FOR_EACH_ENTRY(ps, &di->pi->ppd->PageSizes, PAGESIZE, entry) { - SendDlgItemMessageA(hwnd, IDD_PAPERS, LB_INSERTSTRING, i, - (LPARAM)ps->FullName); + SendDlgItemMessageW(hwnd, IDD_PAPERS, LB_INSERTSTRING, i, (LPARAM)ps->FullName); if(di->pi->Devmode->dmPublic.dmPaperSize == ps->WinPage) Cursel = i; i++;

1 0