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 de66ea9df6746917cada71d2c27b5cc38cbdd2f0.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2023-10-17 10:12:05 +11:00
parent 3dcd383186
commit 7d2672183d
6 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b6d9ed56703d771d5e2083cc30a55714a0166a96 Mon Sep 17 00:00:00 2001
From e9a0e31aa2a7f70fe4074f13e6b69e0d440ea469 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,22 +14,22 @@ 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 f2f74cb77ea..8beaa7e8584 100644
index 780f0e7e183..99c829a9468 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -12,6 +12,7 @@ C_SRCS = \
driveui.c \
@@ -12,6 +12,7 @@ SOURCES = \
libraries.c \
logo.svg \
main.c \
+ staging.c \
theme.c \
winecfg.c \
x11drvdlg.c
winecfg.man.in \
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 77b732d6819..b467a6f1c8f 100644
index d218d79770c..de5340c721f 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -57,7 +57,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
return 0;
}
@@ -38,7 +38,7 @@ index 77b732d6819..b467a6f1c8f 100644
static INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -139,6 +139,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -138,6 +138,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
psp[pg].lParam = 0;
pg++;
@@ -56,7 +56,7 @@ index 77b732d6819..b467a6f1c8f 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 dd46bc71b40..582c5c967e4 100644
index cd7eaaf711e..f9f71adfcf6 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -45,6 +45,7 @@
@@ -75,7 +75,7 @@ index dd46bc71b40..582c5c967e4 100644
#define IDC_WINVER 1012
#define IDC_DESKTOP_WIDTH 1023
#define IDC_DESKTOP_HEIGHT 1024
@@ -210,6 +212,9 @@
@@ -213,6 +215,9 @@
#define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430
#define IDC_SYSPARAMS_MENUBAR 8431
@@ -87,7 +87,7 @@ 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..a2a2117a56d
index 00000000000..0bd6e1741a7
--- /dev/null
+++ b/programs/winecfg/staging.c
@@ -0,0 +1,82 @@
@@ -174,10 +174,10 @@ index 00000000000..a2a2117a56d
+ return FALSE;
+}
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index 29751bf4555..a5f0e92beb6 100644
index f3f3ad2addf..d4fedff5afb 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
@@ -83,6 +83,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -85,6 +85,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);
@@ -186,7 +186,7 @@ index 29751bf4555..a5f0e92beb6 100644
/* Windows version management */
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 1faa0a60b55..895f68c1237 100644
index 982e7dd262a..ef41bf45921 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -38,6 +38,7 @@ BEGIN
@@ -197,7 +197,7 @@ index 1faa0a60b55..895f68c1237 100644
IDS_TAB_ABOUT "About"
IDS_WINECFG_TITLE "Wine configuration"
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
@@ -310,6 +311,15 @@ BEGIN
@@ -318,6 +319,15 @@ BEGIN
PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
END
@@ -214,5 +214,5 @@ index 1faa0a60b55..895f68c1237 100644
/* @makedep: winecfg.ico */
--
2.33.0
2.42.0