- Wine-Commits - list.winehq.org

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context.fog_coord field.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 7693cbe39ca9c6808a447befa9aa679761e1a3d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7693cbe39ca9c6808a447befa9aa67… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:05:59 2024 -0500 wined3d: Remove the no longer used wined3d_context.fog_coord field. --- dlls/wined3d/context_gl.c | 13 ------------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d245a87526f..9a85e0a4c86 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4883,19 +4883,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s WARN_(d3d_perf)("Using software emulation because not all material properties could be tracked.\n"); emulation = TRUE; } - else if (context->fog_coord && state->render_states[WINED3D_RS_FOGENABLE]) - { - static BOOL warned; - - /* Either write a pipeline replacement shader or convert the - * specular alpha from unsigned byte to a float in the vertex - * buffer. */ - if (!warned++) - FIXME("Using software emulation because manual fog coordinates are provided.\n"); - else - WARN_(d3d_perf)("Using software emulation because manual fog coordinates are provided.\n"); - emulation = TRUE; - } if (emulation) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17b57424839..3fc9dfb9a8e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1930,7 +1930,6 @@ struct wined3d_context DWORD uses_fbo_attached_resources : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; - DWORD fog_coord : 1; DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; @@ -1938,7 +1937,7 @@ struct wined3d_context DWORD update_primitive_type : 1; DWORD update_patch_vertex_count : 1; DWORD update_multisample_state : 1; - DWORD padding : 11; + DWORD padding : 12; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */

1 0

Fabian Maurer : riched20: In para_set_fmt protect against out of bound cTabStop values.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 7b2ff977739df25252d46552d2447af50c23040e URL: https://gitlab.winehq.org/wine/wine/-/commit/7b2ff977739df25252d46552d2447a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun May 26 19:20:07 2024 +0200 riched20: In para_set_fmt protect against out of bound cTabStop values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56730 --- dlls/riched20/para.c | 5 +++-- dlls/riched20/tests/editor.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index a380f45e556..2c9e2892189 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -486,8 +486,9 @@ static BOOL para_set_fmt( ME_TextEditor *editor, ME_Paragraph *para, const PARAF COPY_FIELD(PFM_ALIGNMENT, wAlignment); if (dwMask & PFM_TABSTOPS) { - para->fmt.cTabCount = pFmt->cTabCount; - memcpy(para->fmt.rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); + /* Clamp between 0 and MAX_TAB_STOPS */ + para->fmt.cTabCount = max(0, min(pFmt->cTabCount, MAX_TAB_STOPS)); + memcpy(para->fmt.rgxTabs, pFmt->rgxTabs, para->fmt.cTabCount * sizeof(LONG)); } #define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f8abb7a3e65..19cd40aea48 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8802,6 +8802,35 @@ static void test_alignment_style(void) SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); ok(pf.wAlignment == align_mask[i], "got %d expect %ld\n", pf.wAlignment, align_mask[i]); + /* Test out of bounds tab count */ + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = -25000; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == -25000, "Got %d\n", pf.cTabCount); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 0, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 25000; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 25000, "Got %d\n", pf.cTabCount); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 32, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 32; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 32, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 33; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 32, "Got %d\n", pf.cTabCount); + pf.dwMask = PFM_TABSTOPS; + pf.cTabCount = 1; + SendMessageW(richedit, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + ok(pf.cTabCount == 1, "Got %d\n", pf.cTabCount); + DestroyWindow(richedit); }

1 0

Tag vkd3d-1.12 : Alexandre Julliard : Release 1.12
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: vkd3d Branch: refs/tags/vkd3d-1.12 Tag: db51675aad3bc48ecce94881c728149d1c699dc4 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/db51675aad3bc48ecce94881c728149… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 22:08:03 2024 +0200 Release 1.12

1 0

