- Wine-Devel - list.winehq.org

[PATCH 1/2] oleaut32: Fix handling of hexadecimal/octal numbers in VarParseNumFromStr().
by Francois Gouget Aug. 10, 2021

Aug. 10, 2021

They are incompatible with decimal numbers and currencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 6 +----- dlls/oleaut32/variant.c | 5 +++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f6149005179..42e269eccb3 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1654,12 +1654,10 @@ static void test_VarParseNumFromStrEn(void) /* With flag, currency amounts cannot be in hexadecimal */ CONVERT("$&ha", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); - todo_wine EXPECTFAIL; + EXPECTFAIL; CONVERT("&ha$", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_CURRENCY,NUMPRS_HEX_OCT,3,4,0); - todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,10); EXPECTRGB(1,FAILDIG); @@ -1797,9 +1795,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, incompatible with NUMPRS_HEX_OCT */ CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); - todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECT2(1,FAILDIG); /* With flag, even if it sort of looks like an exponent */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 09c6f9dcad6..a3931bb1280 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1709,7 +1709,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla break; } - if (!(pNumprs->dwOutFlags & NUMPRS_DECIMAL)) + if (!(pNumprs->dwOutFlags & (NUMPRS_CURRENCY|NUMPRS_DECIMAL))) { if ((*lpszStr == '&' && (*(lpszStr+1) == 'H' || *(lpszStr+1) == 'h')) && pNumprs->dwInFlags & NUMPRS_HEX_OCT) @@ -1858,7 +1858,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla } else if ((*lpszStr == 'e' || *lpszStr == 'E') && pNumprs->dwInFlags & NUMPRS_EXPONENT && - !(pNumprs->dwOutFlags & NUMPRS_EXPONENT)) + !(pNumprs->dwOutFlags & (NUMPRS_HEX_OCT|NUMPRS_CURRENCY|NUMPRS_EXPONENT))) { dwState |= B_PROCESSING_EXPONENT; pNumprs->dwOutFlags |= NUMPRS_EXPONENT; @@ -2006,6 +2006,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla pNumprs->dwOutFlags |= NUMPRS_NEG; } else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT) && wcsncmp(lpszStr, chars.sCurrency, chars.sCurrencyLen) == 0) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; -- 2.20.1

1 1

[tools] winetest/build-patterns: Allow expanding a test's pattern.
by Francois Gouget Aug. 10, 2021

Aug. 10, 2021

