March 2021 - Wine-commits - list.winehq.org

Jan Sikorski : wined3d: Pass format id for typeless resolve through wined3d_blt_fx.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 2adae568a65142e3a53ac8d1722e9b150cdea707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2adae568a65142e3a53ac8d1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 31 12:27:36 2021 +0200 wined3d: Pass format id for typeless resolve through wined3d_blt_fx. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- dlls/wined3d/device.c | 5 ++++- dlls/wined3d/surface.c | 1 + include/wine/wined3d.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 08e3811436d..6af1fce825f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1686,7 +1686,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *i { struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src_surface); - struct wined3d_blt_fx wined3d_fx; + struct wined3d_blt_fx wined3d_fx = {0}; DWORD unsupported_flags; DWORD fill_colour = 0; HRESULT hr = DD_OK; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71ca6740c37..ea5f6259b7e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5166,6 +5166,7 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, { struct wined3d_texture *dst_texture, *src_texture; unsigned int dst_level, src_level; + struct wined3d_blt_fx fx = {0}; RECT dst_rect, src_rect; TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, " @@ -5192,6 +5193,8 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, return; } + fx.resolve_format_id = format_id; + dst_texture = texture_from_resource(dst_resource); src_texture = texture_from_resource(src_resource); @@ -5202,7 +5205,7 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), wined3d_texture_get_level_height(src_texture, src_level)); wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, - src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + src_texture, src_sub_resource_idx, &src_rect, 0, &fx, WINED3D_TEXF_POINT); } HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5d07d8c401..855f739c9df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1509,6 +1509,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("src_color_key {0x%08x, 0x%08x}.\n", fx->src_color_key.color_space_low_value, fx->src_color_key.color_space_high_value); + TRACE("resolve_format_id %s.\n", debug_d3dformat(fx->resolve_format_id)); } dst_sub_resource = &dst_texture->sub_resources[dst_sub_resource_idx]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 197a56d1952..b1b435602bb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2014,6 +2014,7 @@ struct wined3d_blt_fx DWORD fx; struct wined3d_color_key dst_color_key; struct wined3d_color_key src_color_key; + enum wined3d_format_id resolve_format_id; }; struct wined3d_buffer_desc

1 0

Jan Sikorski : wined3d: Add resolve_format parameter to blitter_blit.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 99dc5b78a18f685d9ca38c590e45562d1fbd7c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99dc5b78a18f685d9ca38c59… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 31 12:27:37 2021 +0200 wined3d: Add resolve_format parameter to blitter_blit. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 +++++---- dlls/wined3d/glsl_shader.c | 13 +++++---- dlls/wined3d/surface.c | 11 +++++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 55 +++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 57 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99dc5b78a18f685d9ca3…

1 0

Jan Sikorski : wined3d: Introduce wined3d_gl_get_internal_format().
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: f42f8925f770ef7db5e84dc211b2586959531d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42f8925f770ef7db5e84dc2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 31 12:27:39 2021 +0200 wined3d: Introduce wined3d_gl_get_internal_format(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 18 ++---------------- dlls/wined3d/wined3d_private.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f2f408f11e..0736f612f12 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1999,13 +1999,7 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); - if (srgb) - internal = format_gl->srgb_internal; - else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) - internal = format_gl->rt_internal; - else - internal = format_gl->internal; - + internal = wined3d_gl_get_internal_format(resource, format_gl, srgb); if (!internal) FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); @@ -2146,16 +2140,8 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format if (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { + GLenum internal = wined3d_gl_get_internal_format(&dst_texture->resource, format_gl, srgb); unsigned int dst_row_pitch, dst_slice_pitch; - GLenum internal; - - if (srgb) - internal = format_gl->srgb_internal; - else if (dst_texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET - && wined3d_resource_is_offscreen(&dst_texture->resource)) - internal = format_gl->rt_internal; - else - internal = format_gl->internal; wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21941afbd82..e9e73da9f25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5930,6 +5930,17 @@ static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_te ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; } +static inline GLuint wined3d_gl_get_internal_format(struct wined3d_resource *resource, + const struct wined3d_format_gl *format_gl, bool srgb) +{ + if (srgb) + return format_gl->srgb_internal; + else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) + return format_gl->rt_internal; + else + return format_gl->internal; +} + static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_info, const struct wined3d_format *format) { return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup);

1 0

