You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Remove several patches (accepted upstream), temporarily disable mshtml patchset.
This commit is contained in:
Sebastian Lackner
@@ -37,7 +37,6 @@ PATCHLIST := \
|
||||
gdiplus-GdipCreateRegionRgnData.ok \
|
||||
imagehlp-BindImageEx.ok \
|
||||
imm32-Cross_Thread_Access.ok \
|
||||
iphlpapi-Stubs.ok \
|
||||
iphlpapi-TCP_Table.ok \
|
||||
kernel32-FindFirstFile.ok \
|
||||
kernel32-GetFinalPathNameByHandle.ok \
|
||||
@@ -48,7 +47,6 @@ PATCHLIST := \
|
||||
kernel32-UTF7_Support.ok \
|
||||
libs-Unicode_Collation.ok \
|
||||
libwine-BSD_mmap_fixed.ok \
|
||||
mshtml-sessionStorage.ok \
|
||||
msi-Transform_ProductVersion.ok \
|
||||
msvcp90-basic_string_wchar_dtor.ok \
|
||||
ntdll-DOS_Attributes.ok \
|
||||
@@ -514,25 +512,6 @@ imm32-Cross_Thread_Access.ok:
|
||||
echo '+ { "imm32-Cross_Thread_Access", "Aric Stewart", "Limit cross thread access to ImmSet* functions." },'; \
|
||||
) > imm32-Cross_Thread_Access.ok
|
||||
|
||||
# Patchset iphlpapi-Stubs
|
||||
# |
|
||||
# | Included patches:
|
||||
# | * Add stubs for CancelMibChangeNotify2 and NotifyIpInterfaceChange. [by Sebastian Lackner]
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#34573] Cinema 4D needs NotifyIpInterfaceChange
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/iphlpapi/iphlpapi.spec, dlls/iphlpapi/iphlpapi_main.c
|
||||
# |
|
||||
.INTERMEDIATE: iphlpapi-Stubs.ok
|
||||
iphlpapi-Stubs.ok:
|
||||
$(call APPLY_FILE,iphlpapi-Stubs/0001-iphlpapi-Add-stub-for-CancelMibChangeNotify2.patch)
|
||||
$(call APPLY_FILE,iphlpapi-Stubs/0002-iphlpapi-Add-stub-for-NotifyIpInterfaceChange.patch)
|
||||
@( \
|
||||
echo '+ { "iphlpapi-Stubs", "Sebastian Lackner", "Add stubs for CancelMibChangeNotify2 and NotifyIpInterfaceChange." },'; \
|
||||
) > iphlpapi-Stubs.ok
|
||||
|
||||
# Patchset iphlpapi-TCP_Table
|
||||
# |
|
||||
# | Included patches:
|
||||
@@ -564,8 +543,7 @@ iphlpapi-TCP_Table.ok:
|
||||
# |
|
||||
.INTERMEDIATE: kernel32-FindFirstFile.ok
|
||||
kernel32-FindFirstFile.ok:
|
||||
$(call APPLY_FILE,kernel32-FindFirstFile/0001-kernel32-Set-proper-error-codes-if-FindFirstFileExW-.patch)
|
||||
$(call APPLY_FILE,kernel32-FindFirstFile/0002-kernel32-Implement-FindFirstFileExW-level-FindExInfo.patch)
|
||||
$(call APPLY_FILE,kernel32-FindFirstFile/0001-kernel32-Implement-FindFirstFileExW-level-FindExInfo.patch)
|
||||
@( \
|
||||
echo '+ { "kernel32-FindFirstFile", "Sebastian Lackner", "Implement FindFirstFileExW level FindExInfoBasic." },'; \
|
||||
) > kernel32-FindFirstFile.ok
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
From 8d5567f38a4b717951b3b691c009929110d6c69a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 27 Oct 2014 02:29:21 +0100
|
||||
Subject: iphlpapi: Add stub for CancelMibChangeNotify2.
|
||||
|
||||
Based on a patch by Yann Leretaille.
|
||||
---
|
||||
dlls/iphlpapi/iphlpapi.spec | 2 +-
|
||||
dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
|
||||
index 9eb5a32..ccfa6c8 100644
|
||||
--- a/dlls/iphlpapi/iphlpapi.spec
|
||||
+++ b/dlls/iphlpapi/iphlpapi.spec
|
||||
@@ -8,7 +8,7 @@
|
||||
@ stdcall AllocateAndGetTcpTableFromStack( ptr long long long )
|
||||
@ stdcall AllocateAndGetUdpTableFromStack( ptr long long long )
|
||||
@ stdcall CancelIPChangeNotify( ptr )
|
||||
-#@ stub CancelMibChangeNotify2
|
||||
+@ stdcall CancelMibChangeNotify2( ptr )
|
||||
#@ stub ConvertGuidToStringA
|
||||
#@ stub ConvertGuidToStringW
|
||||
#@ stub ConvertInterfaceAliasToLuid
|
||||
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
|
||||
index 4d66810..967fb06 100644
|
||||
--- a/dlls/iphlpapi/iphlpapi_main.c
|
||||
+++ b/dlls/iphlpapi/iphlpapi_main.c
|
||||
@@ -198,6 +198,15 @@ BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped)
|
||||
}
|
||||
|
||||
|
||||
+/******************************************************************
|
||||
+ * CancelMibChangeNotify2 (IPHLPAPI.@)
|
||||
+ */
|
||||
+DWORD WINAPI CancelMibChangeNotify2(HANDLE handle)
|
||||
+{
|
||||
+ FIXME("(handle %p): stub\n", handle);
|
||||
+ return NO_ERROR;
|
||||
+}
|
||||
+
|
||||
|
||||
/******************************************************************
|
||||
* CreateIpForwardEntry (IPHLPAPI.@)
|
||||
--
|
||||
2.1.2
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
From ea30ba5f4635e50e4874643c220c4fa0e6ac0458 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 27 Oct 2014 02:50:05 +0100
|
||||
Subject: iphlpapi: Add stub for NotifyIpInterfaceChange.
|
||||
|
||||
Based on a patch by Yann Leretaille.
|
||||
---
|
||||
dlls/iphlpapi/iphlpapi.spec | 2 +-
|
||||
dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
|
||||
index ccfa6c8..c51b58b 100644
|
||||
--- a/dlls/iphlpapi/iphlpapi.spec
|
||||
+++ b/dlls/iphlpapi/iphlpapi.spec
|
||||
@@ -233,7 +233,7 @@
|
||||
@ stub NhpAllocateAndGetInterfaceInfoFromStack
|
||||
@ stub NhpGetInterfaceIndexFromStack
|
||||
@ stdcall NotifyAddrChange( ptr ptr )
|
||||
-#@ stub NotifyIpInterfaceChange
|
||||
+@ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr )
|
||||
@ stdcall NotifyRouteChange( ptr ptr )
|
||||
#@ stub NotifyRouteChange2
|
||||
@ stub NotifyRouteChangeEx
|
||||
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
|
||||
index 967fb06..4fa3e74 100644
|
||||
--- a/dlls/iphlpapi/iphlpapi_main.c
|
||||
+++ b/dlls/iphlpapi/iphlpapi_main.c
|
||||
@@ -2291,6 +2291,18 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped)
|
||||
return ERROR_IO_PENDING;
|
||||
}
|
||||
|
||||
+/******************************************************************
|
||||
+ * NotifyIpInterfaceChange (IPHLPAPI.@)
|
||||
+ */
|
||||
+DWORD WINAPI NotifyIpInterfaceChange(ULONG family, PVOID callback, PVOID context,
|
||||
+ BOOLEAN init_notify, PHANDLE handle)
|
||||
+{
|
||||
+ FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n",
|
||||
+ family, callback, context, init_notify, handle);
|
||||
+ if (handle) *handle = NULL;
|
||||
+ return ERROR_NOT_SUPPORTED;
|
||||
+}
|
||||
+
|
||||
|
||||
/******************************************************************
|
||||
* NotifyRouteChange (IPHLPAPI.@)
|
||||
--
|
||||
2.1.2
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
Author: Sebastian Lackner
|
||||
Subject: Add stubs for CancelMibChangeNotify2 and NotifyIpInterfaceChange.
|
||||
Revision: 1
|
||||
Fixes: [34573] Cinema 4D needs NotifyIpInterfaceChange
|
||||
@@ -1,31 +0,0 @@
|
||||
From 33abd1e58720b208d86c8378cb1d391d96f8717c Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 3 Oct 2014 20:01:19 +0200
|
||||
Subject: kernel32: Set proper error codes if FindFirstFileExW doesn't support
|
||||
specific search_ops / levels.
|
||||
|
||||
---
|
||||
dlls/kernel32/file.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
|
||||
index 512b63e..4a6fc13 100644
|
||||
--- a/dlls/kernel32/file.c
|
||||
+++ b/dlls/kernel32/file.c
|
||||
@@ -1872,11 +1872,13 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level,
|
||||
if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories)
|
||||
{
|
||||
FIXME("search_op not implemented 0x%08x\n", search_op);
|
||||
+ SetLastError( ERROR_INVALID_PARAMETER );
|
||||
return INVALID_HANDLE_VALUE;
|
||||
}
|
||||
if (level != FindExInfoStandard)
|
||||
{
|
||||
FIXME("info level %d not implemented\n", level );
|
||||
+ SetLastError( ERROR_INVALID_PARAMETER );
|
||||
return INVALID_HANDLE_VALUE;
|
||||
}
|
||||
|
||||
--
|
||||
2.1.1
|
||||
|
||||
@@ -2,3 +2,4 @@ Author: Zhenbo Li
|
||||
Subject: Implement sessionStorage (partially).
|
||||
Revision: 1
|
||||
Fixes: Add partially support for sessionStorage
|
||||
Disabled: true
|
||||
|
||||
Reference in New Issue
Block a user