Rebase against 2b0977fc711e1faadfef69e3a46c2d1848b4826b.

patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch

@@ -1,21 +1,20 @@
-From 3b8bf542a9775e4fdb0b1b1ecc6772d9749fed4c Mon Sep 17 00:00:00 2001
+From c4de4777e66d9fbe7a21e8e68c2839ef8db07bee Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 14 Dec 2014 20:42:45 +0100
-Subject: winecfg: Add staging tab for CSMT.
+Subject: [PATCH] winecfg: Add staging tab for CSMT.
 
 ---
  programs/winecfg/Makefile.in |  1 +
- programs/winecfg/about.c     |  2 +-
- programs/winecfg/main.c      | 12 ++++++-
+ programs/winecfg/main.c      | 12 ++++-
  programs/winecfg/resource.h  |  5 +++
- programs/winecfg/staging.c   | 85 ++++++++++++++++++++++++++++++++++++++++++++
+ programs/winecfg/staging.c   | 85 ++++++++++++++++++++++++++++++++++++
  programs/winecfg/winecfg.h   |  1 +
- programs/winecfg/winecfg.rc  | 10 ++++++
- 7 files changed, 114 insertions(+), 2 deletions(-)
+ programs/winecfg/winecfg.rc  | 10 +++++
+ 6 files changed, 113 insertions(+), 1 deletion(-)
  create mode 100644 programs/winecfg/staging.c
 
 diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
-index d516778..dd84730 100644
+index 4e66e04e31a..1cf70310d57 100644
 --- a/programs/winecfg/Makefile.in
 +++ b/programs/winecfg/Makefile.in
 @@ -11,6 +11,7 @@ C_SRCS = \
@@ -26,21 +25,8 @@ index d516778..dd84730 100644
  	theme.c \
  	winecfg.c \
  	x11drvdlg.c
-diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c
-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)
-             SendMessageW(hWnd, WM_SETFONT, (WPARAM)titleFont, TRUE);
-             SetWindowTextA(hWnd, PACKAGE_NAME);
-         }
--        SetDlgItemTextA(hDlg, IDC_ABT_PANEL_TEXT, PACKAGE_VERSION);
-+        SetDlgItemTextA(hDlg, IDC_ABT_PANEL_TEXT, PACKAGE_VERSION " (Staging)");
- 
-         /* prepare the web link */
-         SetDlgItemTextA(hDlg, IDC_ABT_WEB_LINK, "<a href=\"" PACKAGE_URL "\">" PACKAGE_URL "</a>");
 diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
-index b8a85fe..de209a9 100644
+index b8a85fe7175..de209a925cc 100644
 --- a/programs/winecfg/main.c
 +++ b/programs/winecfg/main.c
 @@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -70,7 +56,7 @@ index b8a85fe..de209a9 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 0c0b038..54c67c2 100644
+index 2760e92c000..fe98287e241 100644
 --- a/programs/winecfg/resource.h
 +++ b/programs/winecfg/resource.h
 @@ -45,6 +45,7 @@
@@ -89,7 +75,7 @@ index 0c0b038..54c67c2 100644
  #define IDC_WINVER                      1012
  #define IDC_DESKTOP_WIDTH               1023
  #define IDC_DESKTOP_HEIGHT              1024
-@@ -210,6 +212,9 @@
+@@ -211,6 +213,9 @@
  #define IDC_SYSPARAMS_MENU_HIGHLIGHT    8430
  #define IDC_SYSPARAMS_MENUBAR           8431
  
@@ -101,7 +87,7 @@ index 0c0b038..54c67c2 100644
  #define IDC_ABT_ORG                  8433
 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
 new file mode 100644
-index 0000000..f5ab259
+index 00000000000..f5ab2594a22
 --- /dev/null
 +++ b/programs/winecfg/staging.c
 @@ -0,0 +1,85 @@
@@ -191,7 +177,7 @@ index 0000000..f5ab259
 +    return FALSE;
 +}
 diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
-index 110856a..a949474 100644
+index 110856a5365..a94947439c3 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)
@@ -203,10 +189,10 @@ index 110856a..a949474 100644
  
  /* Drive management  */
 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
-index 5908b49..420f127 100644
+index f2f795f5278..ecf6fa432c2 100644
 --- a/programs/winecfg/winecfg.rc
 +++ b/programs/winecfg/winecfg.rc
-@@ -39,6 +39,7 @@ BEGIN
+@@ -38,6 +38,7 @@ BEGIN
      IDS_TAB_GRAPHICS        "Graphics"
      IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration"
      IDS_TAB_AUDIO           "Audio"
@@ -214,7 +200,7 @@ index 5908b49..420f127 100644
      IDS_TAB_ABOUT           "About"
      IDS_WINECFG_TITLE       "Wine configuration"
      IDS_WINECFG_TITLE_APP   "Wine configuration for %s"
-@@ -308,6 +309,15 @@ BEGIN
+@@ -311,6 +312,15 @@ BEGIN
      PUSHBUTTON      "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
  END
  
@@ -231,5 +217,5 @@ index 5908b49..420f127 100644
  
  /* @makedep: winecfg.ico */
 -- 
-2.7.4
+2.26.0