Zebediah Figura : ntoskrnl/tests: Fix a test failure on LUA Windows.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: e687f589dc23f604dc34d53e2b1ef0d1ee81294b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e687f589dc23f604dc34d53e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 31 11:16:31 2021 -0500 ntoskrnl/tests: Fix a test failure on LUA Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 50abb9f9d1f..c3ebe5b8ee1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -173,6 +173,17 @@ static BOOL testsign_create_cert(struct testsign_context *ctx) ok(ret, "Failed to set provider info, error %#x\n", GetLastError()); ctx->root_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, "root"); + if (!ctx->root_store && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Failed to open root store.\n"); + + ret = CertFreeCertificateContext(ctx->cert); + ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + ret = CryptReleaseContext(ctx->provider, 0); + ok(ret, "failed to release context, error %u\n", GetLastError()); + + return FALSE; + } ok(!!ctx->root_store, "Failed to open store, error %u\n", GetLastError()); ret = CertAddCertificateContextToStore(ctx->root_store, ctx->cert, CERT_STORE_ADD_ALWAYS, &ctx->root_cert); if (!ret && GetLastError() == ERROR_ACCESS_DENIED)

1 0

Nikolay Sivov : combase: Move IGlobalOptions implementation.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: c1cb17131556c601ebd98524a440e7758497a85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1cb17131556c601ebd98524… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 31 18:15:50 2021 +0300 combase: Move IGlobalOptions implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 162 +++++++++++++++++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 96 --------------------------- dlls/ole32/oleproxy.c | 13 ---- 4 files changed, 162 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cb17131556c601ebd9…

1 0

Rémi Bernon : winex11.drv: Introduce new map_event_coords helper.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 40f101e2884298045f52097b45a562b1054aab9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f101e2884298045f52097b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 25 19:00:18 2021 +0100 winex11.drv: Introduce new map_event_coords helper. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index dd25f8b172c..8a379e5a3b7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -587,6 +587,34 @@ static BOOL is_old_motion_event( unsigned long serial ) } +/*********************************************************************** + * map_event_coords + * + * Map the input event coordinates so they're relative to the desktop. + */ +static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, const INPUT *input ) +{ + POINT pt = { input->u.mi.dx, input->u.mi.dy }; + + TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); + + if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } + + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + + TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); + + return pt; +} + + /*********************************************************************** * send_mouse_input * @@ -618,24 +646,8 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU return; } - if (window != root_window) - { - pt.x = input->u.mi.dx; - pt.y = input->u.mi.dy; - } - else pt = root_to_virtual_screen( input->u.mi.dx, input->u.mi.dy ); - if (!(data = get_win_data( hwnd ))) return; - - if (window == data->whole_window) - { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } - - if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + pt = map_event_coords( hwnd, window, data, input ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100)

1 0

Rémi Bernon : winex11.drv: Update INPUT mouse coordinates directly.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 29d56fcb8b450701433a2d2572ec345ffd9633ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d56fcb8b450701433a2d25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 25 19:00:19 2021 +0100 winex11.drv: Update INPUT mouse coordinates directly. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8a379e5a3b7..8b39458fd37 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -592,7 +592,7 @@ static BOOL is_old_motion_event( unsigned long serial ) * * Map the input event coordinates so they're relative to the desktop. */ -static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, const INPUT *input ) +static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, INPUT *input ) { POINT pt = { input->u.mi.dx, input->u.mi.dy }; @@ -611,7 +611,8 @@ static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); - return pt; + input->u.mi.dx = pt.x; + input->u.mi.dy = pt.y; } @@ -623,7 +624,6 @@ static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPUT *input ) { struct x11drv_win_data *data; - POINT pt; input->type = INPUT_MOUSE; @@ -647,7 +647,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU } if (!(data = get_win_data( hwnd ))) return; - pt = map_event_coords( hwnd, window, data, input ); + map_event_coords( hwnd, window, data, input ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100) @@ -670,8 +670,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { - RECT rect; - SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); + RECT rect = { input->u.mi.dx, input->u.mi.dy, input->u.mi.dx + 1, input->u.mi.dy + 1 }; SERVER_START_REQ( update_window_zorder ) { @@ -685,8 +684,6 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU SERVER_END_REQ; } - input->u.mi.dx = pt.x; - input->u.mi.dy = pt.y; __wine_send_input( hwnd, input ); }

1 0

