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

Browse Source 
[makefiles-Revert_libwine_Import]
Disabled patch, the problem should be fixed in the development branch.
This commit is contained in:
Sebastian Lackner
2016-03-29 02:43:56 +02:00
parent 0a391faaba
commit c43b0d8ac0
7 changed files with 20 additions and 78 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 3c9eab9f6e96d05a6e5ca0f82d6b52a07092c526 Mon Sep 17 00:00:00 2001
From d88860b3dd92769f14c45c92f9640ee4a9e8efe8 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.
@@ -14,7 +14,7 @@ Subject: 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 4e66e04..1cf7031 100644
index 7b52a69..c86fdd0 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -11,6 +11,7 @@ C_SRCS = \
@@ -26,10 +26,10 @@ index 4e66e04..1cf7031 100644
winecfg.c \
x11drvdlg.c
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 6ac5f89..17909dc 100644
index b8a85fe..de209a9 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -60,7 +60,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
return 0;
}
@@ -38,7 +38,7 @@ index 6ac5f89..17909dc 100644
static INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -141,6 +141,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -139,6 +139,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
psp[pg].lParam = 0;
pg++;
@@ -56,7 +56,7 @@ index 6ac5f89..17909dc 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 fffc4da..7d11050 100644
index 0c0b038..54c67c2 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -45,6 +45,7 @@
@@ -75,8 +75,8 @@ index fffc4da..7d11050 100644
#define IDC_WINVER 1012
#define IDC_DESKTOP_WIDTH 1023
#define IDC_DESKTOP_HEIGHT 1024
@@ -202,6 +204,9 @@
#define IDC_SYSPARAMS_MENU_HILIGHT 8430
@@ -210,6 +212,9 @@
#define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430
#define IDC_SYSPARAMS_MENUBAR 8431
+/* Staging tab */
@@ -193,7 +193,7 @@ index 110856a..a949474 100644
/* Drive management */
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 9f763a7..ad3e842 100644
index 72c3e1b..dedc039 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -39,6 +39,7 @@ BEGIN
@@ -204,7 +204,7 @@ index 9f763a7..ad3e842 100644
IDS_TAB_ABOUT "About"
IDS_WINECFG_TITLE "Wine configuration"
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
@@ -297,6 +298,15 @@ BEGIN
@@ -308,6 +309,15 @@ BEGIN
PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
END
@@ -221,5 +221,5 @@ index 9f763a7..ad3e842 100644
/* @makedep: winecfg.ico */
--
2.2.1
2.7.1