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

Browse Source 
[shlwapi-IStream_fnRead]
Removed patch to fix IStream::Read() return value for partial reads (accepted
upstream).

[wined3d-Fix_Typos]
Removed patch to fix a typo in a wined3d TRACE message (accepted upstream).

[ws2_32-getaddrinfo]
Removed patch to ignore invalid protocol IPPROTO_IPV6 in getaddrinfo (accepted
upstream).
This commit is contained in:
Sebastian Lackner 2016-04-26 17:45:27 +02:00
parent f837e9bbfd
commit 8ae9a00d2e
7 changed files with 8 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/hal-KeQueryPerformanceCounter/0001-hal-Implement-KeQueryPerformanceCounter.patch
View File

@ -1,4 +1,4 @@
From 29ed0b32254cac13e07daea09b4288ce774688cc Mon Sep 17 00:00:00 2001
From a5276ddb1a933f10f4f9334a791404276d64cd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 28 Oct 2015 22:36:01 +0100
Subject: hal: Implement KeQueryPerformanceCounter.
@ -9,12 +9,12 @@ Subject: hal: Implement KeQueryPerformanceCounter.
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c
index bca688e..84942ca 100644
index 0b2e422..be3a48b 100644
--- a/dlls/hal/hal.c
+++ b/dlls/hal/hal.c
@@ -161,3 +161,13 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port)
FIXME("(%p) stub!\n", port);
return 0;
@@ -172,3 +172,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value)
{
FIXME("(%p %d) stub!\n", port, value);
}
+
+ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency)
@ -27,7 +27,7 @@ index bca688e..84942ca 100644
+ return counter.QuadPart;
+}
diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec
index 02f778c..821084d 100644
index c21806c..243c67b 100644
--- a/dlls/hal/hal.spec
+++ b/dlls/hal/hal.spec
@@ -72,7 +72,7 @@
@ -40,5 +40,5 @@ index 02f778c..821084d 100644
@ stub KeRaiseIrqlToDpcLevel
@ stub KeRaiseIrqlToSynchLevel
--
2.6.4
2.8.0

50
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "69eafe63ad7e3525f3498ab6af9f4c149753407f"
echo "a6e1adb8b701c390b248f8c4d74bef1ed5557599"
}
# Show version information
@ -312,7 +312,6 @@ patch_enable_all ()
enable_shell32_UNIXFS_get_unix_path="$1"
enable_shell32_UnixFS="$1"
enable_shlwapi_AssocGetPerceivedType="$1"
enable_shlwapi_IStream_fnRead="$1"
enable_shlwapi_SHMapHandle="$1"
enable_shlwapi_UrlCombine="$1"
enable_stdole32_idl_Typelib="$1"
@ -358,7 +357,6 @@ patch_enable_all ()
enable_wined3d_Accounting="$1"
enable_wined3d_CSMT_Helper="$1"
enable_wined3d_DXTn="$1"
enable_wined3d_Fix_Typos="$1"
enable_wined3d_Limit_Vram="$1"
enable_wined3d_QUERY_Stubs="$1"
enable_wined3d_Revert_PixelFormat="$1"
@ -394,7 +392,6 @@ patch_enable_all ()
enable_ws2_32_TransmitFile="$1"
enable_ws2_32_WSACleanup="$1"
enable_ws2_32_WriteWatches="$1"
enable_ws2_32_getaddrinfo="$1"
enable_ws2_32_getsockopt="$1"
enable_wtsapi32_EnumerateProcesses="$1"
enable_wtsapi32_WTSQueryUserToken="$1"
@ -1108,9 +1105,6 @@ patch_enable ()
shlwapi-AssocGetPerceivedType)
enable_shlwapi_AssocGetPerceivedType="$2"
;;
shlwapi-IStream_fnRead)
enable_shlwapi_IStream_fnRead="$2"
;;
shlwapi-SHMapHandle)
enable_shlwapi_SHMapHandle="$2"
;;
@ -1246,9 +1240,6 @@ patch_enable ()
wined3d-DXTn)
enable_wined3d_DXTn="$2"
;;
wined3d-Fix_Typos)
enable_wined3d_Fix_Typos="$2"
;;
wined3d-Limit_Vram)
enable_wined3d_Limit_Vram="$2"
;;
@ -1354,9 +1345,6 @@ patch_enable ()
ws2_32-WriteWatches)
enable_ws2_32_WriteWatches="$2"
;;
ws2_32-getaddrinfo)
enable_ws2_32_getaddrinfo="$2"
;;
ws2_32-getsockopt)
enable_ws2_32_getsockopt="$2"
;;
@ -6438,18 +6426,6 @@ if test "$enable_shlwapi_AssocGetPerceivedType" -eq 1; then
) >> "$patchlist"
fi
# Patchset shlwapi-IStream_fnRead
# |
# | Modified files:
# | * dlls/shlwapi/istream.c, dlls/shlwapi/tests/istream.c
# |
if test "$enable_shlwapi_IStream_fnRead" -eq 1; then
patch_apply shlwapi-IStream_fnRead/0001-shlwapi-Fix-IStream-Read-return-value-for-partial-re.patch
(
echo '+ { "Dmitry Timoshkov", "shlwapi: Fix IStream::Read() return value for partial reads.", 1 },';
) >> "$patchlist"
fi
# Patchset shlwapi-SHMapHandle
# |
# | Modified files:
@ -7157,18 +7133,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-Fix_Typos
# |
# | Modified files:
# | * dlls/wined3d/directx.c
# |
if test "$enable_wined3d_Fix_Typos" -eq 1; then
patch_apply wined3d-Fix_Typos/0001-wined3d-Fix-typo-in-TRACE-message.patch
(
echo '+ { "Sergey Isakov", "wined3d: Fix typo in TRACE message.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-Limit_Vram
# |
# | Modified files:
@ -7716,18 +7680,6 @@ if test "$enable_ws2_32_WSACleanup" -eq 1; then
) >> "$patchlist"
fi
# Patchset ws2_32-getaddrinfo
# |
# | Modified files:
# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c
# |
if test "$enable_ws2_32_getaddrinfo" -eq 1; then
patch_apply ws2_32-getaddrinfo/0001-ws2_32-Ignore-socket-type-for-protocol-IPPROTO_IPV6-.patch
(
echo '+ { "Michael Müller", "ws2_32: Ignore socket type for protocol IPPROTO_IPV6 in getaddrinfo.", 1 },';
) >> "$patchlist"
fi
# Patchset ws2_32-getsockopt
# |
# | This patchset fixes the following Wine bugs:

