- Wine-Devel - list.winehq.org

[PATCH] winevulkan: Update to VK spec version 1.2.154.
by Liam Middlebrook Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5261c35360..1f9bdc156c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.149" +VK_XML_VERSION = "1.2.154" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.28.0

1 0

Wine and mingw-w64 cooperation?
by Fabian Maurer Sept. 21, 2020

Sept. 21, 2020

Hello, I'm curious, is there any news on this front? Regards, Fabian Maurer

3 2

[PATCH] winapi_test: Remove wininet DECL_WINELIB_TYPE_AW(...) types
by Serge Gautherie Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/tests.dat | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 0e35110..8a3120d 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1613,50 +1613,37 @@ wininet.h %type -GOPHER_ABSTRACT_ATTRIBUTE_TYPE GOPHER_ABSTRACT_ATTRIBUTE_TYPEA GOPHER_ABSTRACT_ATTRIBUTE_TYPEW -GOPHER_ADMIN_ATTRIBUTE_TYPE GOPHER_ADMIN_ATTRIBUTE_TYPEA GOPHER_ADMIN_ATTRIBUTE_TYPEW -GOPHER_ASK_ATTRIBUTE_TYPE GOPHER_ASK_ATTRIBUTE_TYPEA GOPHER_ASK_ATTRIBUTE_TYPEW -GOPHER_ATTRIBUTE_ENUMERATOR GOPHER_ATTRIBUTE_ENUMERATORA GOPHER_ATTRIBUTE_ENUMERATORW -GOPHER_ATTRIBUTE_TYPE GOPHER_ATTRIBUTE_TYPEA GOPHER_ATTRIBUTE_TYPEW -GOPHER_FIND_DATA GOPHER_FIND_DATAA GOPHER_FIND_DATAW GOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE -GOPHER_LOCATION_ATTRIBUTE_TYPE GOPHER_LOCATION_ATTRIBUTE_TYPEA GOPHER_LOCATION_ATTRIBUTE_TYPEW GOPHER_MOD_DATE_ATTRIBUTE_TYPE -GOPHER_ORGANIZATION_ATTRIBUTE_TYPE GOPHER_ORGANIZATION_ATTRIBUTE_TYPEA GOPHER_ORGANIZATION_ATTRIBUTE_TYPEW -GOPHER_PROVIDER_ATTRIBUTE_TYPE GOPHER_PROVIDER_ATTRIBUTE_TYPEA GOPHER_PROVIDER_ATTRIBUTE_TYPEW GOPHER_SCORE_ATTRIBUTE_TYPE GOPHER_SCORE_RANGE_ATTRIBUTE_TYPE -GOPHER_SITE_ATTRIBUTE_TYPE GOPHER_SITE_ATTRIBUTE_TYPEA GOPHER_SITE_ATTRIBUTE_TYPEW GOPHER_TIMEZONE_ATTRIBUTE_TYPE GOPHER_TTL_ATTRIBUTE_TYPE -GOPHER_UNKNOWN_ATTRIBUTE_TYPE GOPHER_UNKNOWN_ATTRIBUTE_TYPEA GOPHER_UNKNOWN_ATTRIBUTE_TYPEW GOPHER_VERONICA_ATTRIBUTE_TYPE -GOPHER_VERSION_ATTRIBUTE_TYPE GOPHER_VERSION_ATTRIBUTE_TYPEA GOPHER_VERSION_ATTRIBUTE_TYPEW -GOPHER_VIEW_ATTRIBUTE_TYPE GOPHER_VIEW_ATTRIBUTE_TYPEA GOPHER_VIEW_ATTRIBUTE_TYPEW GROUPID -- 2.10.0.windows.1

2 1

