wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e918c6fd8b426e8298eca5951d917960e4236d95.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-03-03 05:40:34 +01:00
parent 04a8307d45
commit 88c85f01c3
6 changed files with 22 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
patches/comctl32-PROPSHEET_InsertPage/0003-comctl32-Add-support-for-PSPCB_ADDREF-PSPCB_RELEASE-.patch
View File

@ -1,47 +0,0 @@
From a9fb17a4b519b6ca814cd9402531a1ca860634f1 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 10 Feb 2017 00:34:37 +0800
Subject: comctl32: Add support for PSPCB_ADDREF/PSPCB_RELEASE callback
notifications. (v2)
---
dlls/comctl32/propsheet.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index a3a6a5c4df8..4c4ca82a572 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -3013,6 +3013,9 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
else
ppsp->pszHeaderSubTitle = NULL;
+ if ((ppsp->dwFlags & PSH_USECALLBACK) && ppsp->pfnCallback)
+ ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp);
+
return (HPROPSHEETPAGE)ppsp;
}
@@ -3059,6 +3062,9 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage
else
ppsp->pszHeaderSubTitle = NULL;
+ if ((ppsp->dwFlags & PSH_USECALLBACK) && ppsp->pfnCallback)
+ ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp);
+
return (HPROPSHEETPAGE)ppsp;
}
@@ -3080,6 +3086,9 @@ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage)
if (!psp)
return FALSE;
+ if ((psp->dwFlags & PSH_USECALLBACK) && psp->pfnCallback)
+ psp->pfnCallback(0, PSPCB_RELEASE, psp);
+
if (!(psp->dwFlags & PSP_DLGINDIRECT) && !IS_INTRESOURCE( psp->u.pszTemplate ))
Free ((LPVOID)psp->u.pszTemplate);
--
2.11.0

1
patches/comctl32-PROPSHEET_InsertPage/definition
View File

@ -1 +0,0 @@
Fixes: Add support for PSPCB_ADDREF/PSPCB_RELEASE callback notifications

16
patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch
View File

@ -1,4 +1,4 @@
From 7c4549646538a8643b4b269af12691a49cbf59be Mon Sep 17 00:00:00 2001
From 1b04ab2a2725ab5f5f4afafbc4c0ea05b15368af Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 16 Jan 2014 20:56:49 -0700
Subject: ntdll: Add support for junction point creation.
@ -12,7 +12,7 @@ Subject: ntdll: Add support for junction point creation.
create mode 100644 include/ntifs.h
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 210c8e385d9..79a85044fb8 100644
index b3f4f234107..51a623d1eea 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -108,12 +108,14 @@
@ -139,7 +139,7 @@ index 210c8e385d9..79a85044fb8 100644
default:
status = server_ioctl_file( handle, event, apc, apc_context, io, code,
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index c523bcfe0ab..08150850c76 100644
index ba28782107d..07328b62414 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -37,6 +37,7 @@
@ -150,7 +150,7 @@ index c523bcfe0ab..08150850c76 100644
#ifndef IO_COMPLETION_ALL_ACCESS
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
@@ -4494,6 +4495,98 @@ static void test_query_ea(void)
@@ -4534,6 +4535,98 @@ static void test_query_ea(void)
#undef EA_BUFFER_SIZE
}
@ -249,17 +249,17 @@ index c523bcfe0ab..08150850c76 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4557,4 +4650,5 @@ START_TEST(file)
test_query_attribute_information_file();
@@ -4599,4 +4692,5 @@ START_TEST(file)
test_ioctl();
test_flush_buffers_file();
test_query_ea();
+ test_junction_points();
}
diff --git a/include/Makefile.in b/include/Makefile.in
index 80fa362a160..c4bf4b21ad4 100644
index 4fbfd16bf58..7d64aafcab3 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -521,6 +521,7 @@ HEADER_SRCS = \
@@ -522,6 +522,7 @@ HEADER_SRCS = \
ntddstor.h \
ntdef.h \
ntdsapi.h \

22
patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch
View File

