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 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
patches/fontsub-CreateFontPackage/0001-fontsub-CreateFontPackage-straight-copy.patch
View File

@ -1,57 +0,0 @@
From 66cc3c66e8dca93421c13edfbbf36a0f2a241487 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Fri, 22 Apr 2016 17:56:48 +0300
Subject: fontsub: CreateFontPackage() straight copy
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
---
dlls/fontsub/main.c | 13 ++++++++++++-
include/fontsub.h | 3 +++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c
index b78bd58..a0a6032 100644
--- a/dlls/fontsub/main.c
+++ b/dlls/fontsub/main.c
@@ -50,5 +50,16 @@ ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, u
written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc,
reallocproc, freeproc, reserved);
- return ERR_GENERIC;
+ if (format != TTFCFP_SUBSET)
+ return ERR_GENERIC;
+
+ *dest = allocproc(src_len);
+ if (!*dest)
+ return ERR_MEM;
+
+ memcpy(*dest, src, src_len);
+ *dest_len = src_len;
+ *written = src_len;
+
+ return NO_ERROR;
}
diff --git a/include/fontsub.h b/include/fontsub.h
index 6fc7793..b5c77e3 100644
--- a/include/fontsub.h
+++ b/include/fontsub.h
@@ -27,6 +27,8 @@ typedef void *(__cdecl *CFP_ALLOCPROC)(size_t);
typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t);
typedef void (__cdecl *CFP_FREEPROC)(void *);
+#define TTFCFP_SUBSET 0
+
ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest,
ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index,
const unsigned short format, const unsigned short lang, const unsigned short platform,
@@ -34,6 +36,7 @@ ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, u
CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved);
#define ERR_GENERIC 1000
+#define ERR_MEM 1005
#ifdef __cplusplus
}
--
2.8.0

1
patches/fontsub-CreateFontPackage/definition
View File

@ -1 +0,0 @@
Fixes: [40517] Improve fontsub.CreateFontPackage stub implementation

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

12
patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch
View File

@ -1,4 +1,4 @@
From a72962dc4ff3d6126e105aec97cfcb88da535b81 Mon Sep 17 00:00:00 2001
From 40564f426aea608e9925d332e15eca8e9f2e3ea1 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
Date: Mon, 28 Jul 2003 07:39:25 -0500
Subject: libs: Fix most problems with CompareString.
@ -9,10 +9,10 @@ Subject: libs: Fix most problems with CompareString.
2 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index b760e9a..6317112 100644
index 20f52d2..015bfad 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1761,13 +1761,13 @@ static void test_CompareStringA(void)
@@ -1766,13 +1766,13 @@ static void test_CompareStringA(void)
todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n");
ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
@ -29,10 +29,10 @@ index b760e9a..6317112 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -4801,6 +4801,5 @@ START_TEST(locale)
test_EnumSystemGeoID();
@@ -4842,6 +4842,5 @@ START_TEST(locale)
test_invariant();
test_GetSystemPreferredUILanguages();
test_GetThreadPreferredUILanguages();
- /* this requires collation table patch to make it MS compatible */
- if (0) test_sorting();
+ test_sorting();
@ -168,5 +168,5 @@ index 465d740..f354a75 100644
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
--
2.6.4
2.8.0

