October 2021 - Wine-Commits

Zhiyi Zhang : comctl32/combo: Invalidate child edit control after painting themed background.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 8018f95a831e9b165fb1df94ae475faa88f7aa88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8018f95a831e9b165fb1df94… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 10:40:41 2021 +0800 comctl32/combo: Invalidate child edit control after painting themed background. Fix the edit control in a themed combo control not displaying text when clicking the combo control dropdown button. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 074f54f0937..4208ff8b9c9 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -789,6 +789,8 @@ static LRESULT COMBO_ThemedPaint(HTHEME theme, HEADCOMBO *lphc, HDC hdc) if ((lphc->dwStyle & CBS_DROPDOWNLIST) == CBS_DROPDOWNLIST) CBPaintText(lphc, hdc); + else + InvalidateRect(lphc->hWndEdit, NULL, TRUE); return 0; }

1 0

Alexandre Julliard : mscms: Use the bundled lcms2.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 5c4c272a2606afde1e32d45d0d472cb4ceca50a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c4c272a2606afde1e32d45d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 11:25:14 2021 +0200 mscms: Use the bundled lcms2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 111 -------------------------------- configure.ac | 18 ------ dlls/mscms/Makefile.in | 6 +- dlls/mscms/handle.c | 32 +++++----- dlls/mscms/liblcms.c | 166 ------------------------------------------------ dlls/mscms/mscms_main.c | 8 ++- dlls/mscms/mscms_priv.h | 15 ++--- dlls/mscms/profile.c | 8 +-- dlls/mscms/transform.c | 87 ++++++++++++++++++++----- include/config.h.in | 6 -- 10 files changed, 103 insertions(+), 354 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4c272a2606afde1e32…

1 0

Alexandre Julliard : libs: Import code from upstream lcms2 2.12.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: f550f624b27b4e49a2d01ae58b573e97538940fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f550f624b27b4e49a2d01ae5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 11:24:03 2021 +0200 libs: Import code from upstream lcms2 2.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 + configure.ac | 2 + libs/lcms2/AUTHORS | 53 + libs/lcms2/COPYING | 21 + libs/lcms2/Makefile.in | 25 + libs/lcms2/include/lcms2.h | 1922 +++++++++++++ libs/lcms2/include/lcms2_plugin.h | 680 +++++ libs/lcms2/src/cmsalpha.c | 646 +++++ libs/lcms2/src/cmscnvrt.c | 1214 ++++++++ libs/lcms2/src/cmserr.c | 663 +++++ libs/lcms2/src/cmsgamma.c | 1488 ++++++++++ libs/lcms2/src/cmsgmt.c | 590 ++++ libs/lcms2/src/cmshalf.c | 535 ++++ libs/lcms2/src/cmsintrp.c | 1316 +++++++++ libs/lcms2/src/cmsio0.c | 1949 +++++++++++++ libs/lcms2/src/cmsio1.c | 1028 +++++++ libs/lcms2/src/cmslut.c | 1837 ++++++++++++ libs/lcms2/src/cmsmtrx.c | 176 ++ libs/lcms2/src/cmsnamed.c | 980 +++++++ libs/lcms2/src/cmsopt.c | 1976 +++++++++++++ libs/lcms2/src/cmspack.c | 3433 ++++++++++++++++++++++ libs/lcms2/src/cmspcs.c | 940 +++++++ libs/lcms2/src/cmsplugin.c | 991 +++++++ libs/lcms2/src/cmssamp.c | 547 ++++ libs/lcms2/src/cmstypes.c | 5627 +++++++++++++++++++++++++++++++++++++ libs/lcms2/src/cmsvirt.c | 1217 ++++++++ libs/lcms2/src/cmswtpnt.c | 350 +++ libs/lcms2/src/cmsxform.c | 1365 +++++++++ libs/lcms2/src/lcms2_internal.h | 1122 ++++++++ 29 files changed, 32719 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f550f624b27b4e49a2d0…

1 0

Alexandre Julliard : windowscodecs: Use the bundled libtiff.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: d36615ee5232abfed2e9a17db6b43cfd1e722e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36615ee5232abfed2e9a17d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 10:55:21 2021 +0200 windowscodecs: Use the bundled libtiff. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 118 ----------------------- configure.ac | 14 --- dlls/windowscodecs/Makefile.in | 4 +- dlls/windowscodecs/libtiff.c | 211 +++++++++-------------------------------- dlls/windowscodecs/main.c | 4 +- dlls/windowscodecs/unix_lib.c | 6 -- include/config.h.in | 6 -- 7 files changed, 47 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d36615ee5232abfed2e9…

1 0