Henri Verbeet : Release 1.12.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: vkd3d Branch: master Commit: 36c123c0056abd227ddfaac37a2a0902ac2f4bc5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/36c123c0056abd227ddfaac37a2a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 12:00:00 2024 +0200 Release 1.12. --- ANNOUNCE | 1398 ++++++++++++++++++----------------- ChangeLog.md | 153 ++++ Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 6 +- libs/vkd3d/state.c | 6 +- programs/vkd3d-compiler/main.c | 2 +- tests/shader_runner_gl.c | 2 +- tests/shader_runner_vulkan.c | 2 +- 13 files changed, 901 insertions(+), 682 deletions(-)

1 0

Rémi Bernon : win32u: Only keep DPI awareness context with window objects.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: a3b22d3bf7fc8202ae74487f454dc1f9dd901262 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3b22d3bf7fc8202ae74487f454dc1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 23:23:22 2024 +0200 win32u: Only keep DPI awareness context with window objects. --- dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/sysparams.c | 10 ------ dlls/win32u/win32u_private.h | 1 - dlls/win32u/window.c | 32 ++++++++---------- include/ntuser.h | 2 ++ include/wine/server_protocol.h | 18 +++++----- server/protocol.def | 12 +++---- server/request.h | 16 ++++----- server/trace.c | 12 +++---- server/window.c | 77 ++++++++++++++++++++---------------------- 10 files changed, 76 insertions(+), 107 deletions(-)

1 0

Rémi Bernon : win32u: Fix SetThreadDpiAwarenessContext.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 37252fd5056566acddf4a753fd1792aeef8f25c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/37252fd5056566acddf4a753fd1792… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 15:29:27 2024 +0200 win32u: Fix SetThreadDpiAwarenessContext. --- dlls/user32/sysparams.c | 67 +++++++++++------------------- dlls/user32/tests/sysparams.c | 94 +++++++++++++++++++------------------------ dlls/win32u/sysparams.c | 49 +++++++--------------- dlls/win32u/tests/win32u.c | 3 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 4 +- dlls/wineandroid.drv/window.c | 2 +- include/ntuser.h | 4 +- 8 files changed, 87 insertions(+), 137 deletions(-)

1 0