[PATCH] conhost/tests: Fix the spelling of a comment message.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/conhost/tests/tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 369199a127b..27912aa1889 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -923,7 +923,7 @@ static void test_tty_output(void) expect_output_sequence("\x1b[32m"); /* foreground black */ expect_output_sequence("\x1b[1;8H"); /* set cursor */ expect_output_sequence("0"); - expect_output_sequence("\x1b[41m"); /* backgorund red */ + expect_output_sequence("\x1b[41m"); /* background red */ expect_output_sequence("1"); expect_output_sequence("\x1b[30m"); /* foreground black */ expect_output_sequence("2"); -- 2.20.1

2 1

[PATCH] vbscript: Fix the spelling of the delimiter* variables.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/vbscript/global.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 92288fcd88d..1231beee8e6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2316,8 +2316,8 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimeter = NULL; - int count, max, mode, len, start, end, ret, delimeterlen = 1; + BSTR str, string, delimiter = NULL; + int count, max, mode, len, start, end, ret, delimiterlen = 1; int i,*indices = NULL, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; @@ -2342,13 +2342,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, if(args_cnt > 1) { if(V_VT(args+1) != VT_BSTR) { - hres = to_string(args+1, &delimeter); + hres = to_string(args+1, &delimiter); if(FAILED(hres)) goto error; }else { - delimeter = V_BSTR(args+1); + delimiter = V_BSTR(args+1); } - delimeterlen = SysStringLen(delimeter); + delimiterlen = SysStringLen(delimiter); } if(args_cnt > 2) { @@ -2388,9 +2388,9 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, while(1) { ret = -1; - if (delimeterlen) { + if (delimiterlen) { ret = FindStringOrdinal(FIND_FROMSTART, string + start, len - start, - delimeter ? delimeter : L" ", delimeterlen, mode); + delimiter ? delimiter : L" ", delimiterlen, mode); } if (ret == -1) { @@ -2410,7 +2410,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, indices[count++] = end; if (ret == -1 || count == max) break; - start = start + ret + delimeterlen; + start = start + ret + delimiterlen; if (start > len) break; } @@ -2443,7 +2443,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, SafeArrayDestroy(sa); goto error; } - start = indices[i]+delimeterlen; + start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa); @@ -2459,7 +2459,7 @@ error: if(V_VT(args) != VT_BSTR) SysFreeString(string); if(V_VT(args+1) != VT_BSTR) - SysFreeString(delimeter); + SysFreeString(delimiter); return hres; } -- 2.20.1

2 1