Zhiyi Zhang : gdi32: Fix handling of ModifyWorldTransform( MWT_IDENTITY ) on an emf dc.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: efdd6f46c9525366fe6d562caa0e19bce27ef015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efdd6f46c9525366fe6d562c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 31 08:55:13 2021 +0100 gdi32: Fix handling of ModifyWorldTransform( MWT_IDENTITY ) on an emf dc. When the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be ignored and use the identity matrix. Fix Tally crashing when exporting a JPEG image. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +++++++++++++- dlls/gdi32/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 16251939714..2a749418829 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -362,7 +362,19 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m emr.emr.iType = EMR_MODIFYWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); - emr.xform = *xform; + if (mode == MWT_IDENTITY) + { + emr.xform.eM11 = 1.0f; + emr.xform.eM12 = 0.0f; + emr.xform.eM21 = 0.0f; + emr.xform.eM22 = 1.0f; + emr.xform.eDx = 0.0f; + emr.xform.eDy = 0.0f; + } + else + { + emr.xform = *xform; + } emr.iMode = mode; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e81cff1ae57..648e9369803 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht, CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); } + else if(lpXfrm->iMode == MWT_IDENTITY) + { + /* reset to identity matrix also does discard */ + test_data->stored.eM11 = 1.0f; + test_data->stored.eM12 = 0.0f; + test_data->stored.eM21 = 0.0f; + test_data->stored.eM22 = 1.0f; + test_data->stored.eDx = 0.0f; + test_data->stored.eDy = 0.0f; + + CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); + } /* verify it is updated immediately */ ret = GetWorldTransform(hdc, &xform); @@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void) ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */ ok(ret == TRUE, "SetWorldTransform failed\n"); + ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */ + ok(ret == TRUE, "ModifyWorldTransform failed\n"); + set_rotation_xform(&xform, M_PI / 2.f, -2, -3); ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */ ok(ret == TRUE, "ModifyWorldTransform failed\n");

1 0

Alexandre Julliard : gdi32: Try to load the printer driver from the printer driver directory.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 23389127ecd0cedb8d6d020c2fa1f7dc00dc9b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23389127ecd0cedb8d6d020c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 10:18:54 2021 +0200 gdi32: Try to load the printer driver from the printer driver directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..09b051cd6fa 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -177,6 +177,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +#ifdef __i386__ +static const WCHAR printer_env[] = L"w32x86"; +#elif defined __x86_64__ +static const WCHAR printer_env[] = L"x64"; +#elif defined __arm__ +static const WCHAR printer_env[] = L"arm"; +#elif defined __aarch64__ +static const WCHAR printer_env[] = L"arm64"; +#else +#error not defined for this cpu +#endif + /********************************************************************** * DRIVER_load_driver */ @@ -200,7 +212,15 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) LeaveCriticalSection( &driver_section ); } - if (!(module = LoadLibraryW( name ))) return NULL; + if (!(module = LoadLibraryW( name ))) + { + WCHAR path[MAX_PATH]; + + GetSystemDirectoryW( path, MAX_PATH ); + swprintf( path + wcslen(path), MAX_PATH - wcslen(path), L"\\spool\\drivers\\%s\\3\\%s", + printer_env, name ); + if (!(module = LoadLibraryW( path ))) return NULL; + } if (!(new_driver = create_driver( module ))) {

1 0

Alexandre Julliard : ntdll: Also check syswow64 to determine if the prefix was initialized.
by Alexandre Julliard 31 Mar '21

31 Mar '21

Module: wine Branch: master Commit: 8bcb44a99bc8d88858ba07c5f462db6fefb414f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bcb44a99bc8d88858ba07c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 11:49:14 2021 +0200 ntdll: Also check syswow64 to determine if the prefix was initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4c76865019b..5b0004b6d01 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -118,7 +118,6 @@ static char *argv0; static const char *bin_dir; static const char *dll_dir; static SIZE_T dll_path_maxlen; -static BOOL is_prefix_bootstrap; const char *home_dir = NULL; const char *data_dir = NULL; @@ -311,8 +310,6 @@ static void set_config_dir(void) static void init_paths( char *argv[] ) { Dl_info info; - struct stat st; - char *ntdll; argv0 = strdup( argv[0] ); @@ -335,10 +332,6 @@ static void init_paths( char *argv[] ) set_dll_path(); set_home_dir(); set_config_dir(); - - ntdll = build_path( config_dir, "dosdevices/c:/windows/system32/ntdll.dll" ); - is_prefix_bootstrap = stat( ntdll, &st ) == -1; - free( ntdll ); } @@ -1437,9 +1430,10 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) { static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','w','o','w','6','4'}; + BOOL is_prefix_bootstrap; unsigned int len; - - if (!is_prefix_bootstrap) return FALSE; + struct stat st; + char *ntdll; *machine = current_machine; if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && @@ -1464,7 +1458,15 @@ found: len = wcslen(system_dir); while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; - return len == path->Length / sizeof(WCHAR); + if (len != path->Length / sizeof(WCHAR)) return FALSE; + + /* if the corresponding ntdll exists, don't fake the existence of the builtin */ + ntdll = build_path( config_dir, *machine == IMAGE_FILE_MACHINE_I386 ? + "dosdevices/c:/windows/syswow64/ntdll.dll" : + "dosdevices/c:/windows/system32/ntdll.dll" ); + is_prefix_bootstrap = stat( ntdll, &st ) == -1; + free( ntdll ); + return is_prefix_bootstrap; }

1 0