Rémi Bernon : win32u: Get the thread DPI context instead of the awareness.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: cda7027bc8b67da3ef316008fed1670f23b355d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cda7027bc8b67da3ef316008fed167… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 22:51:36 2024 +0200 win32u: Get the thread DPI context instead of the awareness. --- dlls/user32/sysparams.c | 10 +++++----- dlls/win32u/sysparams.c | 32 +++++++++++++------------------- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 2 +- include/ntuser.h | 2 +- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0248a4d905f..7208535186a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -757,7 +757,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void) struct ntuser_thread_info *info = NtUserGetThreadInfo(); ULONG context; - if (info->dpi_awareness) return ULongToHandle( info->dpi_awareness ); + if (info->dpi_context) return ULongToHandle( info->dpi_context ); context = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); return UlongToHandle( NTUSER_DPI_CONTEXT_GET_AWARENESS( context ) | 0x10 ); @@ -777,15 +777,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - if (!(prev = info->dpi_awareness)) + if (!(prev = info->dpi_context)) { ULONG process_ctx = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ); prev = NTUSER_DPI_CONTEXT_GET_AWARENESS( process_ctx ) | 0x80000010; /* restore to process default */ } - if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0; + if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_context = 0; else if (context == DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 || context == (DPI_AWARENESS_CONTEXT)0x22) - info->dpi_awareness = 0x22; - else info->dpi_awareness = val | 0x10; + info->dpi_context = 0x22; + else info->dpi_context = val | 0x10; return ULongToHandle( prev ); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 26ed8b1d1ac..f107f114af6 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(system); +static LONG dpi_context; /* process DPI awareness context */ static HKEY video_key, enum_key, control_key, config_key, volatile_base_key; @@ -2160,18 +2161,13 @@ static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CON } } -/********************************************************************** - * get_thread_dpi_awareness - */ -DPI_AWARENESS get_thread_dpi_awareness(void) +UINT get_thread_dpi_awareness_context(void) { struct ntuser_thread_info *info = NtUserGetThreadInfo(); - ULONG_PTR context = info->dpi_awareness; - - if (context == 0) /* process default */ - return NtUserGetProcessDpiAwarenessContext( NULL ) & 3; + UINT context; - return get_awareness_from_dpi_awareness_context((DPI_AWARENESS_CONTEXT)context); + if (!(context = info->dpi_context)) context = ReadNoFence( &dpi_context ); + return context ? context : NTUSER_DPI_UNAWARE; } DWORD get_process_layout(void) @@ -2184,7 +2180,7 @@ DWORD get_process_layout(void) */ UINT get_thread_dpi(void) { - switch (get_thread_dpi_awareness()) + switch (NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() )) { case DPI_AWARENESS_UNAWARE: return USER_DEFAULT_SCREEN_DPI; case DPI_AWARENESS_SYSTEM_AWARE: return system_dpi; @@ -2195,7 +2191,8 @@ UINT get_thread_dpi(void) /* see GetDpiForSystem */ UINT get_system_dpi(void) { - if (get_thread_dpi_awareness() == DPI_AWARENESS_UNAWARE) return USER_DEFAULT_SCREEN_DPI; + DPI_AWARENESS awareness = NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() ); + if (awareness == DPI_AWARENESS_UNAWARE) return USER_DEFAULT_SCREEN_DPI; return system_dpi; } @@ -2210,15 +2207,15 @@ UINT set_thread_dpi_awareness_context( UINT context ) RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return 0; } - if (!(prev = info->dpi_awareness)) + if (!(prev = info->dpi_context)) { prev = NtUserGetProcessDpiAwarenessContext( GetCurrentProcess() ) & 3; prev |= 0x80000010; /* restore to process default */ } - if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_awareness = 0; + if (((ULONG_PTR)context & ~(ULONG_PTR)0x33) == 0x80000000) info->dpi_context = 0; else if (context == HandleToUlong( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ) || context == 0x22) - info->dpi_awareness = 0x22; - else info->dpi_awareness = val | 0x10; + info->dpi_context = 0x22; + else info->dpi_context = val | 0x10; return prev; } @@ -3733,7 +3730,7 @@ BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT * RtlSetLastWin32Error( ERROR_INVALID_ADDRESS ); return FALSE; } - switch (get_thread_dpi_awareness()) + switch (NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() )) { case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; @@ -6226,9 +6223,6 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va return TRUE; } - -static LONG dpi_context; - /*********************************************************************** * NtUserSetProcessDpiAwarenessContext (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 222db6fb5f7..aecd60bae63 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -175,7 +175,7 @@ extern UINT get_system_dpi(void); extern int get_system_metrics( int index ); extern UINT get_thread_dpi(void); extern UINT set_thread_dpi_awareness_context( UINT context ); -extern DPI_AWARENESS get_thread_dpi_awareness(void); +extern UINT get_thread_dpi_awareness_context(void); extern RECT get_virtual_screen_rect( UINT dpi ); extern BOOL is_exiting_thread( DWORD tid ); extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 321c81069c4..f7026654a50 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4911,7 +4911,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, HINSTANCE instance, BOOL ansi, DWORD style, DWORD ex_style ) { - DPI_AWARENESS awareness = get_thread_dpi_awareness(); + DPI_AWARENESS awareness = NTUSER_DPI_CONTEXT_GET_AWARENESS( get_thread_dpi_awareness_context() ); HWND handle = 0, full_parent = 0, full_owner = 0; struct tagCLASS *class = NULL; int extra_bytes = 0; diff --git a/include/ntuser.h b/include/ntuser.h index 392ab21ec0d..b58413ac4db 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -83,7 +83,7 @@ struct ntuser_thread_info UINT receive_flags; /* currently received message flags */ UINT top_window; /* desktop window */ UINT msg_window; /* HWND_MESSAGE parent window */ - DPI_AWARENESS dpi_awareness; /* DPI awareness */ + UINT dpi_context; /* DPI awareness context */ UINT default_imc; /* default input context */ UINT64 client_imm; /* client IMM thread info */ UINT64 wmchar_data; /* client data for WM_CHAR mappings */