When some lines are omitted from a test pattern (either because they are reruns or the specific report was explicitly deselected), add a button to toggle showing / hiding them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 2 +- winetest/patterns.js | 80 +++++++++++++++++++++++++++++++++++++---- winetest/report.css | 4 +++ 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 474fa1ffc..a11c3de10 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1243,7 +1243,7 @@ sub write_patterns_list($$$$) my $tooltip = $list->{title} ? " title='$list->{title}'" : ""; $title = "<a href='tests/$testname.html'$tooltip>$testname</a>"; } - print $html "<div class='updownbar'>$title"; + print $html "<div class='updownbar'>$title <a class='expandtest'></a>"; print $html "<div class='ralign'>"; if ($mainpage) { diff --git a/winetest/patterns.js b/winetest/patterns.js index 4876113fa..be583a5f0 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -21,6 +21,47 @@ var hide_reruns; var groups; var cbs; +var tests; + +function enableExpandButton(test) +{ + test.domexpand.innerHTML = '[+]'; + test.domexpand.title = "Remove filters"; + test.domexpand.style.display = "inline-block"; +} + +function expandTest(test) +{ + test.patlines.forEach(patline => { + patline.dom.style.display = patline.display; + }); + test.domexpand.innerHTML = '[-]'; + test.domexpand.title = "Apply filters"; + test.domexpand.style.display = "inline-block"; + test.expanded = true; +} + +function reduceTest(test) +{ + test.patlines.forEach(patline => { + if (!patline.cb.checked) + patline.dom.style.display = 'none'; + }); + enableExpandButton(test); +} + +function toggleTest(e) +{ + const domtest = e.target.closest("div.testfile"); + const test = tests[domtest.id]; + if (test) + { + if (e.target.innerHTML == '[+]') + expandTest(test); + else + reduceTest(test); + } +} function refreshPage(changes, rerun_checked) { @@ -49,6 +90,12 @@ function refreshPage(changes, rerun_checked) hide_reruns = rerun_checked; } + for (let key in tests) + { + if (tests[key].expanded) + reduceTest(tests[key]); + } + for (let key in changes) { const cb = cbs[key]; @@ -60,8 +107,11 @@ function refreshPage(changes, rerun_checked) cb.patlines.forEach(patline => { patline.dom.style.display = patline.display; const test = patline.test; - if (++test.linecount == 1 && test.id != "summary") + test.linecount++; + if (test.linecount == 1 && test.id != "summary") test.dom.style.display = test.display; + if (test.linecount == test.patlines.length) + test.domexpand.style.display = "none"; }); } else @@ -69,8 +119,11 @@ function refreshPage(changes, rerun_checked) cb.patlines.forEach(patline => { patline.dom.style.display = "none"; const test = patline.test; - if (--test.linecount == 0 && test.id != "summary") + test.linecount--; + if (test.linecount == 0 && test.id != "summary") test.dom.style.display = "none"; + if (test.linecount == test.patlines.length - 1) + enableExpandButton(test); }); } @@ -138,24 +191,37 @@ function init() domcb.addEventListener('click', toggledReportCB); }); + tests = {}; document.querySelectorAll("div.testfile").forEach(domtest => { + const domexpand = domtest.querySelector("a.expandtest"); + domexpand.addEventListener('click', toggleTest); + const test = { id: domtest.id, dom: domtest, display: domtest.style.display, - linecount: 0 + domexpand: domexpand, + patlines: [], + linecount: 0, + expanded: false }; + tests[domtest.id] = test; domtest.querySelectorAll("div.patline").forEach(domline => { const cb = cbs[domline.getAttribute("data-id")]; if (cb) { - cb.patlines.push({ dom: domline, - display: domline.style.display, - test: test - }); + const patline = { dom: domline, + display: domline.style.display, + cb: cb, + test: test + }; + cb.patlines.push(patline); + test.patlines.push(patline); if (cb.checked) test.linecount++; } }); + if (test.linecount < test.patlines.length) + enableExpandButton(test); }); /* When reloading a page the browser may preserve the checkbox state diff --git a/winetest/report.css b/winetest/report.css index d42e05d8d..be49a0523 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -78,6 +78,10 @@ table.output td { .disabled { color: grey; } +.expandtest { + display: none; + font-family: monospace; +} .pattern { display: inline-block; -- 2.20.1

1 0

[PATCH 9/9] gdi32: Use ntgdi name for GetTextCharsetInfo.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/uniscribe/shape.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 8/9] gdi32: Remove no longer used driver entry points.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

1 0

[PATCH 6/9] gdi32: Handle metafiles directly in OffsetViewportOrgEx.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 22 ---------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 25 ------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 22 insertions(+), 53 deletions(-)

1 0

[PATCH 5/9] gdi32: Handle metafiles directly in SetWindowOrgEx.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 25 insertions(+), 42 deletions(-)

1 0

[PATCH 4/9] gdi32: Handle metafiles directly in SetWindowExtEx.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++ dlls/gdi32/mapping.c | 32 ---------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 27 insertions(+), 48 deletions(-)

1 0

[PATCH 3/9] gdi32: Handle metafiles directly in SetViewportOrgEx.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 25 insertions(+), 42 deletions(-)

1 0

[PATCH 2/9] gdi32: Handle metafiles directly in SetViewportExtEx.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

1 0

[PATCH 1/9] gdi32: Store virtual resolution and size in DC_ATTR.
by Jacek Caban Aug. 9, 2021

Aug. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 6 ++---- dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 2 -- include/ntgdi.h | 2 ++ 4 files changed, 10 insertions(+), 12 deletions(-)

1 0