48
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "179137c259ffed546fb6f2c88c0d4df0e140cc4c"
echo "5e6f35ffbd8795da71c6fd6cb8adc84bf8a36504"
}
# Show version information
@ -144,7 +144,6 @@ patch_enable_all ()
enable_dxva2_Video_Decoder="$1"
enable_explorer_Video_Registry_Key="$1"
enable_fonts_Missing_Fonts="$1"
enable_fontsub_CreateFontPackage="$1"
enable_fsutil_Stub_Program="$1"
enable_gdi32_Lazy_Font_Initialization="$1"
enable_gdi32_MultiMonitor="$1"
@ -333,7 +332,6 @@ patch_enable_all ()
enable_user32_PNG_Support="$1"
enable_user32_Refresh_MDI_Menus="$1"
enable_user32_ScrollWindowEx="$1"
enable_user32_SetCoalescableTimer="$1"
enable_user32_lpCreateParams="$1"
enable_uxtheme_GTK_Theming="$1"
enable_version_GetFileVersionInfoSizeExW="$1"
@ -601,9 +599,6 @@ patch_enable ()
fonts-Missing_Fonts)
enable_fonts_Missing_Fonts="$2"
;;
fontsub-CreateFontPackage)
enable_fontsub_CreateFontPackage="$2"
;;
fsutil-Stub_Program)
enable_fsutil_Stub_Program="$2"
;;
@ -1168,9 +1163,6 @@ patch_enable ()
user32-ScrollWindowEx)
enable_user32_ScrollWindowEx="$2"
;;
user32-SetCoalescableTimer)
enable_user32_SetCoalescableTimer="$2"
;;
user32-lpCreateParams)
enable_user32_lpCreateParams="$2"
;;
@ -3599,21 +3591,6 @@ if test "$enable_fonts_Missing_Fonts" -eq 1; then
) >> "$patchlist"
fi
# Patchset fontsub-CreateFontPackage
# |
# | This patchset fixes the following Wine bugs:
# | * [#40517] Improve fontsub.CreateFontPackage stub implementation
# |
# | Modified files:
# | * dlls/fontsub/main.c, include/fontsub.h
# |
if test "$enable_fontsub_CreateFontPackage" -eq 1; then
patch_apply fontsub-CreateFontPackage/0001-fontsub-CreateFontPackage-straight-copy.patch
(
echo '+ { "Nikolay Sivov", "fontsub: CreateFontPackage() straight copy.", 1 },';
) >> "$patchlist"
fi
# Patchset fsutil-Stub_Program
# |
# | This patchset fixes the following Wine bugs:
@ -4049,13 +4026,11 @@ if test "$enable_server_Desktop_Refcount" -eq 1; then
patch_apply server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
patch_apply server-Desktop_Refcount/0002-server-Track-desktop-handle-count-more-correctly.patch
patch_apply server-Desktop_Refcount/0003-user32-Implement-CWF_CREATE_ONLY-flag-for-CreateWind.patch
patch_apply server-Desktop_Refcount/0004-user32-tests-Add-additional-tests-for-window-station.patch
patch_apply server-Desktop_Refcount/0005-server-Assign-random-name-when-no-name-was-passed-to.patch
patch_apply server-Desktop_Refcount/0004-server-Assign-random-name-when-no-name-was-passed-to.patch
(
echo '+ { "Sebastian Lackner", "server: Introduce a new alloc_handle object callback.", 2 },';
echo '+ { "Sebastian Lackner", "server: Track desktop handle count more correctly.", 1 },';
echo '+ { "Sebastian Lackner", "user32: Implement CWF_CREATE_ONLY flag for CreateWindowStation.", 1 },';
echo '+ { "Sebastian Lackner", "user32/tests: Add additional tests for window station name.", 1 },';
echo '+ { "Sebastian Lackner", "server: Assign random name when no name was passed to create_winstation.", 1 },';
) >> "$patchlist"
fi
@ -5695,14 +5670,12 @@ fi
# Patchset quartz-AsyncReader
# |
# | Modified files:
# | * dlls/quartz/filesource.c, dlls/quartz/regsvr.c
# | * dlls/quartz/filesource.c
# |
if test "$enable_quartz_AsyncReader" -eq 1; then
patch_apply quartz-AsyncReader/0001-quartz-AsyncReader-should-return-NULL-as-media-subty.patch
patch_apply quartz-AsyncReader/0002-quartz-Recognize-mpeg2-program-streams.patch
(
echo '+ { "Michael Müller", "quartz: AsyncReader should return NULL as media subtype for unknown formats instead of failing.", 1 },';
echo '+ { "Michael Müller", "quartz: Recognize mpeg2 program streams.", 1 },';
) >> "$patchlist"
fi
@ -6830,21 +6803,6 @@ if test "$enable_user32_ScrollWindowEx" -eq 1; then
) >> "$patchlist"
fi
# Patchset user32-SetCoalescableTimer
# |
# | This patchset fixes the following Wine bugs:
# | * [#39509] Add stub for SetCoalescableTimer
# |
# | Modified files:
# | * dlls/user32/message.c, dlls/user32/user32.spec
# |
if test "$enable_user32_SetCoalescableTimer" -eq 1; then
patch_apply user32-SetCoalescableTimer/0001-user32-add-SetCoalescableTimer-stub.patch
(
echo '+ { "Austin English", "user32: Add SetCoalescableTimer stub.", 1 },';
) >> "$patchlist"
fi
# Patchset uxtheme-GTK_Theming
# |
# | This patchset has the following (direct or indirect) dependencies:

28
patches/quartz-AsyncReader/0002-quartz-Recognize-mpeg2-program-streams.patch
View File

