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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 6725a11b78fd493425a2e443ac064a401a20bfa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6725a11b78fd493425a2e443a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Aug 8 20:36:09 2017 +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 | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/lt.po b/po/lt.po index 055a965..975f275 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-13 09:10+0300\n" +"PO-Revision-Date: 2017-08-08 20:34+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" @@ -7289,42 +7289,36 @@ msgid "{{Disk full: }}" msgstr "{{Diskas pilnas: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Veiksmas %s: [1]. [2]" +msgstr "Veiksmas [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Pranešimo tipas: [1], Argumentai: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Registravimas pradėtas: %s %s ===" +msgstr "=== Registravimas pradėtas: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Veiksmo pradžia %s: [1]." +msgstr "Veiksmo pradžia [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Veiksmas baigtas %s: [1]. Grąžinta reikšmė [2]." +msgstr "Veiksmas baigtas [Time]: [1]. Grąžinta reikšmė [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Įdėkite diską: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Šaltinio failas nerastas{{(cabinet)}}: [2]. Patikrinkite, ar failas " +"egzistuoja ir yra prieinamas." #: msrle32.rc:31 msgid "Wine MS-RLE video codec"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 03355e3130f6fdb068f384c68a8006c49d849c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=03355e3130f6fdb068f384c68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 8 23:29:10 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/po/ru.po b/po/ru.po index aebd4ec..5f2ae57 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-13 09:32+0300\n" +"PO-Revision-Date: 2017-08-08 21:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 2.0.3\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -7291,42 +7291,36 @@ msgid "{{Disk full: }}" msgstr "{{Диск полон: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Действие %s: [1]. [2]" +msgstr "Действие [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Тип сообщения: [1], Аргумент: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Протоколирование запущено: %s %s ===" +msgstr "=== Протоколирование запущено: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Запуск действия %s: [1]." +msgstr "Запуск действия [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Действие завершилось %s: [1]. Код возврата [2]." +msgstr "Действие завершилось [Time]: [1]. Код возврата [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Вставьте диск: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Файл не найден{{(cabinet)}}: [2]. Убедитесь, что файл существует и к нему " +"есть доступ." #: msrle32.rc:31 msgid "Wine MS-RLE video codec"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 75ec559b82036135128aecbe7c1a2a38fa5617c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ec559b82036135128aecbe7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Aug 12 02:04:07 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 99371d0..04896ec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7280,42 +7280,36 @@ msgid "{{Disk full: }}" msgstr "{{Levy täynnä: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Toiminto %s: [1]. [2]" +msgstr "Toiminto [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Viestin tyyppi: [1], Argumentti: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Loki aloitettu: %s %s ===" +msgstr "=== Loki aloitettu: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Toiminto alkoi %s: [1]." +msgstr "Toiminto alkoi [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Toiminto loppui %s: [1]. Paluuarvo [2]." +msgstr "Toiminto loppui [Time]: [1]. Paluuarvo [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Syötä levy: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Lähdetiedostoa ei löydy{{(cabinet)}}: [2]. Varmista, että tiedosto on " +"olemassa ja käytettävissä." #: msrle32.rc:31 msgid "Wine MS-RLE video codec"

1 0

Nikolay Sivov : msvcrt: Added _ismbcl0().
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 1a6e50ce97f85e2877420252b38664281559c7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6e50ce97f85e2877420252b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 8 16:44:41 2017 +0300 msvcrt: Added _ismbcl0(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b6b10ba..f9f432f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -986,7 +986,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b36cb3a..01793c7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1332,7 +1332,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 77daf09..a6a08ad 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1337,7 +1337,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index bbfbea1..fb5aa9d 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -381,7 +381,7 @@ @ cdecl _ismbcgraph(long) @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f9c5afe..b7acbfb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -376,7 +376,7 @@ @ cdecl _ismbcgraph(long) @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5bfa4ac..fdc0667 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -658,7 +658,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e39fdee..cb8344c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -636,7 +636,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 49d6678..63be805 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2443,3 +2443,17 @@ unsigned int CDECL _mbctokata(unsigned int c) return (c - 0x829f) + 0x8340 + (c >= 0x82de ? 1 : 0); return c; } + + +/********************************************************************* + * _ismbcl0 (MSVCRT.@) + */ +int CDECL _ismbcl0(unsigned int c) +{ + if(get_mbcinfo()->mbcodepage == 932) + { + /* JIS non-Kanji */ + return (c >= 0x8140 && c <= 0x889e); + } + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c23c72b..ee59ae6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -604,7 +604,7 @@ # stub _ismbchira_l(long ptr) @ cdecl _ismbckata(long) # stub _ismbckata_l(long ptr) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) # stub _ismbcl0_l(long ptr) @ stub _ismbcl1(long) # stub _ismbcl1_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 04e20c1..1681001 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3193,6 +3193,29 @@ static void test__mbscmp(void) ok(ret == 1, "got %d\n", ret); } +static void test__ismbclx(void) +{ + int cp, ret; + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + cp = _setmbcp(1252); + + ret = _ismbcl0(0x8140); + ok(!ret, "got %d\n", ret); + + _setmbcp(932); + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl0(0x8140); + ok(ret, "got %d\n", ret); + + _setmbcp(cp); +} + START_TEST(string) { char mem[100]; @@ -3308,4 +3331,5 @@ START_TEST(string) test__strnset_s(); test__wcsset_s(); test__mbscmp(); + test__ismbclx(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7a07b71..ce1e24e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -476,7 +476,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l

1 0

Sebastian Lackner : ntdll: Fix a TRACE in NtGetContextThread.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: dee9eaa248fb275066852ad192d6bb6a431c24cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee9eaa248fb275066852ad19… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 9 21:25:38 2017 +0200 ntdll: Fix a TRACE in NtGetContextThread. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ca73e9a..f33c43f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1589,7 +1589,7 @@ NTSTATUS CDECL DECLSPEC_HIDDEN __regs_NtGetContextThread( DWORD edi, DWORD esi, context->Ebp, context->Esp, context->Eip, context->SegCs, context->SegSs, context->EFlags ); if (context->ContextFlags & (CONTEXT_SEGMENTS & ~CONTEXT_i386)) TRACE( "%p: ds=%04x es=%04x fs=%04x gs=%04x\n", handle, - context->SegCs, context->SegDs, context->SegEs, context->SegFs ); + context->SegDs, context->SegEs, context->SegFs, context->SegGs ); if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) TRACE( "%p: dr0=%08x dr1=%08x dr2=%08x dr3=%08x dr6=%08x dr7=%08x\n", handle, context->Dr0, context->Dr1, context->Dr2, context->Dr3, context->Dr6, context->Dr7 );

1 0

Piotr Caban : gdiplus: Add more accurate algorithm for inverting scaling and translation matrices in GdipInvertMatrix.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 595959c771691b46ea8521c3af37f7306a383068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595959c771691b46ea8521c3a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 8 20:48:27 2017 +0200 gdiplus: Add more accurate algorithm for inverting scaling and translation matrices in GdipInvertMatrix. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/matrix.c | 16 +++++++++++++++- dlls/gdiplus/tests/matrix.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 3cd8d82..2219d46 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -197,6 +197,17 @@ GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix *matrix) if(!invertible) return InvalidParameter; + /* optimize inverting simple scaling and translation matrices */ + if(matrix->matrix[1] == 0 && matrix->matrix[2] == 0) + { + matrix->matrix[4] = -matrix->matrix[4] / matrix->matrix[0]; + matrix->matrix[5] = -matrix->matrix[5] / matrix->matrix[3]; + matrix->matrix[0] = 1 / matrix->matrix[0]; + matrix->matrix[3] = 1 / matrix->matrix[3]; + + return Ok; + } + det = matrix_det(matrix); copy = *matrix; @@ -218,7 +229,10 @@ GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *res if(!matrix || !result) return InvalidParameter; - *result = (fabs(matrix_det(matrix)) >= 1e-5); + if(matrix->matrix[1] == 0 && matrix->matrix[2] == 0) + *result = matrix->matrix[0] != 0 && matrix->matrix[3] != 0; + else + *result = (fabs(matrix_det(matrix)) >= 1e-5); return Ok; } diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 1e4f48d..3e655ce 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -19,6 +19,7 @@ */ #include <math.h> +#include <limits.h> #include "objbase.h" #include "gdiplus.h" @@ -27,6 +28,22 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static void test_constructor_destructor(void) { GpStatus status; @@ -128,6 +145,7 @@ static void test_invert(void) GpMatrix *matrix = NULL; GpMatrix *inverted = NULL; BOOL equal = FALSE; + REAL elems[6]; /* NULL */ status = GdipInvertMatrix(NULL); @@ -147,6 +165,18 @@ static void test_invert(void) GdipIsMatrixEqual(matrix, inverted, &equal); expect(TRUE, equal); + GdipCreateMatrix2(0.0006, 0, 0, 0.0006, 400, 400, &matrix); + status = GdipInvertMatrix(matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + ok(compare_float(elems[0], 1666.666504, 1), "elems[0] = %.10g\n", elems[0]); + ok(compare_float(elems[1], 0, 0), "elems[1] = %.10g\n", elems[1]); + ok(compare_float(elems[2], 0, 0), "elems[2] = %.10g\n", elems[2]); + ok(compare_float(elems[3], 1666.666504, 1), "elems[3] = %.10g\n", elems[3]); + ok(compare_float(elems[4], -666666.6875, 1), "elems[4] = %.10g\n", elems[4]); + ok(compare_float(elems[5], -666666.6875, 1), "elems[5] = %.10g\n", elems[5]); + GdipDeleteMatrix(inverted); GdipDeleteMatrix(matrix); }

1 0

Zebediah Figura : include: Add initial ieautomation.idl.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: cb56d0ce2bc413ad1328729f9ed5409d766bec09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb56d0ce2bc413ad1328729f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 11 09:21:19 2017 -0500 include: Add initial ieautomation.idl. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ieautomation.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 81c646e..454ac80 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -80,6 +80,7 @@ IDL_SRCS = \ httprequest.idl \ iads.idl \ icftypes.idl \ + ieautomation.idl \ iextag.idl \ iimgctx.idl \ imnact.idl \ diff --git a/include/ieautomation.idl b/include/ieautomation.idl new file mode 100644 index 0000000..c9b1c25 --- /dev/null +++ b/include/ieautomation.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2017 Zebediah Figura for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "ocidl.idl"; + +typedef +[ + uuid(44ec9b57-dcab-4cde-b373-ee94962950e3) +] +enum INTERNETEXPLORERCONFIGURATION { + INTERNETEXPLORERCONFIGURATION_HOST = 0x00000001, + INTERNETEXPLORERCONFIGURATION_WEB_DRIVER = 0x00000002, + INTERNETEXPLORERCONFIGURATION_WEB_DRIVER_EDGE = 0x00000004, +} INTERNETEXPLORERCONFIGURATION; + +[ + object, + uuid(acc84351-04ff-44f9-b23f-655ed168c6d5), + pointer_default(unique) +] +interface IInternetExplorerManager : IUnknown +{ + HRESULT CreateObject([in] DWORD config, [in, unique, string] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); +} + +[ + uuid(df4fcc34-067a-4e0a-8352-4a1a5095346e) +] +coclass InternetExplorerManager +{ + [default] interface IInternetExplorerManager; +}

1 0

Piotr Caban : gdiplus: Add write_region_data helper and use it in GdipGetRegionData.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 4a02870296227172f11e9d4cfdc1788fd0e905ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a02870296227172f11e9d4cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 10 20:56:12 2017 +0200 gdiplus: Add write_region_data helper and use it in GdipGetRegionData. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 61 +++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 74c02c2..d133afa 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -84,12 +84,17 @@ struct memory_buffer struct region_header { - DWORD size; - DWORD checksum; DWORD magic; DWORD num_children; }; +struct region_data_header +{ + DWORD size; + DWORD checksum; + struct region_header header; +}; + struct path_header { DWORD size; @@ -98,11 +103,6 @@ struct path_header DWORD flags; }; -/* Header size as far as header->size is concerned. This doesn't include - * header->size or header->checksum - */ -static const INT sizeheader_size = sizeof(DWORD) * 2; - typedef struct packed_point { short X; @@ -699,6 +699,24 @@ static void write_element(const region_element* element, DWORD *buffer, } } +static DWORD write_region_data(const GpRegion *region, void *data) +{ + struct region_header *header = data; + INT filled = 0; + DWORD size; + + size = sizeof(struct region_header) + get_element_size(&region->node); + if (!data) return size; + + header->magic = VERSION_MAGIC2; + header->num_children = region->num_children; + filled += 2; + /* With few exceptions, everything written is DWORD aligned, + * so use that as our base */ + write_element(&region->node, (DWORD*)data, &filled); + return size; +} + /***************************************************************************** * GdipGetRegionData [GDIPLUS.@] * @@ -735,36 +753,27 @@ static void write_element(const region_element* element, DWORD *buffer, GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) { - struct region_header *region_header; - INT filled = 0; + struct region_data_header *region_data_header; UINT required; - GpStatus status; TRACE("%p, %p, %d, %p\n", region, buffer, size, needed); if (!region || !buffer || !size) return InvalidParameter; - status = GdipGetRegionDataSize(region, &required); - if (status != Ok) return status; + required = FIELD_OFFSET(struct region_data_header, header) + write_region_data(region, NULL); if (size < required) { if (needed) *needed = size; return InsufficientBuffer; } - region_header = (struct region_header *)buffer; - region_header->size = sizeheader_size + get_element_size(&region->node); - region_header->checksum = 0; - region_header->magic = VERSION_MAGIC2; - region_header->num_children = region->num_children; - filled += 4; - /* With few exceptions, everything written is DWORD aligned, - * so use that as our base */ - write_element(&region->node, (DWORD*)buffer, &filled); + region_data_header = (struct region_data_header *)buffer; + region_data_header->size = write_region_data(region, &region_data_header->header); + region_data_header->checksum = 0; if (needed) - *needed = filled * sizeof(DWORD); + *needed = required; return Ok; } @@ -960,7 +969,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio */ GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) { - const struct region_header *region_header; + const struct region_data_header *region_data_header; struct memory_buffer mbuf; GpStatus status; INT count; @@ -972,8 +981,8 @@ GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRe init_memory_buffer(&mbuf, data, size); - region_header = buffer_read(&mbuf, sizeof(*region_header)); - if (!region_header || !VALID_MAGIC(region_header->magic)) + region_data_header = buffer_read(&mbuf, sizeof(*region_data_header)); + if (!region_data_header || !VALID_MAGIC(region_data_header->header.magic)) return InvalidParameter; status = GdipCreateRegion(region); @@ -1005,7 +1014,7 @@ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) return InvalidParameter; /* header.size doesn't count header.size and header.checksum */ - *needed = sizeof(DWORD) * 2 + sizeheader_size + get_element_size(&region->node); + *needed = FIELD_OFFSET(struct region_data_header, header) + write_region_data(region, NULL); return Ok; }

1 0

Piotr Caban : gdiplus: Support GdipSetClipRegion in metafiles.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 14bb8df8a58ee3d3880f8a8c67aa53e38022a1de URL: http://source.winehq.org/git/wine.git/?a=commit;h=14bb8df8a58ee3d3880f8a8c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 10 20:56:19 2017 +0200 gdiplus: Support GdipSetClipRegion in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 7 ++++++ dlls/gdiplus/metafile.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/region.c | 2 +- dlls/gdiplus/tests/metafile.c | 12 +++++++++ 5 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 762aa13..3396676 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -93,6 +93,7 @@ extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetClipRect(GpMetafile* metafile, REAL x, REAL y, REAL width, REAL height, CombineMode mode) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_SetClipRegion(GpMetafile* metafile, GpRegion* region, CombineMode mode) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* transform) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; @@ -124,6 +125,7 @@ extern void free_installed_fonts(void) DECLSPEC_HIDDEN; extern BOOL lengthen_path(GpPath *path, INT len) DECLSPEC_HIDDEN; +extern DWORD write_region_data(const GpRegion *region, void *data) DECLSPEC_HIDDEN; extern DWORD write_path_data(GpPath *path, void *data) DECLSPEC_HIDDEN; extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4b2ae49..e45618e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6269,6 +6269,13 @@ GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + status = METAFILE_SetClipRegion((GpMetafile*)graphics->image, region, mode); + if (status != Ok) + return status; + } + status = GdipCloneRegion(region, &clip); if (status == Ok) { diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 99e5483..41355bc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -239,6 +239,13 @@ typedef struct EmfPlusPath BYTE data[1]; } EmfPlusPath; +typedef struct EmfPlusRegion +{ + DWORD Version; + DWORD RegionNodeCount; + BYTE RegionNode[1]; +} EmfPlusRegion; + typedef enum { BitmapDataTypePixel, @@ -312,6 +319,7 @@ typedef struct EmfPlusObject EmfPlusBrush brush; EmfPlusPen pen; EmfPlusPath path; + EmfPlusRegion region; EmfPlusImage image; EmfPlusImageAttributes image_attributes; } ObjectData; @@ -847,6 +855,53 @@ GpStatus METAFILE_SetClipRect(GpMetafile* metafile, REAL x, REAL y, REAL width, return Ok; } +static GpStatus METAFILE_AddRegionObject(GpMetafile *metafile, GpRegion *region, DWORD *id) +{ + EmfPlusObject *object_record; + DWORD size; + GpStatus stat; + + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + size = write_region_data(region, NULL); + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.region) + size, (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeRegion << 8; + write_region_data(region, &object_record->ObjectData.region); + return Ok; +} + +GpStatus METAFILE_SetClipRegion(GpMetafile* metafile, GpRegion* region, CombineMode mode) +{ + EmfPlusRecordHeader *record; + DWORD region_id; + GpStatus stat; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddRegionObject(metafile, region, &region_id); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + if (stat != Ok) return stat; + + record->Type = EmfPlusRecordTypeSetClipRegion; + record->Flags = region_id | mode << 8; + + METAFILE_WriteRecords(metafile); + return Ok; +} + GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d133afa..015b677 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -699,7 +699,7 @@ static void write_element(const region_element* element, DWORD *buffer, } } -static DWORD write_region_data(const GpRegion *region, void *data) +DWORD write_region_data(const GpRegion *region, void *data) { struct region_header *header = data; INT filled = 0; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 26716c4..1d36d9e 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2154,6 +2154,8 @@ static const emfplus_record clipping_records[] = { {0, EmfPlusRecordTypeRestore}, {0, EmfPlusRecordTypeSetClipRect}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeObject, 1}, + {0, EmfPlusRecordTypeSetClipRegion, 1}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -2165,6 +2167,7 @@ static void test_clipping(void) GpMetafile *metafile; GpGraphics *graphics; GpBitmap *bitmap; + GpRegion *region; GpBrush *brush; GpRectF rect; ARGB color; @@ -2231,6 +2234,15 @@ static void test_clipping(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + stat = GdipCreateRegionRect(&rect, &region); + expect(Ok, stat); + + stat = GdipSetClipRegion(graphics, region, CombineModeIntersect); + expect(Ok, stat); + + stat = GdipDeleteRegion(region); + expect(Ok, stat); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Hugh McMaster : reg: Avoid an uninitialized variable warning.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 337e0f4cb2156becef5a72d8e6b8711691f4d2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337e0f4cb2156becef5a72d8e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 10 12:06:29 2017 +0000 reg: Avoid an uninitialized variable warning. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 37ac193..0e946d3 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -1070,7 +1070,7 @@ int wmain(int argc, WCHAR *argvW[]) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); else if (op == REG_DELETE) ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); - else if (op == REG_QUERY) + else ret = reg_query(root, path, key_name, value_name, value_empty, recurse); return ret; }

1 0