mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Added patch to silence repeated GSUB_applly_ChainContext[Subst|Pos] FIXMEs.
This commit is contained in:
Sebastian Lackner
parent
312800fa66
commit
969e9d5583
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -3,6 +3,7 @@ wine-compholio (1.7.27) UNRELEASED; urgency=low
|
||||
* Added patch to support FIND_FIRST_EX_LARGE_FETCH flag in FindFirstFileExW.
|
||||
* Added patch to fix deadlock caused by incorrect wrapper of glu polygon/contour function.
|
||||
* Added patch to avoid filling out KdHelp for usermode applications.
|
||||
* Added patch to silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs.
|
||||
* Removed patch to use assembly wrapper for TLS callbacks (accepted upstream).
|
||||
* Removed patch to fix uninitialized cch struct member in GetMenuItemInfo (accepted upstream).
|
||||
* Removed some patches for riched20/IText*-interface (accepted upstream).
|
||||
|
||||
@ -131,25 +131,28 @@ 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]
|
||||
# | * Appease the Archlinux version of gcc (4.9.1) when -Werror is enabled. [by Sebastian Lackner]
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3d9/tests/visual.c, dlls/kernel32/locale.c, dlls/msvcp90/ios.c, dlls/msvcp90/locale.c, dlls/msvcp90/string.c,
|
||||
# | dlls/netapi32/netapi32.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c,
|
||||
# | dlls/wined3d/swapchain.c, server/object.c, tools/makedep.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, server/object.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-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch)
|
||||
$(call APPLY_FILE,Miscellaneous/0005-Appease-the-Archlinux-version-of-gcc-4.9.1-when-Werr.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/0006-Appease-the-Archlinux-version-of-gcc-4.9.1-when-Werr.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." },'; \
|
||||
echo '+ { "Miscellaneous", "Sebastian Lackner", "Appease the Archlinux version of gcc (4.9.1) when -Werror is enabled." },'; \
|
||||
) > Miscellaneous.ok
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
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
|
||||
|
||||
@ -10,6 +10,10 @@ 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.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user