You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against c26284168ccf53e657bdfbedffd4ef13698688c8.
[msvcr120-strof] Removed patch to implement msvcr120.strtof and _strtof_l (accepted upstream).
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 6092670380abae9d9e773d6c8d75b55c5fe8be80 Mon Sep 17 00:00:00 2001
|
||||
From 58997b0ea80c550b399bddb5d2a1629ec8c5c6b5 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Thu, 18 Feb 2016 12:18:01 +0100
|
||||
Subject: gdi32: Add support for paths on a metafile HDC.
|
||||
@@ -74,18 +74,18 @@ index e09cd0b..166b6b2 100644
|
||||
if (!count) return TRUE;
|
||||
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 6804a96..07dac13 100644
|
||||
index f464720..865853e 100644
|
||||
--- a/dlls/gdi32/tests/metafile.c
|
||||
+++ b/dlls/gdi32/tests/metafile.c
|
||||
@@ -3386,7 +3386,7 @@ static void test_emf_GetPath(void)
|
||||
@@ -3422,7 +3422,7 @@ static void test_emf_GetPath(void)
|
||||
EndPath(hdcMetafile);
|
||||
|
||||
size = GetPath(hdcMetafile, NULL, NULL, 0);
|
||||
- todo_wine ok( size == 5, "GetPath returned %d.\n", size);
|
||||
+ ok( size == 5, "GetPath returned %d.\n", size);
|
||||
- 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.7.0
|
||||
|
||||
|
Reference in New Issue
Block a user