[PATCH] ntdll: Fix the spelling of the arch_context_parameters variable.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/exception.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 17bbb26f9e8..a6b4b6a7baa 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -696,7 +696,7 @@ static const struct context_parameters ULONG flags_offset; const struct context_copy_range *copy_ranges; } -arch_context_paramaters[] = +arch_context_parameters[] = { {0x00100000, 0xd810005f, 0x4d0, 0x4d0, 0x20, 7, 0xf, 0x30, copy_ranges_amd64}, {0x00010000, 0xd801007f, 0x2cc, 0xcc, 0x18, 3, 0x3, 0, copy_ranges_x86}, @@ -706,10 +706,10 @@ static const struct context_parameters *context_get_parameters( ULONG context_fl { unsigned int i; - for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + for (i = 0; i < ARRAY_SIZE(arch_context_parameters); ++i) { - if (context_flags & arch_context_paramaters[i].arch_flag) - return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + if (context_flags & arch_context_parameters[i].arch_flag) + return context_flags & ~arch_context_parameters[i].supported_flags ? NULL : &arch_context_parameters[i]; } return NULL; } -- 2.20.1

2 1

[PATCH] gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.
by Arkadiusz Hiler Sept. 21, 2020

Sept. 21, 2020

Turns out GetGlyphOutlineW() is using only two bytes for the character, which is common for GDI font API. This limits us to chars in the range 0x0000 - 0xffff. Fixes eden* PLUS＋MOSAIC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45400 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/gdi32/font.c | 2 + dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/font.c | 54 ++++++++++++++++ dlls/gdi32/tests/resource.rc | 3 + dlls/gdi32/tests/wine_glyphoutlines.sfd | 79 ++++++++++++++++++++++++ dlls/gdi32/tests/wine_glyphoutlines.ttf | Bin 0 -> 1748 bytes 6 files changed, 139 insertions(+) create mode 100644 dlls/gdi32/tests/wine_glyphoutlines.sfd create mode 100644 dlls/gdi32/tests/wine_glyphoutlines.ttf diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e099bec5e81..0fa1722d621 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2905,6 +2905,8 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; + uChar &= 0xFFFF; + dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 8b722cfe5d2..acb2051c9f9 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -20,6 +20,7 @@ C_SRCS = \ FONT_SRCS = \ vertical.sfd \ + wine_glyphoutlines.sfd \ wine_longname.sfd \ wine_test.sfd \ wine_ttfnames.sfd \ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f5c8d4dac3b..f272a10f098 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6131,6 +6131,59 @@ static void check_vertical_metrics(const char *face) ReleaseDC(NULL, hdc); } +static void test_GetGlyphOutlineW_character_limited_to_a_word(void) +{ + char ttf_name[MAX_PATH]; + HFONT hfont, hfont_old; + LOGFONTA lf; + HDC hdc; + DWORD num, ret; + GLYPHMETRICS gm1, gm2; + + if (!write_ttf_file("wine_glyphoutlines.ttf", ttf_name)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + num = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(num == 1, "AddFontResourceExA should add 1 fonts from vertical.ttf\n"); + + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "WineTestGlyphOutlines"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + hfont_old = SelectObject(hdc, hfont); + + /* the font has two glyph with different metrics - .notdef and 0x10000 */ + + ret = GetGlyphOutlineW(hdc, 'A', GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed with %d, lest error %d\n", ret, GetLastError()); + + ret = GetGlyphOutlineW(hdc, 0x10000, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed with %d, lest error %d\n", ret, GetLastError()); + + /* we shouldn't be able to use 0x10000 and isntead get the .notdef */ + ok(gm1.gmBlackBoxX == gm2.gmBlackBoxX, "gmBlackBoxX differs, %d should equal %d\n", gm1.gmBlackBoxX, gm2.gmBlackBoxX); + ok(gm1.gmBlackBoxY == gm2.gmBlackBoxY, "gmBlackBoxY differs, %d should equal %d\n", gm1.gmBlackBoxY, gm2.gmBlackBoxY); + ok(gm1.gmptGlyphOrigin.x == gm2.gmptGlyphOrigin.x, "gmptGlyphOrigin.x differs, %d should equal %d\n", gm1.gmptGlyphOrigin.x, gm2.gmptGlyphOrigin.x); + ok(gm1.gmptGlyphOrigin.y == gm2.gmptGlyphOrigin.y, "gmptGlyphOrigin.y difference, %d should equal %d\n", gm1.gmptGlyphOrigin.y, gm2.gmptGlyphOrigin.y); + ok(gm1.gmCellIncX == gm2.gmCellIncX, "gmCellIncX differs, %d should equal %d\n", gm1.gmCellIncX, gm2.gmCellIncX); + ok(gm1.gmCellIncY == gm2.gmCellIncY, "gmCellIncY differs, %d should equal %d\n", gm1.gmCellIncY, gm2.gmCellIncY); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + + DeleteDC(hdc); + + ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); + DeleteFileA(ttf_name); +} + static void test_vertical_font(void) { char ttf_name[MAX_PATH]; @@ -7396,6 +7449,7 @@ START_TEST(font) test_RealizationInfo(); test_GetTextFace(); test_GetGlyphOutline(); + test_GetGlyphOutlineW_character_limited_to_a_word(); test_GetTextMetrics2("Tahoma", -11); test_GetTextMetrics2("Tahoma", -55); test_GetTextMetrics2("Tahoma", -110); diff --git a/dlls/gdi32/tests/resource.rc b/dlls/gdi32/tests/resource.rc index b5a6107a987..c47f4bb87f9 100644 --- a/dlls/gdi32/tests/resource.rc +++ b/dlls/gdi32/tests/resource.rc @@ -37,3 +37,6 @@ wine_ttfnames.ttf RCDATA wine_ttfnames.ttf /* @makedep: wine_ttfnames_bold.ttf */ wine_ttfnames_bold.ttf RCDATA wine_ttfnames_bold.ttf + +/* @makedep: wine_glyphoutlines.ttf */ +wine_glyphoutlines.ttf RCDATA wine_glyphoutlines.ttf diff --git a/dlls/gdi32/tests/wine_glyphoutlines.sfd b/dlls/gdi32/tests/wine_glyphoutlines.sfd new file mode 100644 index 00000000000..20bd8427b84 --- /dev/null +++ b/dlls/gdi32/tests/wine_glyphoutlines.sfd @@ -0,0 +1,79 @@ +SplineFontDB: 3.2 +FontName: WineTestGlyphOutlines +FullName: WineTestGlyphOutlines +FamilyName: wine_glyphoutlines +Weight: Regular +Copyright: Copyright (c) 2020, Arkadiusz Hiler +UComments: "2020-9-21: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -100 +UnderlineWidth: 50 +Ascent: 800 +Descent: 200 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 +XUID: [1021 1016 2035354264 8878123] +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1600686238 +ModificationTime: 1600688343 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 0 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +OS2Vendor: 'PfEd' +DEI: 91125 +Encoding: UnicodeFull +Compacted: 1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 0 25 20 +BeginChars: 1114112 2 + +StartChar: u10000 +Encoding: 65536 65536 0 +Width: 2000 +Flags: HW +LayerCount: 2 +Fore +SplineSet +847 687 m 25 + 205 129 l 1053 +70 753 m 25 + 934 75 l 1049 +1847 687 m 25 + 1205 129 l 1053 +1070 753 m 25 + 1934 75 l 1049 +EndSplineSet +EndChar + +StartChar: .notdef +Encoding: 0 0 1 +Width: 120 +Flags: HWO +LayerCount: 2 +Fore +SplineSet +66 714 m 29 + 64 92 l 1053 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/dlls/gdi32/tests/wine_glyphoutlines.ttf b/dlls/gdi32/tests/wine_glyphoutlines.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2b72ddaf559bfcbbda82e2073767eb978792fa1f GIT binary patch literal 1748 zcmds1O>YxN7=C7U?R-IsfL1*~G?W}5Bw_7CL(a)0*@5+^F4M354QB8A0XY>SO|Yp>NL z2k5CpRh!aCRQv#XE#iR4f%c3zAta=>^uUo5C=wha^UUrTLQAFg+IKac=Y8h=nh(Da z0Jh>QSeVS^rcSPYck?!oUL(6}Y-BWt{b;9tgL>D*>4VwNC-cjII7|I}e%=kS+y0IE zeU7D~TMHWvMnd`;*ISGJ;>B|>J{bk9N$OK2&n<Md{`w>FpBw`v677GqD*EoE-d&oH z7TT`kYw9}xHb2O_7{JH$AEDkp?=FP+3>{oQL|s+fdGE!}#|OB66Oe0RP>bB>1HUu> zEY~y8d*kT-zSJ(a)I!I4+!u%3~@la;})WFDTz5RSL3$aU(ikea2?hs<%zv^>;m%Ss$c z!=~6VW7EfuDeWm(a)ZpfI}cDJ~O6eE2j?~(g9nZ;9N1g#}fJSQWXXo{M=I9kARgJP-1 zA<W42#vLx|y);EpTfmT3#Yxup5II8T(r1re4qep=;}en9-o2c8m*j0I&Nja|D({RE z|0Y?sXdV0FUtQ{E(H4mnbBT0Q;jHc6wSBv|Il})DZ-M(a)L;<FjTERM<t`jmE9N2PqQ zu}a?N9VIVK(a)E%fV0osJsCM{u2Y+Sx-owt67CwXh*kqkFxWFeW8)9S>}=G1|`7&lm8 zJ5~*rjCjXji*Ia?!8Se=R}4;Jo49Lmn*2-sGVC^{(C;U~0^RTpmgvM!23xp*UktX< zBTgHff)dvaPLscnV+asp5ml5?L<tcT-%_5PL?H_&9=*iFw73Kp1=`h7!xFi1Vjmt? za4ZNHtL0)TQv34zRo2Nmy=u66$t{%YwIwxP_B|SXN&5=z=a|W7&XD;6MvJH=D>WLG zE8ZNNQCJG<kxzx(DLNHt=(7OEIpr1WzDtm!dxh?LuF}Gbi|%LH3WqtSP1q@})Mz*M zChf#u(kAv<wxK=@ax}M&Tu_N}LAB_qY`>!pt7%p=<<+7wUEzeOkbE}NH`u55jsK7p z?~MkWVZBvWT#omrxF3g=>3!)>(ZH+L%0WdrPNv^+95VlYtN)bLbOZLUEZ^7PMRzFy sDP+2yVNPyTi(n^`@hjDR=pzoTS^ACfU-Y)e2x2_>qUY0i-qh1y19@)s4*&oF literal 0 HcmV?d00001 -- 2.28.0

2 1

[PATCH] ntdll/tests: Fix the spelling of a couple of ok_() messages.
by Francois Gouget Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c26cfb4a111..66dbe8089c3 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7437,12 +7437,12 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B if (flag & flags && p[i] != 0xcc) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } else if (!(flag & flags) && p[i] != 0xdd) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } } -- 2.20.1

