wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a compile failure and add a missing file.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-05-30 05:29:19 +02:00
parent f576613dd2
commit b942798ef9
2 changed files with 98 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch
View File

@ -1,4 +1,4 @@
From 5716cf425f78feb8d4f439488a36b4a3339c301e Mon Sep 17 00:00:00 2001
From da9189ba123a8e95c62059a507feb4cf4900fd49 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 30 Mar 2015 12:50:21 +0200
Subject: server: Temporarily store the full security descriptor for file
@ -7,9 +7,9 @@ Subject: server: Temporarily store the full security descriptor for file
---
dlls/advapi32/tests/security.c | 15 +++----
server/change.c | 8 +++-
server/file.c | 88 ++++++++++++++++++++++++++++--------------
server/file.c | 90 ++++++++++++++++++++++++++++--------------
server/file.h | 3 +-
4 files changed, 74 insertions(+), 40 deletions(-)
4 files changed, 75 insertions(+), 41 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 40cf23c..57adc4e 100644
@ -95,7 +95,7 @@ index b334fd1..2e98f5c 100644
return &dir->obj;
diff --git a/server/file.c b/server/file.c
index 729ef87..1daef88 100644
index 53f6e10..f8b4611 100644
--- a/server/file.c
+++ b/server/file.c
@@ -172,7 +172,8 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne
@ -227,6 +227,15 @@ index 729ef87..1daef88 100644
}
static struct object *file_open_file( struct object *obj, unsigned int access,
@@ -615,7 +642,7 @@ static struct object *file_open_file( struct object *obj, unsigned int access,
if ((new_fd = dup_fd_object( file->fd, access, sharing, options )))
{
- new_file = create_file_obj( new_fd, access, file->mode );
+ new_file = create_file_obj( new_fd, access, file->mode, NULL );
release_object( new_fd );
}
@@ -732,7 +759,10 @@ DECL_HANDLER(create_file)
if ((file = create_file( root_fd, name, name_len, req->access, req->sharing,
req->create, req->options, req->attrs, sd )))
@ -240,10 +249,10 @@ index 729ef87..1daef88 100644
}
if (root_fd) release_object( root_fd );
diff --git a/server/file.h b/server/file.h
index 740a36f..5619bba 100644
index e26be80..d002b0d 100644
--- a/server/file.h
+++ b/server/file.h
@@ -154,7 +154,8 @@ extern struct device *create_unix_device( struct directory *root, const struct u
@@ -153,7 +153,8 @@ extern struct device *create_unix_device( struct directory *root, const struct u
extern void do_change_notify( int unix_fd );
extern void sigio_callback(void);

83
patches/winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch Normal file
View File

@ -0,0 +1,83 @@
From 0564f9aed4bdb5b80d9b13be2fe38d963234f06a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 May 2015 02:23:44 +0200
Subject: winecfg: Add checkbox to enable/disable HideWineExports registry key.
---
programs/winecfg/resource.h | 1 +
programs/winecfg/staging.c | 22 ++++++++++++++++++++++
programs/winecfg/winecfg.rc | 1 +
3 files changed, 24 insertions(+)
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 4f5a93e..57ebe9d 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -216,6 +216,7 @@
#define IDC_ENABLE_CSMT 9001
#define IDC_ENABLE_VAAPI 9002
#define IDC_ENABLE_EAX 9003
+#define IDC_ENABLE_HIDEWINE 9004
/* About tab */
#define IDC_ABT_OWNER 8432
diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
index 5a4dd16..903ce7e 100644
--- a/programs/winecfg/staging.c
+++ b/programs/winecfg/staging.c
@@ -87,11 +87,29 @@ static void eax_set(BOOL status)
set_reg_key(config_key, keypath("DirectSound"), "EAXEnabled", status ? "Y" : "N");
}
+/*
+ * Hide Wine exports from applications
+ */
+static BOOL hidewine_get(void)
+{
+ BOOL ret;
+ char *value = get_reg_key(config_key, keypath(""), "HideWineExports", "N");
+ ret = IS_OPTION_TRUE(*value);
+ HeapFree(GetProcessHeap(), 0, value);
+ return ret;
+}
+static void hidewine_set(BOOL status)
+{
+ set_reg_key(config_key, keypath(""), "HideWineExports", status ? "Y" : "N");
+}
+
+
static void load_staging_settings(HWND dialog)
{
CheckDlgButton(dialog, IDC_ENABLE_CSMT, csmt_get() ? BST_CHECKED : BST_UNCHECKED);
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);
#ifndef HAVE_VAAPI
disable(IDC_ENABLE_VAAPI);
@@ -133,6 +151,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;
+ case IDC_ENABLE_HIDEWINE:
+ hidewine_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_HIDEWINE) == BST_CHECKED);
+ SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0);
+ return TRUE;
}
break;
}
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 0855074..c2d106c 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 &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
END
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
--
2.4.2