wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 59987bc9ecdd0dbafd768a95c21a14884bc77c07

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-04-18 14:54:07 +10:00
parent 8d4d0a840e
commit 029c249e78
8 changed files with 70 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From c4de4777e66d9fbe7a21e8e68c2839ef8db07bee Mon Sep 17 00:00:00 2001
From bf564ac0eee8525ab28e78552dd54e633607230f 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: [PATCH] winecfg: Add staging tab for CSMT.
@@ -14,10 +14,10 @@ Subject: [PATCH] winecfg: Add staging tab for CSMT.
create mode 100644 programs/winecfg/staging.c
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 4e66e04e31a..1cf70310d57 100644
index a2746f7d4ac..2172dac2169 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -11,6 +11,7 @@ C_SRCS = \
@@ -10,6 +10,7 @@ C_SRCS = \
driveui.c \
libraries.c \
main.c \
@@ -26,7 +26,7 @@ index 4e66e04e31a..1cf70310d57 100644
winecfg.c \
x11drvdlg.c
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index b8a85fe7175..de209a925cc 100644
index 735ac02299f..3d7d740883f 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -56,7 +56,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 2760e92c000..fe98287e241 100644
index dd46bc71b40..582c5c967e4 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -45,6 +45,7 @@
@@ -75,7 +75,7 @@ index 2760e92c000..fe98287e241 100644
#define IDC_WINVER 1012
#define IDC_DESKTOP_WIDTH 1023
#define IDC_DESKTOP_HEIGHT 1024
@@ -211,6 +213,9 @@
@@ -210,6 +212,9 @@
#define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430
#define IDC_SYSPARAMS_MENUBAR 8431
@@ -177,7 +177,7 @@ index 00000000000..f5ab2594a22
+ return FALSE;
+}
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index 110856a5365..a94947439c3 100644
index 9dd39c51c3f..9279d42ea98 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)
@@ -187,9 +187,9 @@ index 110856a5365..a94947439c3 100644
+INT_PTR CALLBACK StagingDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* Drive management */
/* Windows version management */
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index f2f795f5278..ecf6fa432c2 100644
index 1faa0a60b55..895f68c1237 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -38,6 +38,7 @@ BEGIN
@@ -200,7 +200,7 @@ index f2f795f5278..ecf6fa432c2 100644
IDS_TAB_ABOUT "About"
IDS_WINECFG_TITLE "Wine configuration"
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
@@ -311,6 +312,15 @@ BEGIN
@@ -310,6 +311,15 @@ BEGIN
PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
END
@@ -217,5 +217,5 @@ index f2f795f5278..ecf6fa432c2 100644
/* @makedep: winecfg.ico */
--
2.26.0
2.25.1