1 0

[PATCH 1/3] winegstreamer: Add a GstPad wrapping the media source's bytestream.
by Derek Lesho Sept. 21, 2020

Sept. 21, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/gst_cbs.c | 58 ++++++++ dlls/winegstreamer/gst_cbs.h | 12 +- dlls/winegstreamer/main.c | 3 + dlls/winegstreamer/media_source.c | 219 +++++++++++++++++++++++++++++- 4 files changed, 288 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index bf7103b1606..8f48368c96a 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -49,6 +49,8 @@ static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) if (cbdata->type < GSTDEMUX_MAX) perform_cb_gstdemux(cbdata); + else if (cbdata->type < MEDIA_SOURCE_MAX) + perform_cb_media_source(cbdata); pthread_mutex_lock(&cbdata->lock); cbdata->finished = 1; @@ -301,3 +303,59 @@ gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) return cbdata.u.query_sink_data.ret; } + +GstFlowReturn pull_from_bytestream_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, + GstBuffer **buf) +{ + struct cb_data cbdata = { PULL_FROM_BYTESTREAM }; + + cbdata.u.getrange_data.pad = pad; + cbdata.u.getrange_data.parent = parent; + cbdata.u.getrange_data.ofs = ofs; + cbdata.u.getrange_data.len = len; + cbdata.u.getrange_data.buf = buf; + + call_cb(&cbdata); + + return cbdata.u.getrange_data.ret; +} + +gboolean query_bytestream_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) +{ + struct cb_data cbdata = { QUERY_BYTESTREAM }; + + cbdata.u.query_function_data.pad = pad; + cbdata.u.query_function_data.parent = parent; + cbdata.u.query_function_data.query = query; + + call_cb(&cbdata); + + return cbdata.u.query_function_data.ret; +} + +gboolean activate_bytestream_pad_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) +{ + struct cb_data cbdata = { ACTIVATE_BYTESTREAM_PAD_MODE }; + + cbdata.u.activate_mode_data.pad = pad; + cbdata.u.activate_mode_data.parent = parent; + cbdata.u.activate_mode_data.mode = mode; + cbdata.u.activate_mode_data.activate = activate; + + call_cb(&cbdata); + + return cbdata.u.activate_mode_data.ret; +} + +gboolean process_bytestream_pad_event_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct cb_data cbdata = { PROCESS_BYTESTREAM_PAD_EVENT }; + + cbdata.u.event_src_data.pad = pad; + cbdata.u.event_src_data.parent = parent; + cbdata.u.event_src_data.event = event; + + call_cb(&cbdata); + + return cbdata.u.event_src_data.ret; +} diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4725f23ad1a..10e999feea7 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -43,7 +43,12 @@ enum CB_TYPE { AUTOPLUG_BLACKLIST, UNKNOWN_TYPE, QUERY_SINK, - GSTDEMUX_MAX + GSTDEMUX_MAX, + PULL_FROM_BYTESTREAM, + QUERY_BYTESTREAM, + ACTIVATE_BYTESTREAM_PAD_MODE, + PROCESS_BYTESTREAM_PAD_EVENT, + MEDIA_SOURCE_MAX, }; struct cb_data { @@ -138,6 +143,7 @@ struct cb_data { void mark_wine_thread(void) DECLSPEC_HIDDEN; void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; +void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; @@ -154,5 +160,9 @@ GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; +GstFlowReturn pull_from_bytestream_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; +gboolean query_bytestream_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; +gboolean activate_bytestream_pad_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; +gboolean process_bytestream_pad_event_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; #endif diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 2872710b3e2..4ca371d58bd 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -146,6 +146,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + if (!init_gstreamer()) + return CLASS_E_CLASSNOTAVAILABLE; + if (SUCCEEDED(hr = mfplat_get_class_object(clsid, iid, out))) return hr; diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 84ecf305d4c..6b3bd4a7869 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -17,7 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <gst/gst.h> + #include "gst_private.h" +#include "gst_cbs.h" #include <stdarg.h> @@ -27,6 +32,7 @@ #include "mfapi.h" #include "mferror.h" #include "mfidl.h" +#include "mfobjects.h" #include "wine/debug.h" #include "wine/heap.h" @@ -39,6 +45,8 @@ struct media_source IMFMediaSource IMFMediaSource_iface; LONG ref; IMFMediaEventQueue *event_queue; + IMFByteStream *byte_stream; + GstPad *my_src; enum { SOURCE_OPENING, @@ -52,6 +60,154 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); } +GstFlowReturn pull_from_bytestream(GstPad *pad, GstObject *parent, guint64 ofs, guint len, + GstBuffer **buf) +{ + struct media_source *source = gst_pad_get_element_private(pad); + IMFByteStream *byte_stream = source->byte_stream; + ULONG bytes_read; + GstMapInfo info; + BOOL is_eof; + HRESULT hr; + + TRACE("gstreamer requesting %u bytes at %s from source %p into buffer %p\n", len, wine_dbgstr_longlong(ofs), source, buf); + + if (ofs != GST_BUFFER_OFFSET_NONE) + { + if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) + return GST_FLOW_ERROR; + } + + if (FAILED(IMFByteStream_IsEndOfStream(byte_stream, &is_eof))) + return GST_FLOW_ERROR; + if (is_eof) + return GST_FLOW_EOS; + + if (!(*buf)) + *buf = gst_buffer_new_and_alloc(len); + gst_buffer_map(*buf, &info, GST_MAP_WRITE); + hr = IMFByteStream_Read(byte_stream, info.data, len, &bytes_read); + gst_buffer_unmap(*buf, &info); + + gst_buffer_set_size(*buf, bytes_read); + + if (FAILED(hr)) + { + return GST_FLOW_ERROR; + } + GST_BUFFER_OFFSET(*buf) = ofs; + return GST_FLOW_OK; +} + +static gboolean query_bytestream(GstPad *pad, GstObject *parent, GstQuery *query) +{ + struct media_source *source = gst_pad_get_element_private(pad); + GstFormat format; + QWORD bytestream_len; + + TRACE("GStreamer queries source %p for %s\n", source, GST_QUERY_TYPE_NAME(query)); + + if (FAILED(IMFByteStream_GetLength(source->byte_stream, &bytestream_len))) + return FALSE; + + switch (GST_QUERY_TYPE(query)) + { + case GST_QUERY_DURATION: + { + gst_query_parse_duration (query, &format, NULL); + if (format == GST_FORMAT_PERCENT) { + gst_query_set_duration (query, GST_FORMAT_PERCENT, GST_FORMAT_PERCENT_MAX); + return TRUE; + } + else if (format == GST_FORMAT_BYTES) + { + QWORD length; + IMFByteStream_GetLength(source->byte_stream, &length); + gst_query_set_duration (query, GST_FORMAT_BYTES, length); + return TRUE; + } + return FALSE; + } + case GST_QUERY_SEEKING: + { + gst_query_parse_seeking (query, &format, NULL, NULL, NULL); + if (format != GST_FORMAT_BYTES) + { + WARN("Cannot seek using format \"%s\".\n", gst_format_get_name(format)); + return FALSE; + } + gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, bytestream_len); + return TRUE; + } + case GST_QUERY_SCHEDULING: + { + gst_query_set_scheduling(query, GST_SCHEDULING_FLAG_SEEKABLE, 1, -1, 0); + gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); + return TRUE; + } + case GST_QUERY_CAPS: + { + GstStaticCaps any = GST_STATIC_CAPS_ANY; + GstCaps *caps, *filter; + + caps = gst_static_caps_get(&any); + gst_query_parse_caps(query, &filter); + + if (filter) { + GstCaps* filtered; + filtered = gst_caps_intersect_full( + filter, caps, GST_CAPS_INTERSECT_FIRST); + gst_caps_unref(caps); + caps = filtered; + } + gst_query_set_caps_result(query, caps); + gst_caps_unref(caps); + return TRUE; + } + default: + { + WARN("Unhandled query type %s\n", GST_QUERY_TYPE_NAME(query)); + return FALSE; + } + } +} + +static gboolean activate_bytestream_pad_mode(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) +{ + struct media_source *source = gst_pad_get_element_private(pad); + + TRACE("%s source pad for mediasource %p in %s mode.\n", + activate ? "Activating" : "Deactivating", source, gst_pad_mode_get_name(mode)); + + switch (mode) { + case GST_PAD_MODE_PULL: + return TRUE; + default: + return FALSE; + } + return FALSE; +} + +static gboolean process_bytestream_pad_event(GstPad *pad, GstObject *parent, GstEvent *event) +{ + struct media_source *source = gst_pad_get_element_private(pad); + + TRACE("source %p, type \"%s\".\n", source, GST_EVENT_TYPE_NAME(event)); + + switch (event->type) { + /* the seek event should fail in pull mode */ + case GST_EVENT_SEEK: + return FALSE; + default: + WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + case GST_EVENT_TAG: + case GST_EVENT_QOS: + case GST_EVENT_RECONFIGURE: + return gst_pad_event_default(pad, parent, event); + } + return TRUE; +} + static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) { struct media_source *source = impl_from_IMFMediaSource(iface); @@ -211,8 +367,12 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) source->state = SOURCE_SHUTDOWN; + if (source->my_src) + gst_object_unref(GST_OBJECT(source->my_src)); if (source->event_queue) IMFMediaEventQueue_Shutdown(source->event_queue); + if (source->byte_stream) + IMFByteStream_Release(source->byte_stream); return S_OK; } @@ -236,19 +396,34 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { + GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( + "mf_src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + struct media_source *object = heap_alloc_zero(sizeof(*object)); HRESULT hr; if (!object) return E_OUTOFMEMORY; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->ref = 1; + object->byte_stream = bytestream; + IMFByteStream_AddRef(bytestream); + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; - object->state = SOURCE_STOPPED; + object->my_src = gst_pad_new_from_static_template(&src_template, "mf-src"); + gst_pad_set_element_private(object->my_src, object); + gst_pad_set_getrange_function(object->my_src, pull_from_bytestream_wrapper); + gst_pad_set_query_function(object->my_src, query_bytestream_wrapper); + gst_pad_set_activatemode_function(object->my_src, activate_bytestream_pad_mode_wrapper); + gst_pad_set_event_function(object->my_src, process_bytestream_pad_event_wrapper); - object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; - object->ref = 1; + object->state = SOURCE_STOPPED; *out_media_source = object; return S_OK; @@ -717,3 +892,41 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) return hr; } + +/* helper for callback forwarding */ +void perform_cb_media_source(struct cb_data *cbdata) +{ + switch(cbdata->type) + { + case PULL_FROM_BYTESTREAM: + { + struct getrange_data *data = &cbdata->u.getrange_data; + cbdata->u.getrange_data.ret = pull_from_bytestream(data->pad, data->parent, + data->ofs, data->len, data->buf); + break; + } + case QUERY_BYTESTREAM: + { + struct query_function_data *data = &cbdata->u.query_function_data; + cbdata->u.query_function_data.ret = query_bytestream(data->pad, data->parent, data->query); + break; + } + case ACTIVATE_BYTESTREAM_PAD_MODE: + { + struct activate_mode_data *data = &cbdata->u.activate_mode_data; + cbdata->u.activate_mode_data.ret = activate_bytestream_pad_mode(data->pad, data->parent, data->mode, data->activate); + break; + } + case PROCESS_BYTESTREAM_PAD_EVENT: + { + struct event_src_data *data = &cbdata->u.event_src_data; + cbdata->u.event_src_data.ret = process_bytestream_pad_event(data->pad, data->parent, data->event); + break; + } + default: + { + ERR("Wrong callback forwarder called\n"); + return; + } + } +} -- 2.28.0

3 29

[PATCH vkd3d 5/5] vkd3d-compiler: Allow the --formatting option to modify individual flags.
by Henri Verbeet Sept. 21, 2020

Sept. 21, 2020

Instead of replacing all of them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index cc3a105e..5f4f9db1 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -147,10 +147,11 @@ static void print_usage(const char *program_name) " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" " output file is specified, output will be written to\n" " standard output.\n" - " --formatting=<type> Specify the formatting options for text output.\n" - " Valid values are 'none', 'print', 'colour', 'indent',\n" - " 'offsets', 'header', and 'raw-ids'.\n" - " Default is --formatting=indent,header.\n" + " --formatting=<flags> Specify the formatting options for text output.\n" + " <flags> is a comma separated list of formatting flags,\n" + " optionally prefixed by '+' or '-'. Valid flags are\n" + " 'colour', 'indent', 'offsets', 'header', and 'raw-ids'.\n" + " The 'indent' and 'header' flags are enabled by default.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" @@ -235,7 +236,6 @@ static bool parse_formatting(uint32_t *formatting, char *arg) } opts[] = { - {"none", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE}, {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR}, {"indent", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT}, {"offsets", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS}, @@ -246,12 +246,27 @@ static bool parse_formatting(uint32_t *formatting, char *arg) for (tok = strtok(arg, ","); tok; tok = strtok(NULL, ",")) { + bool set = true; unsigned int i; + + if (*tok == '-') + { + set = false; + ++tok; + } + else if (*tok == '+') + { + ++tok; + } + for (i = 0; i < ARRAY_SIZE(opts); ++i) { if (!strcmp(tok, opts[i].name)) { - *formatting |= opts[i].value; + if (set) + *formatting |= opts[i].value; + else + *formatting &= ~opts[i].value; break; } } @@ -335,8 +350,9 @@ static bool validate_target_type( static bool parse_command_line(int argc, char **argv, struct options *options) { + enum vkd3d_shader_compile_option_formatting_flags formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; enum vkd3d_shader_compile_option_buffer_uav buffer_uav; - enum vkd3d_shader_compile_option_formatting_flags formatting = 0; int option; static struct option long_options[] = @@ -388,7 +404,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) case OPTION_TEXT_FORMATTING: if (!parse_formatting(&formatting, optarg)) return false; - add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, formatting); break; case OPTION_PRINT_SOURCE_TYPES: @@ -432,6 +447,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, formatting); if (optind < argc) options->filename = argv[argc - 1]; -- 2.11.0

2 1