mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Added patch to implement iphlpapi stub functions.
This commit is contained in:
Sebastian Lackner
parent
1349af11e7
commit
26699042ab
@ -35,8 +35,9 @@ Wine. All those differences are also documented on the
|
||||
Included bugfixes and improvements
|
||||
==================================
|
||||
|
||||
**Bugfixes and features included in the next upcoming release [2]:**
|
||||
**Bugfixes and features included in the next upcoming release [3]:**
|
||||
|
||||
* Cinema 4D needs NotifyIpInterfaceChange ([Wine Bug #34573](http://bugs.winehq.org/show_bug.cgi?id=34573))
|
||||
* D3DCompileShader should filter specific warning messages ([Wine Bug #33770](http://bugs.winehq.org/show_bug.cgi?id=33770))
|
||||
* Tumblebugs 2 requires DXTn software encoding support ([Wine Bug #29586](http://bugs.winehq.org/show_bug.cgi?id=29586))
|
||||
|
||||
|
||||
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,5 +1,7 @@
|
||||
wine-compholio (1.7.30) UNRELEASED; urgency=low
|
||||
* Added additional conversion functions to DXTn patch.
|
||||
* Added patch to filter specific warning messages for D3DCompileShader.
|
||||
* Added patch to implement iphlpapi stub functions.
|
||||
* Removed patch to avoid Clang compiler warning because of unused Vtable (accepted upstream).
|
||||
* Removed patch for additional ATL thunks (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 20 Oct 2014 19:53:47 +0200
|
||||
|
||||
@ -35,6 +35,7 @@ PATCHLIST := \
|
||||
gdi32-MultiMonitor.ok \
|
||||
imagehlp-BindImageEx.ok \
|
||||
imm32-Cross_Thread_Access.ok \
|
||||
iphlpapi-Stubs.ok \
|
||||
iphlpapi-TCP_Table.ok \
|
||||
kernel32-FindFirstFile.ok \
|
||||
kernel32-GetFinalPathNameByHandle.ok \
|
||||
@ -472,6 +473,25 @@ 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:
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
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
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
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
|
||||
|
||||
4
patches/iphlpapi-Stubs/definition
Normal file
4
patches/iphlpapi-Stubs/definition
Normal file
@ -0,0 +1,4 @@
|
||||
Author: Sebastian Lackner
|
||||
Subject: Add stubs for CancelMibChangeNotify2 and NotifyIpInterfaceChange.
|
||||
Revision: 1
|
||||
Fixes: [34573] Cinema 4D needs NotifyIpInterfaceChange
|
||||
@ -104,7 +104,7 @@ index 0000000..91b0c3d
|
||||
+ x & 3, y & 3, &color);
|
||||
+ if (alpha)
|
||||
+ {
|
||||
+ dst_line[x] = (color & 0xff00FF00) | ((color & 0xff) << 16) |
|
||||
+ dst_line[x] = (color & 0xff00ff00) | ((color & 0xff) << 16) |
|
||||
+ ((color & 0xff0000) >> 16);
|
||||
+ }
|
||||
+ else
|
||||
@ -142,7 +142,7 @@ index 0000000..91b0c3d
|
||||
+ color = src_line[x];
|
||||
+ if (alpha)
|
||||
+ {
|
||||
+ dst_line[x] = (color & 0xff00FF00) | ((color & 0xff) << 16) |
|
||||
+ dst_line[x] = (color & 0xff00ff00) | ((color & 0xff) << 16) |
|
||||
+ ((color & 0xff0000) >> 16);
|
||||
+ }
|
||||
+ else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user