Alexandre Julliard : user32: Return INT_PTR instead of LRESULT in dialog procedures.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 7637e49c448dc0431f9497d0f6ed9854814e8ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=7637e49c448dc0431f9497d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 16:42:25 2021 +0200 user32: Return INT_PTR instead of LRESULT in dialog procedures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 2 +- dlls/user32/tests/msg.c | 6 +++--- dlls/user32/winproc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index fcfaf5c12d6..4b1336b62c5 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -488,7 +488,7 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, return DefWindowProcA (hwnd, uiMsg, wParam, lParam); } -static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, +static INT_PTR CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { switch (uiMsg) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 43253953a9e..4b2495f4197 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10110,7 +10110,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam return message == WM_COMPAREITEM ? -1 : ret; } -static INT_PTR CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +static LRESULT CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) { if (message == WM_CREATE) PostMessageA(hwnd, WM_CLOSE, 0, 0); @@ -14381,7 +14381,7 @@ static void test_dialog_messages(void) cls.lpszClassName = "MyDialogClass"; cls.hInstance = GetModuleHandleA(NULL); /* need a cast since a dlgproc is used as a wndproc */ - cls.lpfnWndProc = test_dlg_proc; + cls.lpfnWndProc = (WNDPROC)test_dlg_proc; if (!RegisterClassA(&cls)) assert(0); SetFocus(0); @@ -14534,7 +14534,7 @@ static void test_EndDialog(void) ok(GetClassInfoA(0, "#32770", &cls), "GetClassInfo failed\n"); cls.lpszClassName = "MyDialogClass"; cls.hInstance = GetModuleHandleA(NULL); - cls.lpfnWndProc = test_dlg_proc; + cls.lpfnWndProc = (WNDPROC)test_dlg_proc; if (!RegisterClassA(&cls)) assert(0); flush_sequence(); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 81fbcab928d..449fdae7b15 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1046,7 +1046,7 @@ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; - if (!(proc = handle_to_proc( func ))) + if (!(proc = handle_to_proc( (WNDPROC)func ))) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) { @@ -1071,7 +1071,7 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, if (!func) return 0; - if (!(proc = handle_to_proc( func ))) + if (!(proc = handle_to_proc( (WNDPROC)func ))) ret = call_dialog_proc( hwnd, msg, wParam, lParam, &result, func ); else if (proc == WINPROC_PROC16) {

1 0

Alexandre Julliard : oledb32: Return INT_PTR instead of LRESULT in dialog procedures.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 63895aaf2895b61bec5996d86e24b226ea149a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63895aaf2895b61bec5996d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 16:42:13 2021 +0200 oledb32: Return INT_PTR instead of LRESULT in dialog procedures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index c74fb5133d2..95fd7687560 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -329,7 +329,7 @@ static void add_connections_providers(HWND lv) RegCloseKey(key); } -static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -477,7 +477,7 @@ static void connection_toggle_controls(HWND parent) EnableWindow(GetDlgItem(parent, IDC_BTN_BUILD), !checked); } -static LRESULT CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -549,7 +549,7 @@ static void advanced_fill_permission_list(HWND parent) } } -static LRESULT CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -593,7 +593,7 @@ static void create_page_all_columns(HWND lv) SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); } -static LRESULT CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static INT_PTR CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp);

1 0

Matteo Bruni : wined3d: End transform feedback on SO buffer destruction even if the D3D buffer isn't bound.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: e2abbf9c583a203c135a5a0c79cf23b228603bd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2abbf9c583a203c135a5a0c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 19 17:43:47 2021 +0200 wined3d: End transform feedback on SO buffer destruction even if the D3D buffer isn't bound. It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 16 ++++++++++------ dlls/wined3d/device.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..854fa71aefe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) - { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && wined3d_context_is_graphics_state_dirty(&context_gl->c, STATE_STREAM_OUTPUT)) + { + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * need to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86945485e20..1c584b93fe0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1182,7 +1182,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - wined3d_device_context_emit_reset_state(&device->cs->c, false); + wined3d_device_context_emit_reset_state(&device->cs->c, true); state_cleanup(state); wine_rb_clear(&device->samplers, device_free_sampler, NULL);

1 0

Zhiyi Zhang : winemac.drv: Set hkey to NULL after RegCloseKey() in macdrv_init_gpu().
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 5b7397bb27968267e22cc9393dbcaf2cacb7798a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b7397bb27968267e22cc939… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 10:39:26 2021 +0800 winemac.drv: Set hkey to NULL after RegCloseKey() in macdrv_init_gpu(). Although it's unlikely, RegCloseKey() may close an already closed key if the following SetupDiGetDeviceRegistryPropertyW() failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b32c553d411..4a3b1ff39cb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1601,6 +1601,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; RegCloseKey(hkey); + hkey = NULL; /* Retrieve driver value for adapters */ if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW),

1 0

Zhiyi Zhang : winemac.drv: Add GPU hardware information values to the registry.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: d275e68dc6edb7640905043cd3dff8cede08be15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d275e68dc6edb7640905043c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 19 10:39:12 2021 +0800 winemac.drv: Add GPU hardware information values to the registry. Based on a patch by Dmitry Timoshkov. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 277a19155d8..b32c553d411 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1510,6 +1510,11 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index, WCHAR *guid_string, WCHAR *driver, LUID *gpu_luid) { + static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; + static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; + static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; + static const WCHAR ramdacW[] = {'I','n','t','e','r','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; @@ -1578,13 +1583,23 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + size = (lstrlenW(nameW) + 1) * sizeof(WCHAR); /* Write DriverDesc value */ - if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)nameW, (lstrlenW(nameW) + 1) * sizeof(WCHAR))) + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)nameW, size)) goto done; /* Write DriverDateData value, using current time as driver date, needed by Evoland */ GetSystemTimeAsFileTime(&filetime); if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + /* The following hardware information value type may be REG_BINARY or REG_SZ */ + if (RegSetValueExW(hkey, adapter_stringW, 0, REG_BINARY, (const BYTE *)nameW, size)) + goto done; + if (RegSetValueExW(hkey, bios_stringW, 0, REG_BINARY, (const BYTE *)nameW, size)) + goto done; + if (RegSetValueExW(hkey, chip_typeW, 0, REG_BINARY, (const BYTE *)nameW, size)) + goto done; + if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) + goto done; RegCloseKey(hkey); /* Retrieve driver value for adapters */

1 0

Alexandre Julliard : libs: Import upstream code from libjpeg 9d.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

1 0