From ef11bb63ce54490bc5a1e14ab650207b515340da Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 7 Sep 2021 21:47:35 -0500 Subject: [PATCH] Rebase against 63737942a06183f6b2e7fa8f95a07c918c9bf29b. --- ...tated-Arc-ArcTo-Chord-and-Pie-drawin.patch | 14 +++--- patches/patchinstall.sh | 2 +- ...001-winecfg-Add-staging-tab-for-CSMT.patch | 31 ++++++------ ...kbox-to-enable-disable-vaapi-GPU-dec.patch | 40 ++++++---------- ...eckbox-to-enable-disable-EAX-support.patch | 28 +++++------ ...kbox-to-enable-disable-HideWineExpor.patch | 29 ++++++------ ...ption-to-enable-disable-GTK3-theming.patch | 47 +++++++------------ staging/upstream-commit | 2 +- 8 files changed, 84 insertions(+), 109 deletions(-) diff --git a/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch b/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch index ea29d5e7..00dbec03 100644 --- a/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch +++ b/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch @@ -1,4 +1,4 @@ -From 84c63ad840a0717541969a66124f830de282ffa8 Mon Sep 17 00:00:00 2001 +From 8204d928d034b627c2c4bc7930f62a352d609ad0 Mon Sep 17 00:00:00 2001 From: Daniel Wendt Date: Fri, 15 Nov 2013 12:52:37 +0100 Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing @@ -11,7 +11,7 @@ Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=34579 2 files changed, 83 insertions(+) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c -index c6f11ae6a69..e4a5f7bab8b 100644 +index 9bd6dc557a5..da9144f0862 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -312,6 +312,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end @@ -116,17 +116,17 @@ index c6f11ae6a69..e4a5f7bab8b 100644 { HeapFree( GetProcessHeap(), 0, points ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h -index bf7684b53a7..d75708f0d15 100644 +index 2dddf361d5b..e7d0090a52b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h -@@ -223,4 +223,7 @@ extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; - extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; - extern BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +@@ -289,4 +289,7 @@ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) + return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); + } +BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform ) DECLSPEC_HIDDEN; +BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ -- -2.30.2 +2.33.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 2e5d2f65..deeea03e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "8b9f1e12841298591387e2b7590191610a37986e" + echo "63737942a06183f6b2e7fa8f95a07c918c9bf29b" } # Show version information diff --git a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch index 78e85e5f..9454b3fa 100644 --- a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch +++ b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch @@ -1,23 +1,23 @@ -From bf564ac0eee8525ab28e78552dd54e633607230f Mon Sep 17 00:00:00 2001 +From b6d9ed56703d771d5e2083cc30a55714a0166a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 14 Dec 2014 20:42:45 +0100 Subject: [PATCH] winecfg: Add staging tab for CSMT. --- programs/winecfg/Makefile.in | 1 + - programs/winecfg/main.c | 12 ++++- + programs/winecfg/main.c | 12 +++++- programs/winecfg/resource.h | 5 +++ - programs/winecfg/staging.c | 85 ++++++++++++++++++++++++++++++++++++ + programs/winecfg/staging.c | 82 ++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.h | 1 + programs/winecfg/winecfg.rc | 10 +++++ - 6 files changed, 113 insertions(+), 1 deletion(-) + 6 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 programs/winecfg/staging.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in -index a2746f7d4ac..2172dac2169 100644 +index f2f74cb77ea..8beaa7e8584 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in -@@ -10,6 +10,7 @@ C_SRCS = \ +@@ -12,6 +12,7 @@ C_SRCS = \ driveui.c \ libraries.c \ main.c \ @@ -26,7 +26,7 @@ index a2746f7d4ac..2172dac2169 100644 winecfg.c \ x11drvdlg.c diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c -index 735ac02299f..3d7d740883f 100644 +index 77b732d6819..b467a6f1c8f 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) @@ -87,10 +87,10 @@ index dd46bc71b40..582c5c967e4 100644 #define IDC_ABT_ORG 8433 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c new file mode 100644 -index 00000000000..f5ab2594a22 +index 00000000000..a2a2117a56d --- /dev/null +++ b/programs/winecfg/staging.c -@@ -0,0 +1,85 @@ +@@ -0,0 +1,82 @@ +/* + * WineCfg Staging panel + * @@ -115,10 +115,7 @@ index 00000000000..f5ab2594a22 + +#define COBJMACROS + -+#include "config.h" -+ +#include -+#include + +#include "resource.h" +#include "winecfg.h" @@ -128,14 +125,14 @@ index 00000000000..f5ab2594a22 + */ +static BOOL csmt_get(void) +{ -+ char *buf = get_reg_key(config_key, "Direct3D", "csmt", NULL); ++ WCHAR *buf = get_reg_key(config_key, L"Direct3D", L"csmt", NULL); + BOOL ret = buf ? !!*buf : TRUE; + HeapFree(GetProcessHeap(), 0, buf); + return ret; +} +static void csmt_set(BOOL status) +{ -+ set_reg_key_dword(config_key, "Direct3D", "csmt", status); ++ set_reg_key_dword(config_key, L"Direct3D", L"csmt", status); +} + + @@ -177,10 +174,10 @@ index 00000000000..f5ab2594a22 + return FALSE; +} diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h -index 9dd39c51c3f..9279d42ea98 100644 +index 29751bf4555..a5f0e92beb6 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h -@@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +@@ -83,6 +83,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -217,5 +214,5 @@ index 1faa0a60b55..895f68c1237 100644 /* @makedep: winecfg.ico */ -- -2.25.1 +2.33.0 diff --git a/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch b/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch index 24ca4984..d19f1499 100644 --- a/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch +++ b/patches/winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch @@ -1,16 +1,16 @@ -From 2c0e38e44cb592d67eee581cd78428d784a24f40 Mon Sep 17 00:00:00 2001 +From f9e74e7d75b84f1831e49f7be9197e3a6db6e428 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 21 Feb 2015 23:37:26 +0100 -Subject: winecfg: Add checkbox to enable/disable vaapi GPU decoder. +Subject: [PATCH] winecfg: Add checkbox to enable/disable vaapi GPU decoder. --- programs/winecfg/resource.h | 1 + - programs/winecfg/staging.c | 30 ++++++++++++++++++++++++++++++ + programs/winecfg/staging.c | 20 ++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 + - 3 files changed, 32 insertions(+) + 3 files changed, 22 insertions(+) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 54c67c2..7b6ac54 100644 +index 582c5c967e4..17378655db6 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -214,6 +214,7 @@ @@ -22,11 +22,11 @@ index 54c67c2..7b6ac54 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index efba152..a2b6dce 100644 +index a2a2117a56d..3ba1e618bb3 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -45,10 +45,36 @@ static void csmt_set(BOOL status) - set_reg_key_dword(config_key, "Direct3D", "csmt", status); +@@ -42,10 +42,26 @@ static void csmt_set(BOOL status) + set_reg_key_dword(config_key, L"Direct3D", L"csmt", status); } +/* @@ -34,35 +34,25 @@ index efba152..a2b6dce 100644 + */ +static BOOL vaapi_get(void) +{ -+#ifdef HAVE_VAAPI + BOOL ret; -+ char *value = get_reg_key(config_key, keypath("DXVA2"), "backend", NULL); -+ ret = (value && !strcmp(value, "va")); ++ WCHAR *value = get_reg_key(config_key, keypath(L"DXVA2"), L"backend", NULL); ++ ret = (value && !wcscmp(value, L"va")); + HeapFree(GetProcessHeap(), 0, value); + return ret; -+#else -+ return FALSE; -+#endif +} +static void vaapi_set(BOOL status) +{ -+#ifdef HAVE_VAAPI -+ set_reg_key(config_key, keypath("DXVA2"), "backend", status ? "va" : NULL); -+#endif ++ set_reg_key(config_key, keypath(L"DXVA2"), L"backend", status ? L"va" : NULL); +} static void load_staging_settings(HWND dialog) { CheckDlgButton(dialog, IDC_ENABLE_CSMT, csmt_get() ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(dialog, IDC_ENABLE_VAAPI, vaapi_get() ? BST_CHECKED : BST_UNCHECKED); -+ -+#ifndef HAVE_VAAPI -+ disable(IDC_ENABLE_VAAPI); -+#endif } INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -78,6 +104,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -75,6 +91,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar csmt_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_CSMT) == BST_CHECKED); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); return TRUE; @@ -74,10 +64,10 @@ index efba152..a2b6dce 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 420f127..59fb0a9 100644 +index 895f68c1237..eafbdd6cd67 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -316,6 +316,7 @@ BEGIN +@@ -318,6 +318,7 @@ BEGIN GROUPBOX "Staging settings",IDC_STATIC,8,4,244,210 LTEXT "The following settings are experimental and may break stuff!\nMake sure to reset them again in case of a problem.",IDC_STATIC,16,16,230,16 CONTROL "Enable &CSMT for better graphic performance (deprecated)",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 @@ -86,5 +76,5 @@ index 420f127..59fb0a9 100644 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.7.4 +2.33.0 diff --git a/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch b/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch index 53ab2ee7..f2bbe9fe 100644 --- a/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch +++ b/patches/winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch @@ -1,7 +1,7 @@ -From 2d70cc490b1cb7049f16b7f15c29d7d2b384f090 Mon Sep 17 00:00:00 2001 +From b3d074d58d20553723ae1adb6d84b34c73f038a8 Mon Sep 17 00:00:00 2001 From: Mark Harmstone Date: Sun, 5 Apr 2015 14:16:11 +0100 -Subject: winecfg: Add checkbox to enable/disable EAX support. +Subject: [PATCH] winecfg: Add checkbox to enable/disable EAX support. --- programs/winecfg/resource.h | 1 + @@ -10,7 +10,7 @@ Subject: winecfg: Add checkbox to enable/disable EAX support. 3 files changed, 23 insertions(+) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 7b6ac54..044fc06 100644 +index 17378655db6..27841f28135 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -215,6 +215,7 @@ @@ -22,11 +22,11 @@ index 7b6ac54..044fc06 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index a2b6dce..614fabd 100644 +index 3ba1e618bb3..5742187a9ff 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -67,10 +67,27 @@ static void vaapi_set(BOOL status) - #endif +@@ -58,10 +58,27 @@ static void vaapi_set(BOOL status) + set_reg_key(config_key, keypath(L"DXVA2"), L"backend", status ? L"va" : NULL); } +/* @@ -35,14 +35,14 @@ index a2b6dce..614fabd 100644 +static BOOL eax_get(void) +{ + BOOL ret; -+ char *value = get_reg_key(config_key, keypath("DirectSound"), "EAXEnabled", "N"); ++ WCHAR *value = get_reg_key(config_key, keypath(L"DirectSound"), L"EAXEnabled", L"N"); + ret = IS_OPTION_TRUE(*value); + HeapFree(GetProcessHeap(), 0, value); + return ret; +} +static void eax_set(BOOL status) +{ -+ set_reg_key(config_key, keypath("DirectSound"), "EAXEnabled", status ? "Y" : "N"); ++ set_reg_key(config_key, keypath(L"DirectSound"), L"EAXEnabled", status ? L"Y" : L"N"); +} + static void load_staging_settings(HWND dialog) @@ -50,10 +50,10 @@ index a2b6dce..614fabd 100644 CheckDlgButton(dialog, IDC_ENABLE_CSMT, csmt_get() ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(dialog, IDC_ENABLE_VAAPI, vaapi_get() ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(dialog, IDC_ENABLE_EAX, eax_get() ? BST_CHECKED : BST_UNCHECKED); + } - #ifndef HAVE_VAAPI - disable(IDC_ENABLE_VAAPI); -@@ -108,6 +125,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar + INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +@@ -95,6 +112,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar vaapi_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_VAAPI) == BST_CHECKED); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); return TRUE; @@ -65,10 +65,10 @@ index a2b6dce..614fabd 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 59fb0a9..8226c4b 100644 +index eafbdd6cd67..2e91285c0cc 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -317,6 +317,7 @@ BEGIN +@@ -319,6 +319,7 @@ BEGIN LTEXT "The following settings are experimental and may break stuff!\nMake sure to reset them again in case of a problem.",IDC_STATIC,16,16,230,16 CONTROL "Enable &CSMT for better graphic performance (deprecated)",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 CONTROL "Enable &VAAPI as backend for DXVA2 GPU decoding",IDC_ENABLE_VAAPI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,55,230,8 @@ -77,5 +77,5 @@ index 59fb0a9..8226c4b 100644 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.7.4 +2.33.0 diff --git a/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch b/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch index 3190143d..421dc2b7 100644 --- a/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch +++ b/patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch @@ -1,7 +1,8 @@ -From a5f0de5670df2cdf3c1eb65329f1e9e55d05de17 Mon Sep 17 00:00:00 2001 +From 55896a1a320b28154196994d872b591073b08be7 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 30 May 2015 02:23:44 +0200 -Subject: winecfg: Add checkbox to enable/disable HideWineExports registry key. +Subject: [PATCH] winecfg: Add checkbox to enable/disable HideWineExports + registry key. --- programs/winecfg/resource.h | 1 + @@ -10,7 +11,7 @@ Subject: winecfg: Add checkbox to enable/disable HideWineExports registry key. 3 files changed, 24 insertions(+) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 044fc06..a1fbc69 100644 +index 27841f28135..01d31f6c8dd 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -216,6 +216,7 @@ @@ -22,11 +23,11 @@ index 044fc06..a1fbc69 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index 614fabd..c908d24 100644 +index 5742187a9ff..13d0fa2ecb0 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -83,11 +83,29 @@ static void eax_set(BOOL status) - set_reg_key(config_key, keypath("DirectSound"), "EAXEnabled", status ? "Y" : "N"); +@@ -74,11 +74,29 @@ static void eax_set(BOOL status) + set_reg_key(config_key, keypath(L"DirectSound"), L"EAXEnabled", status ? L"Y" : L"N"); } +/* @@ -35,14 +36,14 @@ index 614fabd..c908d24 100644 +static BOOL hidewine_get(void) +{ + BOOL ret; -+ char *value = get_reg_key(config_key, keypath(""), "HideWineExports", "N"); ++ WCHAR *value = get_reg_key(config_key, keypath(L""), L"HideWineExports", L"N"); + ret = IS_OPTION_TRUE(*value); + HeapFree(GetProcessHeap(), 0, value); + return ret; +} +static void hidewine_set(BOOL status) +{ -+ set_reg_key(config_key, keypath(""), "HideWineExports", status ? "Y" : "N"); ++ set_reg_key(config_key, keypath(L""), L"HideWineExports", status ? L"Y" : L"N"); +} + + @@ -52,10 +53,10 @@ index 614fabd..c908d24 100644 CheckDlgButton(dialog, IDC_ENABLE_VAAPI, vaapi_get() ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(dialog, IDC_ENABLE_EAX, eax_get() ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(dialog, IDC_ENABLE_HIDEWINE, hidewine_get() ? BST_CHECKED : BST_UNCHECKED); + } - #ifndef HAVE_VAAPI - disable(IDC_ENABLE_VAAPI); -@@ -129,6 +147,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar + INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +@@ -116,6 +134,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar eax_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_EAX) == BST_CHECKED); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); return TRUE; @@ -67,10 +68,10 @@ index 614fabd..c908d24 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 8226c4b..ce7261b 100644 +index 2e91285c0cc..ead9a54d5d2 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -318,6 +318,7 @@ BEGIN +@@ -320,6 +320,7 @@ BEGIN CONTROL "Enable &CSMT for better graphic performance (deprecated)",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 CONTROL "Enable &VAAPI as backend for DXVA2 GPU decoding",IDC_ENABLE_VAAPI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,55,230,8 CONTROL "Enable Environmental Audio E&xtensions (EAX)",IDC_ENABLE_EAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,70,230,8 @@ -79,5 +80,5 @@ index 8226c4b..ce7261b 100644 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.7.4 +2.33.0 diff --git a/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch b/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch index d9bbfba5..e4d85ca8 100644 --- a/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch +++ b/patches/winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch @@ -1,19 +1,19 @@ -From 2df5e371cbad9ca066479ac5f169a8d77cbdfbe1 Mon Sep 17 00:00:00 2001 +From 99b2ab3b3885000f3669de87a5298f7e2a221ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 9 Aug 2015 18:01:11 +0200 -Subject: winecfg: Add option to enable/disable GTK3 theming. +Subject: [PATCH] winecfg: Add option to enable/disable GTK3 theming. --- programs/winecfg/resource.h | 1 + - programs/winecfg/staging.c | 29 +++++++++++++++++++++++++++++ + programs/winecfg/staging.c | 20 ++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 + - 3 files changed, 31 insertions(+) + 3 files changed, 22 insertions(+) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index f8c2fdf8b..96f242909 100644 +index 01d31f6c8dd..d77f6a23a5a 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -218,6 +218,7 @@ +@@ -217,6 +217,7 @@ #define IDC_ENABLE_VAAPI 9002 #define IDC_ENABLE_EAX 9003 #define IDC_ENABLE_HIDEWINE 9004 @@ -22,11 +22,11 @@ index f8c2fdf8b..96f242909 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index 2e305a2c1..e703a6559 100644 +index 13d0fa2ecb0..56dbda33cc9 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -99,6 +99,27 @@ static void hidewine_set(BOOL status) - set_reg_key(config_key, keypath(""), "HideWineExports", status ? "Y" : "N"); +@@ -90,6 +90,21 @@ static void hidewine_set(BOOL status) + set_reg_key(config_key, keypath(L""), L"HideWineExports", status ? L"Y" : L"N"); } +/* @@ -34,41 +34,28 @@ index 2e305a2c1..e703a6559 100644 + */ +static BOOL gtk3_get(void) +{ -+#if defined(HAVE_GTK_GTK_H) && defined(SONAME_LIBGTK_3) + BOOL ret; -+ char *value = get_reg_key(config_key, keypath(""), "ThemeEngine", NULL); -+ ret = (value && !strcasecmp(value, "GTK")); ++ WCHAR *value = get_reg_key(config_key, keypath(L""), L"ThemeEngine", NULL); ++ ret = (value && !wcsicmp(value, L"GTK")); + HeapFree(GetProcessHeap(), 0, value); + return ret; -+#else -+ return FALSE; -+#endif +} +static void gtk3_set(BOOL status) +{ -+#if defined(HAVE_GTK_GTK_H) && defined(SONAME_LIBGTK_3) -+ set_reg_key(config_key, keypath(""), "ThemeEngine", status ? "GTK" : NULL); -+#endif ++ set_reg_key(config_key, keypath(L""), L"ThemeEngine", status ? L"GTK" : NULL); +} static void load_staging_settings(HWND dialog) { -@@ -106,10 +127,14 @@ static void load_staging_settings(HWND dialog) +@@ -97,6 +112,7 @@ static void load_staging_settings(HWND dialog) CheckDlgButton(dialog, IDC_ENABLE_VAAPI, vaapi_get() ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(dialog, IDC_ENABLE_EAX, eax_get() ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(dialog, IDC_ENABLE_HIDEWINE, hidewine_get() ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(dialog, IDC_ENABLE_GTK3, gtk3_get() ? BST_CHECKED : BST_UNCHECKED); - - #ifndef HAVE_VAAPI - disable(IDC_ENABLE_VAAPI); - #endif -+#if !defined(HAVE_GTK_GTK_H) || !defined(SONAME_LIBGTK_3) -+ disable(IDC_ENABLE_GTK3); -+#endif } INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -151,6 +176,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -138,6 +154,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar hidewine_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_HIDEWINE) == BST_CHECKED); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); return TRUE; @@ -80,10 +67,10 @@ index 2e305a2c1..e703a6559 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index ce18e5bc4..332520b15 100644 +index ead9a54d5d2..738c4702aa3 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -323,6 +323,7 @@ BEGIN +@@ -321,6 +321,7 @@ BEGIN CONTROL "Enable &VAAPI as backend for DXVA2 GPU decoding",IDC_ENABLE_VAAPI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,55,230,8 CONTROL "Enable Environmental Audio E&xtensions (EAX)",IDC_ENABLE_EAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,70,230,8 CONTROL "&Hide Wine version from applications",IDC_ENABLE_HIDEWINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,85,230,8 @@ -92,5 +79,5 @@ index ce18e5bc4..332520b15 100644 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.23.0 +2.33.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index a84f7cb4..0aa03579 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -8b9f1e12841298591387e2b7590191610a37986e +63737942a06183f6b2e7fa8f95a07c918c9bf29b