@ -1,4 +1,4 @@
From edebe1491e64c5bbb8a148486233bdee9fbfcd59 Mon Sep 17 00:00:00 2001
From 02bef2f484ca326c8e99db32f0882cefe886fb4b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 6 Jun 2015 07:03:33 +0800
Subject: ntdll: Improve stub of NtQueryEaFile.
@ -10,7 +10,7 @@ Based on a patch by Qian Hong.
2 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index fc72833e1a4..210c8e385d9 100644
index cfc85e5dd05..b3f4f234107 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3397,14 +3397,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
@ -44,19 +44,19 @@ index fc72833e1a4..210c8e385d9 100644
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 0c056ce4e28..c523bcfe0ab 100644
index dd8830c9ce1..ba28782107d 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -80,6 +80,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN);
@@ -81,6 +81,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS);
static NTSTATUS (WINAPI *pNtQueryFullAttributesFile)(const OBJECT_ATTRIBUTES*, FILE_NETWORK_OPEN_INFORMATION*);
static NTSTATUS (WINAPI *pNtFlushBuffersFile)(HANDLE, IO_STATUS_BLOCK*);
+static NTSTATUS (WINAPI *pNtQueryEaFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PULONG,BOOLEAN);
static inline BOOL is_signaled( HANDLE obj )
{
@@ -4413,6 +4414,86 @@ static void test_ioctl(void)
CloseHandle(file);
@@ -4453,6 +4454,86 @@ static void test_flush_buffers_file(void)
DeleteFileA(buffer);
}
+static void test_query_ea(void)
@ -142,18 +142,18 @@ index 0c056ce4e28..c523bcfe0ab 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4450,6 +4531,7 @@ START_TEST(file)
pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile");
@@ -4491,6 +4572,7 @@ START_TEST(file)
pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile");
+ pNtQueryEaFile = (void *)GetProcAddress(hntdll, "NtQueryEaFile");
test_read_write();
test_NtCreateFile();
@@ -4474,4 +4556,5 @@ START_TEST(file)
test_query_volume_information_file();
@@ -4516,4 +4598,5 @@ START_TEST(file)
test_query_attribute_information_file();
test_ioctl();
test_flush_buffers_file();
+ test_query_ea();
}
--

18
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "e6f8f136fa557d282f44654be509573cb45a831f"
echo "e918c6fd8b426e8298eca5951d917960e4236d95"
}
# Show version information
@ -100,7 +100,6 @@ patch_enable_all ()
enable_combase_RoApi="$1"
enable_comctl32_Button_Theming="$1"
enable_comctl32_Listview_DrawItem="$1"
enable_comctl32_PROPSHEET_InsertPage="$1"
enable_comctl32_TTM_ADDTOOLW="$1"
enable_comdlg32_lpstrFileTitle="$1"
enable_configure_Absolute_RPATH="$1"
@ -512,9 +511,6 @@ patch_enable ()
comctl32-Listview_DrawItem)
enable_comctl32_Listview_DrawItem="$2"
;;
comctl32-PROPSHEET_InsertPage)
enable_comctl32_PROPSHEET_InsertPage="$2"
;;
comctl32-TTM_ADDTOOLW)
enable_comctl32_TTM_ADDTOOLW="$2"
;;
@ -2947,18 +2943,6 @@ if test "$enable_comctl32_Listview_DrawItem" -eq 1; then
) >> "$patchlist"
fi
# Patchset comctl32-PROPSHEET_InsertPage
# |
# | Modified files:
# | * dlls/comctl32/propsheet.c
# |
if test "$enable_comctl32_PROPSHEET_InsertPage" -eq 1; then
patch_apply comctl32-PROPSHEET_InsertPage/0003-comctl32-Add-support-for-PSPCB_ADDREF-PSPCB_RELEASE-.patch
(
printf '%s\n' '+ { "Dmitry Timoshkov", "comctl32: Add support for PSPCB_ADDREF/PSPCB_RELEASE callback notifications.", 2 },';
) >> "$patchlist"
fi
# Patchset comctl32-TTM_ADDTOOLW
# |
# | This patchset fixes the following Wine bugs:

4
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -4302,7 +4302,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view);
return WINED3D_OK;
@@ -760,6 +767,10 @@ static void wined3d_unordered_access_view_cs_init(void *object)
@@ -774,6 +781,10 @@ static void wined3d_unordered_access_view_cs_init(void *object)
desc, texture, view->format);
}
}
@ -4313,7 +4313,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
}
static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view,
@@ -776,6 +787,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
@@ -790,6 +801,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
wined3d_resource_incref(view->resource = resource);