From 6e3fbe28e1c51d1906624aabbfd3e7724790304c Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sun, 1 Apr 2018 17:22:59 -0500 Subject: [PATCH] winecfg-Staging: Fix CSMT checkbox. Now toggles the upstream csmt registry value. --- patches/patchinstall.sh | 2 +- ...001-winecfg-Add-staging-tab-for-CSMT.patch | 35 +++++++++---------- ...kbox-to-enable-disable-vaapi-GPU-dec.patch | 22 ++++++------ ...eckbox-to-enable-disable-EAX-support.patch | 20 +++++------ ...kbox-to-enable-disable-HideWineExpor.patch | 16 ++++----- ...ption-to-enable-disable-GTK3-theming.patch | 16 ++++----- staging/VERSION | 2 +- 7 files changed, 56 insertions(+), 57 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1f5b01ed..60fcec3c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -58,7 +58,7 @@ upstream_commit() # Show version information version() { - echo "Wine Staging 3.5" + echo "Wine Staging 3.6 (Unreleased)" echo "Copyright (C) 2014-2018 the Wine Staging project authors." echo "Copyright (C) 2018 Alistair Leslie-Hughes" echo "" 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 8e3209b7..8dc56aa5 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,4 +1,4 @@ -From 904bdc3642145764bc8f549ca901c891bda1df14 Mon Sep 17 00:00:00 2001 +From af5d9896a3bdf9f4dc8a32c81345674c83e307cc 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: winecfg: Add staging tab for CSMT. @@ -8,14 +8,14 @@ Subject: winecfg: Add staging tab for CSMT. programs/winecfg/about.c | 2 +- programs/winecfg/main.c | 12 ++++++- programs/winecfg/resource.h | 5 +++ - programs/winecfg/staging.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ + programs/winecfg/staging.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.h | 1 + programs/winecfg/winecfg.rc | 10 ++++++ - 7 files changed, 115 insertions(+), 2 deletions(-) + 7 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 programs/winecfg/staging.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in -index 7b52a6943e4..c86fdd07d0e 100644 +index d516778..dd84730 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ @@ -27,7 +27,7 @@ index 7b52a6943e4..c86fdd07d0e 100644 winecfg.c \ x11drvdlg.c diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c -index 09cc0151574..a5251915533 100644 +index a2b4022..a706db7 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -118,7 +118,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -40,7 +40,7 @@ index 09cc0151574..a5251915533 100644 /* prepare the web link */ SetDlgItemTextA(hDlg, IDC_ABT_WEB_LINK, "" PACKAGE_URL ""); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c -index b8a85fe7175..de209a925cc 100644 +index b8a85fe..de209a9 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) @@ -70,7 +70,7 @@ index b8a85fe7175..de209a925cc 100644 * Fill out the (General) PROPSHEETPAGE data structure * for the property sheet diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 0c0b038ff9d..54c67c27276 100644 +index 0c0b038..54c67c2 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -45,6 +45,7 @@ @@ -101,10 +101,10 @@ index 0c0b038ff9d..54c67c27276 100644 #define IDC_ABT_ORG 8433 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c new file mode 100644 -index 00000000000..0aed083938e +index 0000000..efba152 --- /dev/null +++ b/programs/winecfg/staging.c -@@ -0,0 +1,86 @@ +@@ -0,0 +1,85 @@ +/* + * WineCfg Staging panel + * @@ -142,15 +142,14 @@ index 00000000000..0aed083938e + */ +static BOOL csmt_get(void) +{ -+ BOOL ret; -+ char *value = get_reg_key(config_key, keypath("DllRedirects"), "wined3d", NULL); -+ ret = (value && !strcmp(value, "wined3d-csmt.dll")); -+ HeapFree(GetProcessHeap(), 0, value); ++ WCHAR *buf = get_reg_key(config_key, "Direct3D", "csmt", NULL); ++ BOOL ret = buf ? !!*buf : TRUE; ++ HeapFree(GetProcessHeap(), 0, buf); + return ret; +} +static void csmt_set(BOOL status) +{ -+ set_reg_key(config_key, keypath("DllRedirects"), "wined3d", status ? "wined3d-csmt.dll" : NULL); ++ set_reg_key_dword(config_key, "Direct3D", "csmt", status); +} + + @@ -192,7 +191,7 @@ index 00000000000..0aed083938e + return FALSE; +} diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h -index 110856a5365..a94947439c3 100644 +index 110856a..a949474 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) @@ -204,7 +203,7 @@ index 110856a5365..a94947439c3 100644 /* Drive management */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 72c3e1ba01b..dedc039023b 100644 +index 5908b49..420f127 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -39,6 +39,7 @@ BEGIN @@ -225,12 +224,12 @@ index 72c3e1ba01b..dedc039023b 100644 +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",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 ++ CONTROL "Enable &CSMT for better graphic performance (deprecated)",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 +END + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: winecfg.ico */ -- -2.11.0 +2.7.4 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 d8c98df2..24ca4984 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,4 +1,4 @@ -From f54357a1e2246b37b1f69938d2c4f0ed7ee8822d Mon Sep 17 00:00:00 2001 +From 2c0e38e44cb592d67eee581cd78428d784a24f40 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. @@ -10,10 +10,10 @@ Subject: winecfg: Add checkbox to enable/disable vaapi GPU decoder. 3 files changed, 32 insertions(+) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 02d90fd..4b21d16 100644 +index 54c67c2..7b6ac54 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -212,6 +212,7 @@ +@@ -214,6 +214,7 @@ /* Staging tab */ #define IDC_ENABLE_CSMT 9001 @@ -22,11 +22,11 @@ index 02d90fd..4b21d16 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index 09c0d3f..40b6642 100644 +index efba152..a2b6dce 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -49,10 +49,36 @@ static void csmt_set(BOOL status) - set_reg_key(config_key, keypath("DllRedirects"), "wined3d", status ? "wined3d-csmt.dll" : NULL); +@@ -45,10 +45,36 @@ static void csmt_set(BOOL status) + set_reg_key_dword(config_key, "Direct3D", "csmt", status); } +/* @@ -62,7 +62,7 @@ index 09c0d3f..40b6642 100644 } INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -82,6 +108,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -78,6 +104,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,17 +74,17 @@ index 09c0d3f..40b6642 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 5ceed16..171672d 100644 +index 420f127..59fb0a9 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -314,6 +314,7 @@ BEGIN +@@ -316,6 +316,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",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 + 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 END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.3.5 +2.7.4 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 321f7c0b..53ab2ee7 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,4 +1,4 @@ -From 9732684163cf035ea9fca8ac8700562159150190 Mon Sep 17 00:00:00 2001 +From 2d70cc490b1cb7049f16b7f15c29d7d2b384f090 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. @@ -10,10 +10,10 @@ 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 4b21d16..a78d9af 100644 +index 7b6ac54..044fc06 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -213,6 +213,7 @@ +@@ -215,6 +215,7 @@ /* Staging tab */ #define IDC_ENABLE_CSMT 9001 #define IDC_ENABLE_VAAPI 9002 @@ -22,10 +22,10 @@ index 4b21d16..a78d9af 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index 40b6642..5a4dd16 100644 +index a2b6dce..614fabd 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -71,10 +71,27 @@ static void vaapi_set(BOOL status) +@@ -67,10 +67,27 @@ static void vaapi_set(BOOL status) #endif } @@ -53,7 +53,7 @@ index 40b6642..5a4dd16 100644 #ifndef HAVE_VAAPI disable(IDC_ENABLE_VAAPI); -@@ -112,6 +129,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -108,6 +125,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,17 +65,17 @@ index 40b6642..5a4dd16 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 171672d..0f1af19 100644 +index 59fb0a9..8226c4b 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -315,6 +315,7 @@ BEGIN +@@ -317,6 +317,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",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 + 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 END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.3.5 +2.7.4 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 92b536e6..3190143d 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,4 +1,4 @@ -From 0564f9aed4bdb5b80d9b13be2fe38d963234f06a Mon Sep 17 00:00:00 2001 +From a5f0de5670df2cdf3c1eb65329f1e9e55d05de17 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. @@ -10,7 +10,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 4f5a93e..57ebe9d 100644 +index 044fc06..a1fbc69 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -216,6 +216,7 @@ @@ -22,10 +22,10 @@ index 4f5a93e..57ebe9d 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index 5a4dd16..903ce7e 100644 +index 614fabd..c908d24 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -87,11 +87,29 @@ static void eax_set(BOOL status) +@@ -83,11 +83,29 @@ static void eax_set(BOOL status) set_reg_key(config_key, keypath("DirectSound"), "EAXEnabled", status ? "Y" : "N"); } @@ -55,7 +55,7 @@ index 5a4dd16..903ce7e 100644 #ifndef HAVE_VAAPI disable(IDC_ENABLE_VAAPI); -@@ -133,6 +151,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -129,6 +147,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,11 +67,11 @@ index 5a4dd16..903ce7e 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 0855074..c2d106c 100644 +index 8226c4b..ce7261b 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -318,6 +318,7 @@ BEGIN - CONTROL "Enable &CSMT for better graphic performance",IDC_ENABLE_CSMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,40,230,8 + 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 + CONTROL "&Hide Wine version from applications",IDC_ENABLE_HIDEWINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,85,230,8 @@ -79,5 +79,5 @@ index 0855074..c2d106c 100644 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.4.2 +2.7.4 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 3185c6b6..fb729601 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,4 +1,4 @@ -From 34a7ed1ea779a9f8c1f6fe61b26ba985c495737b Mon Sep 17 00:00:00 2001 +From 179cacadcf7f5e0fbaff2e61dbf009593e4257e8 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. @@ -10,7 +10,7 @@ Subject: winecfg: Add option to enable/disable GTK3 theming. 3 files changed, 31 insertions(+) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 57ebe9d..bf3b884 100644 +index a1fbc69..b94e773 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -217,6 +217,7 @@ @@ -22,10 +22,10 @@ index 57ebe9d..bf3b884 100644 /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index 903ce7e..81a4e24 100644 +index c908d24..5a978d6 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c -@@ -103,6 +103,27 @@ static void hidewine_set(BOOL status) +@@ -99,6 +99,27 @@ static void hidewine_set(BOOL status) set_reg_key(config_key, keypath(""), "HideWineExports", status ? "Y" : "N"); } @@ -53,7 +53,7 @@ index 903ce7e..81a4e24 100644 static void load_staging_settings(HWND dialog) { -@@ -110,10 +131,14 @@ static void load_staging_settings(HWND dialog) +@@ -106,10 +127,14 @@ 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); @@ -68,7 +68,7 @@ index 903ce7e..81a4e24 100644 } INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -155,6 +180,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -151,6 +176,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,7 +80,7 @@ index 903ce7e..81a4e24 100644 break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index c2d106c..a9c62ae 100644 +index ce7261b..f838a04 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -319,6 +319,7 @@ BEGIN @@ -92,5 +92,5 @@ index c2d106c..a9c62ae 100644 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.5.0 +2.7.4 diff --git a/staging/VERSION b/staging/VERSION index 51e80238..e7b8d094 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 3.5 +Wine Staging 3.6 (Unreleased)