wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5e6f35ffbd8795da71c6fd6cb8adc84bf8a36504.

Browse Source 
[fontsub-CreateFontPackage]
Removed patch to improve fontsub.CreateFontPackage stub implementation
(accepted upstream).

[quartz-AsyncReader]
Removed patch to improve detection of MPEG2 streams (accepted upstream).

[user32-SetCoalescableTimer]
Removed patch to add stub for SetCoalescableTimer (implemented upstream).
This commit is contained in:
Sebastian Lackner
2016-04-29 21:07:34 +02:00
parent 72a52e44c2
commit 8d2cdec699
11 changed files with 29 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/gdi32-Path_Metafile/0004-gdi32-Add-support-for-paths-on-a-metafile-HDC.-v2.patch
View File

@@ -1,4 +1,4 @@
From 8aa010409014ce5102091744c2bf97c7f5188b38 Mon Sep 17 00:00:00 2001
From d0011ed5a3bc0f15c8066f8b8d316c606fde5d87 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sat, 20 Feb 2016 16:09:40 +0800
Subject: gdi32: Add support for paths on a metafile HDC. (v3)
@@ -6,20 +6,22 @@ Subject: gdi32: Add support for paths on a metafile HDC. (v3)
---
dlls/gdi32/enhmfdrv/dc.c | 4 +-
dlls/gdi32/path.c | 160 ++++++++++++++++++++++++++++++++++++++++++--
dlls/gdi32/tests/metafile.c | 4 +-
3 files changed, 159 insertions(+), 9 deletions(-)
dlls/gdi32/tests/metafile.c | 2 -
3 files changed, 158 insertions(+), 8 deletions(-)
diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c
index cbf3f5c..a92cf4d 100644
index 8525067..7a31224 100644
--- a/dlls/gdi32/enhmfdrv/dc.c
+++ b/dlls/gdi32/enhmfdrv/dc.c
@@ -420,12 +420,14 @@ BOOL EMFDRV_AbortPath( PHYSDEV dev )
@@ -420,6 +420,7 @@ BOOL EMFDRV_AbortPath( PHYSDEV dev )
BOOL EMFDRV_BeginPath( PHYSDEV dev )
{
+ PHYSDEV next = GET_NEXT_PHYSDEV( dev, pBeginPath );
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev;
EMRBEGINPATH emr;
@@ -428,7 +429,8 @@ BOOL EMFDRV_BeginPath( PHYSDEV dev )
emr.emr.iType = EMR_BEGINPATH;
emr.emr.nSize = sizeof(emr);
@@ -356,10 +358,10 @@ index 8856d49..73357a3 100644
if (flags & ETO_GLYPH_INDEX) ggo_flags |= GGO_GLYPH_INDEX;
diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index e247db9..8b487e8 100644
index d45bae0..f556863 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -2300,7 +2300,6 @@ static void test_emf_ExtTextOut_on_path(void)
@@ -2460,7 +2460,6 @@ static void test_emf_ExtTextOut_on_path(void)
ok(ret, "EndPath error %d\n", GetLastError());
ret = GetPath(hdcMetafile, NULL, NULL, 0);
@@ -367,7 +369,7 @@ index e247db9..8b487e8 100644
ok(!ret, "expected 0, got %d\n", ret);
hMetafile = CloseEnhMetaFile(hdcMetafile);
@@ -2360,7 +2359,6 @@ todo_wine
@@ -2520,7 +2519,6 @@ todo_wine
ok(ret, "EndPath error %d\n", GetLastError());
ret = GetPath(hdcMetafile, NULL, NULL, 0);
@@ -375,15 +377,6 @@ index e247db9..8b487e8 100644
ok(!ret, "expected 0, got %d\n", ret);
hFont = SelectObject(hdcMetafile, hFont);
@@ -3540,7 +3538,7 @@ static void test_emf_GetPath(void)
EndPath(hdcMetafile);
size = GetPath(hdcMetafile, NULL, NULL, 0);
- todo_wine ok( size == 9, "GetPath returned %d.\n", size);
+ ok( size == 9, "GetPath returned %d.\n", size);
hemf = CloseEnhMetaFile(hdcMetafile);
ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());
--
2.7.1
2.8.0