1 0

Eric Pouech : conhost: Fix display of font preview in 64-bit mode.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: b3fa23e88db19b831161d49c98a390e4fbc60782 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3fa23e88db19b831161d49c98a390… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue May 28 16:32:27 2024 +0200 conhost: Fix display of font preview in 64-bit mode. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/conhost/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 043ecd5510f..a5dd9979534 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1367,7 +1367,7 @@ static COLORREF get_color( struct dialog_info *di, unsigned int idc ) { LONG_PTR index; - index = GetWindowLongPtrW(GetDlgItem( di->dialog, idc ), 0); + index = GetWindowLongW(GetDlgItem( di->dialog, idc ), 0); return di->config.color_map[index]; }

1 0

Dmitry Timoshkov : user32/tests: Add a test to show that SendMessage(LB_SETCOUNT) adds a scrollbar.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 7103be9c1b6cb21b074d7710f7316433ae46444b URL: https://gitlab.winehq.org/wine/wine/-/commit/7103be9c1b6cb21b074d7710f73164… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 28 18:39:28 2024 +0300 user32/tests: Add a test to show that SendMessage(LB_SETCOUNT) adds a scrollbar. In addition to existing tests this shows that the call SendMessage(listbox, LB_SETCOUNT, 100, 0); adds a scrollbar to the listbox however it doesn't add a nonclient area to an update region because the call ValidateRect(listbox, NULL); validates a client area, and after that a window no longer has an update region. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/listbox.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index c78171ff4d8..747e3dae192 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1939,11 +1939,17 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( IsRectEmpty( &r ), "got non-empty rect\n"); + ret = GetWindowLongA( listbox, GWL_STYLE ); + ok((ret & (WS_VSCROLL | WS_HSCROLL)) == 0, "Listbox should not have scroll bars\n"); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); ok( ret == 0, "got %ld\n", ret ); ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); ok( ret == 100, "got %ld\n", ret ); + ret = GetWindowLongA( listbox, GWL_STYLE ); + ok((ret & (WS_VSCROLL | WS_HSCROLL)) == WS_VSCROLL, "Listbox should have vertical scroll bar\n"); + GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n");

1 0

Danyil Blyschak : wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: 11a386960ebcc7de0e194912bae28c99ff2f899e URL: https://gitlab.winehq.org/wine/wine/-/commit/11a386960ebcc7de0e194912bae28c… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Fri May 24 16:13:46 2024 -0500 wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found. In the PSDRV_MergeDevmodes and merge_devmodes functions, there is a check earlier to update dmDefaultSource only if a slot is found, and so this member should not be updated again with no such check. --- dlls/wineps.drv/driver.c | 2 -- dlls/wineps.drv/unixlib.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index d56118e5e2c..1170e161b17 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -181,8 +181,6 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, PRINTERINFO * TRACE("Trying to change to unsupported bin %d\n", dm2->dmDefaultSource); } - if (dm2->dmFields & DM_DEFAULTSOURCE ) - dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource; if (dm2->dmFields & DM_PRINTQUALITY ) dm1->dmPublic.dmPrintQuality = dm2->dmPrintQuality; if (dm2->dmFields & DM_COLOR ) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index e9b009b0e87..a96f919c02a 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -422,8 +422,6 @@ static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, TRACE("Trying to change to unsupported bin %d\n", dm2->dmDefaultSource); } - if (dm2->dmFields & DM_DEFAULTSOURCE) - dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource; if (dm2->dmFields & DM_PRINTQUALITY) dm1->dmPublic.dmPrintQuality = dm2->dmPrintQuality; if (dm2->dmFields & DM_COLOR)

1 0