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

Remove several patches (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner 2014-11-06 18:17:40 +01:00
parent 8d9d2558c9
commit a05b7dc368
7 changed files with 469 additions and 646 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -12,6 +12,9 @@ wine-compholio (1.7.31) UNRELEASED; urgency=low
* Removed patches for TLB dependencies lookup in resources (accepted upstream).
* Removed patches for ws2_32.inet_pton implementation (fixed upstream).
* Removed patch to update properties when applying MSI transforms (fixed upstream).
* Removed patch to silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs (accepted upstream).
* Removed patch with additional tests for MsgWaitForMultipleObjectsEx (accepted upstream).
* Partially removed patches for UTF-7 tests (accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 03 Nov 2014 20:10:04 +0100
wine-compholio (1.7.30) unstable; urgency=low

13
patches/Makefile
View File

@ -160,26 +160,22 @@ clean:
# | * kernel32: Silence repeated CompareStringEx FIXME. [by Sebastian Lackner]
# | * wined3d: Silence repeated resource_check_usage FIXME. [rev 2, by Erich E. Hoover]
# | * wined3d: Silence repeated wined3d_swapchain_present FIXME. [by Sebastian Lackner]
# | * usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs. [by Sebastian Lackner]
# | * Appease the blessed version of gcc (4.5) when -Werror is enabled. [by Erich E. Hoover]
# |
# | Modified files:
# | * dlls/d3d9/tests/visual.c, dlls/kernel32/locale.c, dlls/netapi32/netapi32.c, dlls/usp10/opentype.c,
# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/swapchain.c,
# | tools/makedep.c
# | * dlls/d3d9/tests/visual.c, dlls/kernel32/locale.c, dlls/netapi32/netapi32.c, dlls/winealsa.drv/mmdevdrv.c,
# | dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/swapchain.c, tools/makedep.c
# |
.INTERMEDIATE: Miscellaneous.ok
Miscellaneous.ok:
$(call APPLY_FILE,Miscellaneous/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch)
$(call APPLY_FILE,Miscellaneous/0002-kernel32-Silence-repeated-CompareStringEx-FIXME.patch)
$(call APPLY_FILE,Miscellaneous/0003-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch)
$(call APPLY_FILE,Miscellaneous/0004-usp10-Silence-repeated-GSUB_apply_ChainContext-Subst.patch)
$(call APPLY_FILE,Miscellaneous/0005-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch)
$(call APPLY_FILE,Miscellaneous/0004-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch)
@( \
echo '+ { "Miscellaneous", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." },'; \
echo '+ { "Miscellaneous", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME. [rev 2]" },'; \
echo '+ { "Miscellaneous", "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME." },'; \
echo '+ { "Miscellaneous", "Sebastian Lackner", "usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs." },'; \
echo '+ { "Miscellaneous", "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled." },'; \
) > Miscellaneous.ok
@ -1070,14 +1066,13 @@ ntoskrnl-Write_CR4.ok:
# | * [#32568] CoWaitForMultipleHandles shouldn't process window events when APC calls are queued
# |
# | Modified files:
# | * dlls/ole32/compobj.c, dlls/ole32/tests/compobj.c, dlls/user32/tests/msg.c, include/objbase.h
# | * dlls/ole32/compobj.c, dlls/ole32/tests/compobj.c, include/objbase.h
# |
.INTERMEDIATE: ole32-CoWaitForMultipleHandles.ok
ole32-CoWaitForMultipleHandles.ok:
$(call APPLY_FILE,ole32-CoWaitForMultipleHandles/0001-ole32-tests-Add-tests-for-CoWaitForMultipleHandles.patch)
$(call APPLY_FILE,ole32-CoWaitForMultipleHandles/0002-ole32-Verify-arguments-for-CoWaitForMultipleHandles-.patch)
$(call APPLY_FILE,ole32-CoWaitForMultipleHandles/0003-ole32-Don-t-process-window-events-when-APC-calls-are.patch)
$(call APPLY_FILE,ole32-CoWaitForMultipleHandles/0004-user32-tests-Add-tests-for-MsgWaitForMultipleObjects.patch)
@( \
echo '+ { "ole32-CoWaitForMultipleHandles", "Sebastian Lackner", "CoWaitForMultipleHandles shouldn'\''t process window events when APC calls are queued." },'; \
) > ole32-CoWaitForMultipleHandles.ok

0
patches/Miscellaneous/0005-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch → patches/Miscellaneous/0004-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
View File

54
patches/Miscellaneous/0004-usp10-Silence-repeated-GSUB_apply_ChainContext-Subst.patch
View File

@ -1,54 +0,0 @@
From 4acb49f0e0be827be0252c4b3f896c11cf4a9d94 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 18 Sep 2014 00:38:15 +0200
Subject: usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs.
---
dlls/usp10/opentype.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index 166d823..e2142a5 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -938,12 +938,16 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo
ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset);
if (GET_BE_WORD(ccsf1->SubstFormat) == 1)
{
- FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n");
continue;
}
else if (GET_BE_WORD(ccsf1->SubstFormat) == 2)
{
- FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n");
continue;
}
else if (GET_BE_WORD(ccsf1->SubstFormat) == 3)
@@ -1649,12 +1653,16 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo
if (GET_BE_WORD(ccpf3->PosFormat) == 1)
{
- FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n");
continue;
}
else if (GET_BE_WORD(ccpf3->PosFormat) == 2)
{
- FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n");
+ static int once;
+ if (!once++)
+ FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n");
continue;
}
else if (GET_BE_WORD(ccpf3->PosFormat) == 3)
--
2.1.0

4
patches/Miscellaneous/definition
View File

@ -10,10 +10,6 @@ Revision: 1
Author: Sebastian Lackner
Title: wined3d: Silence repeated wined3d_swapchain_present FIXME.
Revision: 1
Author: Sebastian Lackner
Title: usp10: Silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs.
Revision: 1
Author: Erich E. Hoover
Title: Appease the blessed version of gcc (4.5) when -Werror is enabled.

970
patches/kernel32-UTF7_Support/0003-kernel32-tests-Add-tests-for-UTF-7-conversion.patch
View File

File diff suppressed because it is too large Load Diff

71
patches/ole32-CoWaitForMultipleHandles/0004-user32-tests-Add-tests-for-MsgWaitForMultipleObjects.patch
View File

@ -1,71 +0,0 @@
From 9be421e1e55b0032622a14c371af22046850958e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 6 Nov 2014 00:13:42 +0100
Subject: user32/tests: Add tests for MsgWaitForMultipleObjectsEx.
---
dlls/user32/tests/msg.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 90b87cb..82f5bc7 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -4542,6 +4542,11 @@ static const struct message WmZOrder[] = {
{ 0 }
};
+static void CALLBACK apc_test_proc(ULONG_PTR param)
+{
+ /* nothing */
+}
+
static void test_MsgWaitForMultipleObjects(HWND hwnd)
{
DWORD ret;
@@ -4583,6 +4588,42 @@ static void test_MsgWaitForMultipleObjects(HWND hwnd)
ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message);
ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n");
ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message);
+
+ /* MWMO_INPUTAVAILABLE should succeed even if the message was already seen */
+ PostMessageA( hwnd, WM_USER, 0, 0 );
+ ok(PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ), "PeekMessage should succeed\n");
+ ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message);
+
+ ret = MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_POSTMESSAGE, MWMO_INPUTAVAILABLE);
+ ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret);
+
+ ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n");
+ ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message);
+
+ /* without MWMO_ALERTABLE the result is never WAIT_IO_COMPLETION */
+ PostMessageA(hwnd, WM_USER, 0, 0);
+
+ ret = QueueUserAPC(apc_test_proc, GetCurrentThread(), 0);
+ ok(ret, "QueueUserAPC failed %u\n", GetLastError());
+
+ ret = MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_POSTMESSAGE, 0);
+ ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret);
+
+ ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n");
+ ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message);
+
+ /* but even with MWMO_ALERTABLE window events are preferred */
+ PostMessageA(hwnd, WM_USER, 0, 0);
+
+ ret = MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE);
+ ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret);
+
+ ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n");
+ ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message);
+
+ /* the APC call is still queued */
+ ret = MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE);
+ ok(ret == WAIT_IO_COMPLETION, "MsgWaitForMultipleObjectsEx returned %x\n", ret);
}
/* test if we receive the right sequence of messages */
--
2.1.3