@ -1,28 +0,0 @@
From 6db27add885e521e7b42829ade2f7de74abdd619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 7 Feb 2016 01:32:04 +0100
Subject: quartz: Recognize mpeg2 program streams.
---
dlls/quartz/regsvr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index b0f1e9a..196e064 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -818,6 +818,11 @@ static struct regsvr_mediatype_parsing const mediatype_parsing_list[] = {
"0, 10, FFFFFF00000080808080, 494433000000000000",
NULL }
},
+ { &MEDIATYPE_Stream,
+ &MEDIASUBTYPE_MPEG2_PROGRAM,
+ { "0, 5, FFFFFFFFC0, 000001BA40",
+ NULL }
+ },
{ &MEDIATYPE_Stream,
&MEDIASUBTYPE_QTMovie,
{ "4, 4, , 6d646174",
--
2.7.0

1
patches/quartz-AsyncReader/definition
View File

@ -1 +0,0 @@
Fixes: Improve detection of MPEG2 streams

18
patches/server-Desktop_Refcount/0005-server-Assign-random-name-when-no-name-was-passed-to.patch → patches/server-Desktop_Refcount/0004-server-Assign-random-name-when-no-name-was-passed-to.patch
View File

@ -1,4 +1,4 @@
From ca6e61e6b9c6813d684eb60d074d3036f10d166e Mon Sep 17 00:00:00 2001
From 5ae23a4a5d6c964035bdb8ecddb3fe7a74dc691d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 24 Feb 2016 19:18:52 +0100
Subject: server: Assign random name when no name was passed to
@ -10,17 +10,17 @@ Subject: server: Assign random name when no name was passed to
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
index 4a553ca..b4a1a49 100644
index 94be4c9..33f50d8 100644
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.c
@@ -220,8 +220,8 @@ static void test_handles(void)
memset(buffer, 0, sizeof(buffer));
memset( buffer, 0, sizeof(buffer) );
ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size );
ok( ret, "GetUserObjectInformationA returned %x\n", ret );
- todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected WindowStation name '%s'\n", buffer );
- todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected WindowStation name '%s'\n", buffer );
+ ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected WindowStation name '%s'\n", buffer );
+ ok( buffer[strlen(buffer) - 1] == '$', "unexpected WindowStation name '%s'\n", buffer );
ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() );
- todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer );
- todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer );
+ ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer );
+ ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer );
SetLastError( 0xdeadbeef );
w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
@ -69,5 +69,5 @@ index 0034343..39131d5 100644
}
--
2.7.1
2.8.0

38
patches/server-Desktop_Refcount/0004-user32-tests-Add-additional-tests-for-window-station.patch
View File

@ -1,38 +0,0 @@
From 15e83e517e6b227a55ecee9541cca567b94701b8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 24 Feb 2016 17:51:48 +0100
Subject: user32/tests: Add additional tests for window station name.
---
dlls/user32/tests/winstation.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
index e49420b..4a553ca 100644
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.c
@@ -114,6 +114,8 @@ static void test_handles(void)
DWORD id, flags, le;
ATOM atom;
char buffer[20];
+ DWORD size;
+ BOOL ret;
/* win stations */
@@ -215,6 +217,12 @@ static void test_handles(void)
w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL );
ok( w2 != 0, "create station failed err %u\n", GetLastError() );
+ memset(buffer, 0, sizeof(buffer));
+ ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size );
+ ok( ret, "GetUserObjectInformationA returned %x\n", ret );
+ todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected WindowStation name '%s'\n", buffer );
+ todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected WindowStation name '%s'\n", buffer );
+
SetLastError( 0xdeadbeef );
w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
todo_wine
--
2.7.1

43
patches/user32-SetCoalescableTimer/0001-user32-add-SetCoalescableTimer-stub.patch
View File

@ -1,43 +0,0 @@
From 763a849b4702851cc1536cbc719a870d693935fe Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Tue, 27 Oct 2015 11:51:39 -0500
Subject: user32: add SetCoalescableTimer stub
Signed-off-by: Austin English <austinenglish@gmail.com>
---
dlls/user32/message.c | 9 +++++++++
dlls/user32/user32.spec | 1 +
2 files changed, 10 insertions(+)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index d122980..ce92bac 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -4620,3 +4620,12 @@ BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action,
FIXME( "%p %x %d %p\n", hwnd, message, action, changefilter );
return TRUE;
}
+
+/******************************************************************
+ * SetCoalescableTimer (USER32.@)
+ */
+UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance )
+{
+ FIXME( "%p %lx %u %p %u: semi-stub\n", hwnd, id, timeout, proc, tolerance );
+ return SetTimer( hwnd, id, timeout, proc );
+}
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 9b409df..163ae46 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -620,6 +620,7 @@
@ stdcall SetClassWord(long long long)
@ stdcall SetClipboardData(long long)
@ stdcall SetClipboardViewer(long)
+@ stdcall SetCoalescableTimer(long long long ptr long)
# @ stub SetConsoleReserveKeys
@ stdcall SetCursor(long)
@ stub SetCursorContents
--
2.6.1

1
patches/user32-SetCoalescableTimer/definition
View File

@ -1 +0,0 @@
Fixes: [39509] Add stub for SetCoalescableTimer