56
patches/shlwapi-IStream_fnRead/0001-shlwapi-Fix-IStream-Read-return-value-for-partial-re.patch
View File

@ -1,56 +0,0 @@
From 7c8ff77dc75904e59427b65f18c7c9d97f3831a4 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sun, 27 Mar 2016 17:29:34 +0800
Subject: shlwapi: Fix IStream::Read() return value for partial reads.
---
dlls/shlwapi/istream.c | 2 +-
dlls/shlwapi/tests/istream.c | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c
index e641995..946d2c8 100644
--- a/dlls/shlwapi/istream.c
+++ b/dlls/shlwapi/istream.c
@@ -130,7 +130,7 @@ static HRESULT WINAPI IStream_fnRead(IStream *iface, void* pv, ULONG cb, ULONG*
}
if (pcbRead)
*pcbRead = dwRead;
- return S_OK;
+ return dwRead == cb ? S_OK : S_FALSE;
}
/**************************************************************************
diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c
index 48a292a..c9cf62f 100644
--- a/dlls/shlwapi/tests/istream.c
+++ b/dlls/shlwapi/tests/istream.c
@@ -247,11 +247,24 @@ static void test_stream_read_write(IStream *stream, DWORD mode)
}
else
{
-todo_wine
ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written);
ok(count == 0, "expected 0, got %u\n", count);
}
+ ret = stream->lpVtbl->Seek(stream, start, STREAM_SEEK_SET, NULL);
+ ok(ret == S_OK, "Seek error %#x\n", ret);
+
+ count = 0xdeadbeaf;
+ ret = stream->lpVtbl->Read(stream, buf, 0, &count);
+ ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written);
+ ok(count == 0, "expected 0, got %u\n", count);
+
+ count = 0xdeadbeaf;
+ ret = stream->lpVtbl->Read(stream, buf, sizeof(buf), &count);
+ ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written);
+ ok(count == written, "expected %u, got %u\n", written, count);
+ if (count)
+ ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]);
}
static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm)
--
2.7.1

1
patches/shlwapi-IStream_fnRead/definition
View File

@ -1 +0,0 @@
Fixes: Fix IStream::Read() return value for partial reads

25
patches/wined3d-Fix_Typos/0001-wined3d-Fix-typo-in-TRACE-message.patch
View File

@ -1,25 +0,0 @@
From 03e1e23b99c29bb63cdb5808ff07374d38003efa Mon Sep 17 00:00:00 2001
From: Sergey Isakov <sergey.slice@gmail.com>
Date: Sat, 16 Apr 2016 19:14:43 +0200
Subject: wined3d: Fix typo in TRACE message.
---
dlls/wined3d/directx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 8358930..dfa1cdd 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1444,7 +1444,7 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_
if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE)
{
device = wined3d_settings.pci_device_id;
- TRACE("Overriding device PCI ID with 0x%04x.\n", vendor);
+ TRACE("Overriding device PCI ID with 0x%04x.\n", device);
}
if (wined3d_settings.emulated_textureram)
--
2.7.1

42
patches/ws2_32-getaddrinfo/0001-ws2_32-Ignore-socket-type-for-protocol-IPPROTO_IPV6-.patch
View File

@ -1,42 +0,0 @@
From 679f2b6acf543950bc657a981ee4696daa10a718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 29 Nov 2015 17:48:57 +0100
Subject: ws2_32: Ignore socket type for protocol IPPROTO_IPV6 in getaddrinfo.
---
dlls/ws2_32/socket.c | 6 ++++++
dlls/ws2_32/tests/sock.c | 1 +
2 files changed, 7 insertions(+)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index d31f0b4..342aa07 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -6358,6 +6358,12 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr
else if (IS_IPX_PROTO(punixhints->ai_protocol) && punixhints->ai_socktype != SOCK_DGRAM)
punixhints->ai_socktype = 0;
+
+ else if (punixhints->ai_protocol == IPPROTO_IPV6)
+ {
+ punixhints->ai_family = AF_INET6;
+ punixhints->ai_protocol = 0;
+ }
}
/* getaddrinfo(3) is thread safe, no need to wrap in CS */
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 00fac77..bffc6b9 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -192,6 +192,7 @@ static const struct addr_hint_tests
{AF_UNSPEC, SOCK_STREAM, 999, 0 },
{AF_INET, SOCK_DGRAM, 999, 0 },
{AF_INET, SOCK_DGRAM, 999, 0 },
+ {AF_UNSPEC, SOCK_STREAM, IPPROTO_IPV6,0 },
};
/**************** Static variables ***************/
--
2.6.2

1
patches/ws2_32-getaddrinfo/definition
View File

@ -1 +0,0 @@
Fixes: Ignore socket type for protocol IPPROTO_IPV6 in getaddrinfo