August 2020 - Wine-commits - list.winehq.org

Robert Wilhelm : vbscript: Implement Split.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: d50f5f67c7b143ebc92d206ab78110da5a3efc4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d50f5f67c7b143ebc92d206a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Aug 24 11:43:57 2020 +0200 vbscript: Implement Split. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47570 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 149 +++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 65 +++++++++++++++++++ 2 files changed, 211 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 122f5c7b71..00f74104de 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2291,10 +2291,153 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V return E_NOTIMPL; } -static HRESULT Global_Split(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, string, delimeter = NULL; + int count, max, mode, len, start, end, ret, delimeterlen = 1; + int i,*indices = NULL, indices_max = 8; + SAFEARRAYBOUND bounds; + SAFEARRAY *sa = NULL; + VARIANT *data, var; + HRESULT hres = S_OK; + + TRACE("%s %u...\n", debugstr_variant(args), args_cnt); + + assert(1 <= args_cnt && args_cnt <= 4); + + if(V_VT(args) == VT_NULL || (args_cnt > 1 && V_VT(args+1) == VT_NULL) || (args_cnt > 2 && V_VT(args+2) == VT_NULL) + || (args_cnt == 4 && V_VT(args+3) == VT_NULL)) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &string); + if(FAILED(hres)) + return hres; + }else { + string = V_BSTR(args); + } + + if(args_cnt > 1) { + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &delimeter); + if(FAILED(hres)) + goto error; + }else { + delimeter = V_BSTR(args+1); + } + delimeterlen = SysStringLen(delimeter); + } + + if(args_cnt > 2) { + hres = to_int(args+2, &max); + if(FAILED(hres)) + goto error; + if (max < -1) { + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + goto error; + } + }else { + max = -1; + } + + if(args_cnt == 4) { + hres = to_int(args+3, &mode); + if(FAILED(hres)) + goto error; + if (mode != 0 && mode != 1) { + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + goto error; + } + }else { + mode = 0; + } + + start = 0; + + len = SysStringLen(string); + count = 0; + + indices = heap_alloc( indices_max * sizeof(int)); + if(!indices) { + hres = E_OUTOFMEMORY; + goto error; + } + + while(1) { + ret = -1; + if (delimeterlen) { + ret = FindStringOrdinal(FIND_FROMSTART, string + start, len - start, + delimeter ? delimeter : L" ", delimeterlen, mode); + } + + if (ret == -1) { + end = len; + }else { + end = start + ret; + } + + if (count == indices_max) { + indices_max *= 2; + indices = heap_realloc( indices, indices_max * sizeof(int)); + if(!indices) { + hres = E_OUTOFMEMORY; + goto error; + } + } + indices[count++] = end; + + if (ret == -1 || count == max) break; + start = start + ret + delimeterlen; + if (start > len) break; + } + + bounds.lLbound = 0; + bounds.cElements = count; + sa = SafeArrayCreate( VT_VARIANT, 1, &bounds); + if (!sa) { + hres = E_OUTOFMEMORY; + goto error; + } + hres = SafeArrayAccessData(sa, (void**)&data); + if(FAILED(hres)) { + SafeArrayDestroy(sa); + goto error; + } + + start = 0; + for (i = 0; i < count; i++) { + str = SysAllocStringLen(string + start, indices[i] - start); + if (!str) { + hres = E_OUTOFMEMORY; + break; + } + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = str; + + hres = VariantCopyInd(data+i, &var); + if(FAILED(hres)) { + SafeArrayUnaccessData(sa); + SafeArrayDestroy(sa); + goto error; + } + start = indices[i]+delimeterlen; + } + SafeArrayUnaccessData(sa); + +error: + if(SUCCEEDED(hres) && res) { + V_VT(res) = VT_ARRAY|VT_VARIANT; + V_ARRAY(res) = sa; + }else { + if (sa) SafeArrayDestroy(sa); + } + + heap_free(indices); + if(V_VT(args) != VT_BSTR) + SysFreeString(string); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(delimeter); + return hres; } static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6af49c849d..787da7cd71 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -609,6 +609,71 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +x=Split("abc") +Call ok(x(0) = "abc", "Split(""abc"")(0)=" & x(0)) +x = Split("abc def") +Call ok(x(0) = "abc", "Split(""abc def"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def"")(1)=" & x(1)) +x = Split("abc def ghi") +Call ok(x(0) = "abc", "Split(""abc def ghi"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def ghi"")(1)=" & x(1)) +Call ok(x(2) = "ghi", "Split(""abc def ghi"")(2)=" & x(2)) +x = Split("abc def","") +Call ok(x(0) = "abc def", "Split(""abc def"","""")(0)=" & x(0)) +x = Split("abc-def","-") +Call ok(x(0) = "abc", "Split(""abc-def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc-def"",""-"")(1)=" & x(1)) +x = Split("abc--def","-") +Call ok(x(0) = "abc", "Split(""abc--def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "", "Split(""abc--def"",""-"")(1)=" & x(1)) +Call ok(x(2) = "def", "Split(""abc--def"",""-"")(2)=" & x(2)) +x = Split("abcdefghi","def") +Call ok(x(0) = "abc", "Split(""abcdefghi"",""def"")(0)=" & x(0)) +Call ok(x(1) = "ghi", "Split(""abcdefghi"",""def"")(1)=" & x(1)) +x = Split("12345",3) +Call ok(x(0) = "12", "Split(""12345"",3)(0)=" & x(0)) +Call ok(x(1) = "45", "Split(""12345"",3)(1)=" & x(1)) +x = Split("12345",5) +Call ok(x(0) = "1234", "Split(""12345"",5)(0)=" & x(0)) +Call ok(x(1) = "", "Split(""12345"",5)(1)=" & x(1)) +x = Split("12345",12) +Call ok(x(0) = "", "Split(""12345"",12)(0)=" & x(0)) +Call ok(x(1) = "345", "Split(""12345"",12)(1)=" & x(1)) +x = Split("abc-def-ghi","-") +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-""))=" & UBound(x)) +x = Split("a b c d e f g h i j k l m n o p q") +Call ok(UBound(x) = 16, "UBound(Split(""a b c d e f g h i j k l m n o p q""))=" & UBound(x)) +x = Split("abc-def-ghi","-",2) +Call ok(UBound(x) = 1, "UBound(Split(""abc-def-ghi"",""-"",2))=" & UBound(x)) +x = Split("abc-def-ghi","-",4) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",4))=" & UBound(x)) +x = Split("abc-def-ghi","-",-1) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",-1))=" & UBound(x)) +x = Split("abc-def-ghi","-",-1) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",-42))=" & UBound(x)) +x = Split("abcZdefZghi","Z",3,0) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""Z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,0) +Call ok(UBound(x) = 0, "UBound(Split(""abcZdefZghi"",""z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,1) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""z"",3,1))=" & UBound(x)) + +Sub testSplitError(arg1, arg2, arg3, arg4, error_num) + on error resume next + Dim x + + Call Err.clear() + x = Split(arg1, arg2, arg3, arg4) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +call testSplitError("abc-def-ghi", "-", -1, 2, 5) +call testSplitError("abc-def-ghi", "-", -42, 0, 5) +call testSplitError(null, "-", -1, 0, 94) +call testSplitError("abc-def-ghi", null, -1, 0, 94) +call testSplitError("abc-def-ghi", "-", null, 0, 94) +call testSplitError("abc-def-ghi", "-", -1, null, 94) + Sub TestStrComp(str_left, str_right, mode, ex) x = StrComp(str_left, str_right, mode) Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex)

1 0

Robert Wilhelm : vbscript: Implement IsArray.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: b72d8118da5456411cf9ddde458d7d4a7816d570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72d8118da5456411cf9ddde… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Aug 24 11:57:20 2020 +0200 vbscript: Implement IsArray. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 7 +++++-- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 00f74104de..d2fadb3422 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -961,8 +961,11 @@ static HRESULT Global_IsNumeric(BuiltinDisp *This, VARIANT *arg, unsigned args_c static HRESULT Global_IsArray(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + return return_bool(res, V_ISARRAY(arg)); } static HRESULT Global_IsObject(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 787da7cd71..6add0579e8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -223,6 +223,21 @@ arr(0) = 2 arr(1) = 3 Call ok(not isNumeric(arr), "isNumeric(arr) is not true?") +Call ok(isArray(arr), "isArray(arr) is not true?") +x = Array() +Call ok(isArray(arr), "isArray(Array()) is not true?") +Call ok(not isArray(Empty), "isArray(empty) is true?") +Call ok(not isArray(Null), "isArray(Null) is true?") +Call ok(not isArray(42), "isArray(42) is true?") +Call ok(not isArray(CSng(3242.4)), "isArray(CSng(3242.4)) is true?") +Call ok(not isArray(CCur(32768.4)), "isArray(CCur(32768.4)) is true?") +Call ok(not isArray("44"), "isArray(""44"") is true?") +Call ok(not isArray("rwrf"), "isArray(""rwrf"") is true?") +Call ok(not isArray(Nothing), "isArray(Nothing) is true?") +Call ok(not isArray(New EmptyClass), "isArray(New EmptyClass) is true?") +Call ok(not isArray(true), "isArray(true) is true?") +Call ok(not isArray(CByte(32)), "isArray(CByte(32)) is true?") + Call ok(getVT(Array()) = "VT_ARRAY|VT_VARIANT", "getVT(Array()) = " & getVT(Array())) x = Array("a1", 2, "a3") Call ok(getVT(x) = "VT_ARRAY|VT_VARIANT*", "getVT(array) = " & getVT(x))

1 0

Julian Rüger : German translation for release 5.12.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: website Branch: master Commit: 8527e4c86cd9fc39e6cc5d9026697628dff272b0 URL: https://source.winehq.org/git/website.git/?a=commit;h=8527e4c86cd9fc39e6cc5… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:43:34 2020 +0200 German translation for release 5.12. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020070301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020070301.xml b/news/de/2020070301.xml new file mode 100644 index 00000000..70d5f180 --- /dev/null +++ b/news/de/2020070301.xml @@ -0,0 +1,16 @@ +<news> +<date>3. Juli 2020</date> +<title>Wine 5.12 freigegeben</title> +<body> + Die Entwicklungsversion 5.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>NTDLL zum PE-Format konvertiert.</li> + <li>Unterstützung der WebSocket-API.</li> + <li>Verbesserte RawInput-Unterstützung.</li> + <li>Update der Vulkan-Spezifikation.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.12.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.13.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: website Branch: master Commit: e9523bccfa5e022986ada0c7e8eea4673d14dfa6 URL: https://source.winehq.org/git/website.git/?a=commit;h=e9523bccfa5e022986ada… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:46:47 2020 +0200 German translation for release 5.13. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020071701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020071701.xml b/news/de/2020071701.xml new file mode 100644 index 00000000..f50cc2b5 --- /dev/null +++ b/news/de/2020071701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. Juli 2020</date> +<title>Wine 5.13 freigegeben</title> +<body> + Die Entwicklungsversion 5.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Re-mapping von INI-Dateien in die Registry.</li> + <li>Systemcall-Thunks in NTDLL.</li> + <li>Reimplementierung der Abbildung von Fließkommazahlen.</li> + <li>Anfänge einer Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.13.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.14.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: website Branch: master Commit: 4990a076594ade87f4feeb0e7d21c0e416f34fbb URL: https://source.winehq.org/git/website.git/?a=commit;h=4990a076594ade87f4fee… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:48:33 2020 +0200 German translation for release 5.14. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020080101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020080101.xml b/news/de/2020080101.xml new file mode 100644 index 00000000..7654524a --- /dev/null +++ b/news/de/2020080101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. August 2020</date> +<title>Wine 5.14 freigegeben</title> +<body> + Die Entwicklungsversion 5.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Anfängliche Version der Webdings-Schriftart.</li> + <li>Anfänge der PE-Konversion der MSVCRT-Bibliotheken.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.14.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.0.2.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: website Branch: master Commit: 8f1a589972aa3404d629482d2087a19ea94a8b2b URL: https://source.winehq.org/git/website.git/?a=commit;h=8f1a589972aa3404d6294… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:49:01 2020 +0200 German translation for release 5.0.2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020080701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2020080701.xml b/news/de/2020080701.xml new file mode 100644 index 00000000..b88e7572 --- /dev/null +++ b/news/de/2020080701.xml @@ -0,0 +1,12 @@ +<news> +<date>7. August 2020</date> +<title>Wine 5.0.2 freigegeben</title> +<body> + Die Wartungsversion 5.0.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.0.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.2.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.15.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: website Branch: master Commit: c132e7ec408233f015db7149188d953e8a764f8d URL: https://source.winehq.org/git/website.git/?a=commit;h=c132e7ec408233f015db7… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 24 12:52:43 2020 +0200 German translation for release 5.15. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020081401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020081401.xml b/news/de/2020081401.xml new file mode 100644 index 00000000..fb02256f --- /dev/null +++ b/news/de/2020081401.xml @@ -0,0 +1,17 @@ +<news> +<date>14. August 2020</date> +<title>Wine 5.15 freigegeben</title> +<body> + Die Entwicklungsversion 5.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfängliche Implementierung der XACT-Engine-Bibliotheken.</li> + <li>Anfänge der Mathematikfunktionen in MSVCRT basierend auf Musl.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Verbesserung der Direct-Input-Performance.</li> + <li>Korrekturen an der Ausnahmebehandlung unter x86-64.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.15.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 15a39f9990f17a83d1c375e897403365cb937769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a39f9990f17a83d1c375e8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Aug 21 11:14:14 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9395cb791d..937d64fff8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-08-07 18:55+0300\n" +"PO-Revision-Date: 2020-08-21 11:13+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3.1\n" +"X-Generator: Poedit 2.4.1\n" "X-Project-Style: default\n" #: appwiz.rc:58 @@ -16533,10 +16533,8 @@ msgid "&Beginner" msgstr "P&radedantis" #: winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Sąsaja" +msgstr "&Vidutinis" #: winemine.rc:46 msgid "&Expert" @@ -16567,10 +16565,8 @@ msgid "Beginner" msgstr "Pradedantis" #: winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Sąsaja" +msgstr "Vidutinis" #: winemine.rc:66 msgid "Expert"

1 0

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontFace5::Equals().
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: ab94abb14f74fe863ae40dafc7a8301db22792fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab94abb14f74fe863ae40daf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 21 15:39:27 2020 +0300 dwrite: Add partial implementation for IDWriteFontFace5::Equals(). Issue with missing method spotted by Brendan Shanks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 17 +++++++++++++++++ dlls/dwrite/tests/font.c | 11 ++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 19fe911420..aa51c74429 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1562,6 +1562,22 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); } +static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other) +{ + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface), *other_face; + + TRACE("%p, %p.\n", iface, other); + + if (!(other_face = unsafe_impl_from_IDWriteFontFace(other))) + return FALSE; + + /* TODO: add variations support */ + + return fontface->index == other_face->index && + fontface->simulations == other_face->simulations && + is_same_fontfile(fontface->files[0], other_face->files[0]); +} + static const IDWriteFontFace5Vtbl dwritefontfacevtbl = { dwritefontface_QueryInterface, @@ -1621,6 +1637,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl = dwritefontface5_GetFontAxisValues, dwritefontface5_HasVariations, dwritefontface5_GetFontResource, + dwritefontface5_Equals, }; static HRESULT WINAPI dwritefontface_reference_QueryInterface(IDWriteFontFaceReference *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e1024d0263..becb1a741f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1817,13 +1817,14 @@ static void test_CreateFontFace(void) IDWriteFontCollection *collection; DWRITE_FONT_FILE_TYPE file_type; DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFace5 *fontface5; IDWriteGdiInterop *interop; IDWriteFont *font, *font2; IDWriteFontFamily *family; IDWriteFactory *factory; IDWriteFontFile *file; + BOOL supported, ret; LOGFONTW logfont; - BOOL supported; UINT32 count; WCHAR *path; HRESULT hr; @@ -1908,6 +1909,14 @@ static void test_CreateFontFace(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); + /* Trivial equality test */ + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5))) + { + ret = IDWriteFontFace5_Equals(fontface5, fontface2); + ok(ret, "Unexpected result %d.\n", ret); + IDWriteFontFace5_Release(fontface5); + } + IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface2); IDWriteFont_Release(font2);

1 0

Martin Storsjo : include: Update ARM64 context flag definitions to match current SDKs.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 5b3842451ba6c7a37a24e0f16707d8a19020287d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3842451ba6c7a37a24e0f1… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 21 15:02:03 2020 +0300 include: Update ARM64 context flag definitions to match current SDKs. CONTEXT_FLOATING_POINT should be included in CONTEXT_FULL, and there's a new flag CONTEXT_ARM64_X18 (not available without the arch specific prefix) that only is part of CONTEXT_ALL. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 7 ++++--- include/winnt.h | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e3102f7bdf..134e40545f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -97,7 +97,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "mov x1, sp\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ - "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ + "movk w1, #0x7\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */ "mrs x1, NZCV\n\t" "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 52f00323a0..a4454af71e 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -311,7 +311,8 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) { DWORD i; - context->ContextFlags = CONTEXT_FULL; + context->ContextFlags = (CONTEXT_FULL & ~CONTEXT_FLOATING_POINT) | + CONTEXT_ARM64; context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ context->u.s.Lr = LR_sig(sigcontext); /* Link register */ context->Sp = SP_sig(sigcontext); /* Stack pointer */ @@ -664,7 +665,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "csel x0, x19, x0, lo\n\t" "mov sp, x0\n\t" "mov w2, #0x400000\n\t" /* context.ContextFlags = CONTEXT_FULL */ - "movk w2, #3\n\t" + "movk w2, #7\n\t" "mov x1, x19\n\t" "str w2, [x19]\n\t" "mov x0, #~1\n\t" @@ -1039,7 +1040,7 @@ PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void init_thread_context( ctx, entry, arg, relay ); } pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT; + ctx->ContextFlags = CONTEXT_FULL; return ctx; } diff --git a/include/winnt.h b/include/winnt.h index 8c5f24aff8..63567ba62e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1928,11 +1928,12 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTE #define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x00000002) #define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004) #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) +#define CONTEXT_ARM64_X18 (CONTEXT_ARM64 | 0x00000010) #define CONTEXT_UNWOUND_TO_CALL 0x20000000 -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) -#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_ARM64_X18) #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1

1 0