July 2017 - Wine-Commits - list.winehq.org

Francois Gouget : gdiplus: Remove a duplicate word in a comment.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 01c9fb96add077ba2b9f8ea16ec99643818f50db URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c9fb96add077ba2b9f8ea16… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:23:04 2017 +0200 gdiplus: Remove a duplicate word in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5d82a77..458019f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -188,8 +188,8 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R * NOTES * This functions takes the newfigure value of the given path into account, * i.e. the arc is connected to the end of the given path if it was set to - * FALSE, otherwise the arc's first point gets the the PathPointTypeStart - * value. In both cases, the value of newfigure of the given path is FALSE + * FALSE, otherwise the arc's first point gets the PathPointTypeStart value. + * In both cases, the value of newfigure of the given path is FALSE * afterwards. */ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2,

1 0

Mikhail Paulyshka : msvcp140: Implement _To_byte.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: aaaac6ffecff2b025a78513560b349c506958ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaaac6ffecff2b025a7851356… Author: Mikhail Paulyshka <me(a)mixaill.tk> Date: Mon Jul 10 12:59:02 2017 +0200 msvcp140: Implement _To_byte. Signed-off-by: Mikhail Paulyshka <me(a)mixaill.tk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 6 ++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 284f674..0216450 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3731,7 +3731,7 @@ @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield -@ stub _To_byte +@ cdecl _To_byte(wstr ptr) _To_byte @ cdecl _To_wide(str ptr) @ cdecl _Tolower(long ptr) _Tolower @ cdecl _Toupper(long ptr) _Toupper diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index f3dd4a0..7cb75f5 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -152,6 +152,7 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static HMODULE msvcp; @@ -215,6 +216,7 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); init_thiscall_thunk(); @@ -469,6 +471,52 @@ static void test_chore(void) p__Release_chore(&chore); } +static void test_to_byte(void) +{ + static const WCHAR test_1[] = {'T', 'E', 'S', 'T', 0}; + static const WCHAR test_2[] = {0x9580, 0x9581, 0x9582, 0x9583, 0}; /* some CJK characters */ + static const WCHAR *tests[] = {test_1, test_2}; + + char dst[MAX_PATH + 4] = "ABC\0XXXXXXX"; + char compare[MAX_PATH + 4] = "ABC\0XXXXXXX"; + int ret,expected; + unsigned int i, j; + WCHAR longstr[MAX_PATH + 3]; + + ret = p_To_byte(NULL, NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(tests[0], NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(NULL, dst); + ok(!ret, "Got unexpected result %d\n", ret); + + ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", dst); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + ret = p_To_byte(tests[i], dst); + expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare), + NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", dst, i); + } + + /* Output length is limited to MAX_PATH.*/ + for (i = MAX_PATH - 2; i < MAX_PATH + 2; ++i) + { + for (j = 0; j < i; j++) + longstr[j] = 'A'; + longstr[i] = 0; + memset(dst, 0xff, sizeof(dst)); + memset(compare, 0xff, sizeof(compare)); + + ret = p_To_byte(longstr, dst); + expected = WideCharToMultiByte(CP_ACP, 0, longstr, -1, compare, MAX_PATH, NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, length %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, length %u\n", dst, i); + } +} + static void test_to_wide(void) { /* öäüß€Ÿ.A.B in cp1252, the two . are an undefined value and delete. @@ -524,6 +572,7 @@ START_TEST(msvcp140) test__ContextCallback(); test__TaskEventLogger(); test_chore(); + test_to_byte(); test_to_wide(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f80c9b6..70c3677 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,6 +11224,12 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif +int __cdecl _To_byte(const wchar_t *src, char *dst) +{ + TRACE("(%s %p)\n", debugstr_w(src), dst); + return WideCharToMultiByte(CP_ACP, 0, src, -1, dst, MAX_PATH, NULL, NULL); +} + int __cdecl _To_wide(const char *src, wchar_t *dst) { TRACE("(%s %p)\n", debugstr_a(src), dst);

1 0

Stefan Dösinger : msvcp140: Remove a redundant check.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 8cb8c145700d44abb4441581d0b278fb8e840224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb8c145700d44abb4441581d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 9 22:14:36 2017 +0200 msvcp140: Remove a redundant check. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f7a9294..f80c9b6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11227,10 +11227,6 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s int __cdecl _To_wide(const char *src, wchar_t *dst) { TRACE("(%s %p)\n", debugstr_a(src), dst); - - if (!src || !dst) - return 0; - return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); }

1 0

Alex Henrie : msvcr120: Correct erff specfile definition.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 718f8265c07967d6c211cf93993e0439af23d039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f8265c07967d6c211cf939… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 9 22:55:03 2017 -0600 msvcr120: Correct erff specfile definition. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 6a9ccae..5d2499b 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -224,7 +224,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) ucrtbase.erff +@ cdecl erff(float) ucrtbase.erff @ cdecl erfl(double) ucrtbase.erfl @ cdecl exp(double) ucrtbase.exp @ cdecl exp2(double) ucrtbase.exp2 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 54f6c81..989a3cb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2126,7 +2126,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) MSVCR120_erff +@ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 129456f..345bb51 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1792,7 +1792,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) msvcr120.erff +@ cdecl erff(float) msvcr120.erff @ cdecl erfl(double) msvcr120.erfl @ cdecl exit(long) msvcr120.exit @ cdecl exp(double) msvcr120.exp diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5a0f957..3e7c795 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2269,7 +2269,7 @@ @ stub erfc @ stub erfcf @ stub erfcl -@ cdecl erff(double) MSVCR120_erff +@ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp

1 0

Alexandre Julliard : user32: Implement LR_MONOCHROME for loading cursors.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: b7e19e4a1ae86bc6d182b99bc52c11d8e84fe2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e19e4a1ae86bc6d182b99bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:41:22 2017 +0200 user32: Implement LR_MONOCHROME for loading cursors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 33ce5cb..4b2d6bd 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -559,7 +559,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_entry, int width, int height, int depth, UINT loadflags ) { - int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; + int i, maxwidth, maxheight, maxbits, cx, cy, bits, bestEntry = -1; if (loadflags & LR_DEFAULTSIZE) { @@ -573,22 +573,22 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ return 0; } - /* Double height to account for AND and XOR masks */ - - height *= 2; - /* First find the largest one smaller than or equal to the requested size*/ - maxwidth = maxheight = 0; + maxwidth = maxheight = maxbits = 0; for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { - if ((cx <= width) && (cy <= height) && - (cx > maxwidth) && (cy > maxheight)) + if (cx > width || cy > height) continue; + if (cx < maxwidth || cy < maxheight) continue; + if (loadflags & LR_MONOCHROME) { - bestEntry = i; - maxwidth = cx; - maxheight = cy; + if (maxbits && bits >= maxbits) continue; } + else if (bits <= maxbits) continue; + bestEntry = i; + maxwidth = cx; + maxheight = cy; + maxbits = bits; } if (bestEntry != -1) return bestEntry; @@ -597,13 +597,18 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ maxwidth = maxheight = 255; for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { - if (((cx < maxwidth) && (cy < maxheight)) || (bestEntry == -1)) + if (cx > maxwidth || cy > maxheight) continue; + if (loadflags & LR_MONOCHROME) { - bestEntry = i; - maxwidth = cx; - maxheight = cy; + if (maxbits && bits >= maxbits) continue; } + else if (bits <= maxbits) continue; + bestEntry = i; + maxwidth = cx; + maxheight = cy; + maxbits = bits; } + if (bestEntry == -1) bestEntry = 0; return bestEntry; }

1 0

Gerald Pfeifer : user.exe16: Fix ADD_TO_T macro.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 51fea2208eb02a6f500e0cbaad15e3feae701f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51fea2208eb02a6f500e0cbaa… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jul 10 01:06:15 2017 +0800 user.exe16: Fix ADD_TO_T macro. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 267714a..35f2585 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3179,12 +3179,14 @@ DWORD WINAPI FormatMessage16( talloced= 100; #define ADD_TO_T(c) \ - *t++=c;\ - if (t-target == talloced) {\ + do { \ + *t++=c;\ + if (t-target == talloced) {\ target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ t = target+talloced;\ talloced*=2;\ - } + } \ + } while(0) if (from) { f=from;

1 0

Zebediah Figura : msi: Use the given record for INSTALLMESSAGE_ACTIONDATA.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: f9c68dfd920702f5c81b3631344c59b1134e0f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c68dfd920702f5c81b36313… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 7 09:03:15 2017 -0500 msi: Use the given record for INSTALLMESSAGE_ACTIONDATA. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 103 +++++++++++++++++---------------------------------- dlls/msi/appsearch.c | 2 +- dlls/msi/assembly.c | 4 +- dlls/msi/classes.c | 16 ++++---- dlls/msi/files.c | 12 +++--- dlls/msi/font.c | 4 +- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 1 + dlls/msi/upgrade.c | 2 +- 9 files changed, 55 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c68dfd920702f5c81b3…

1 0

Zebediah Figura : msi: Provide the result of the last action.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: c788ed858ed21e698977dd5961e2afb18e2bad93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c788ed858ed21e698977dd596… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 7 09:03:14 2017 -0500 msi: Provide the result of the last action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 +++- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 1 + dlls/msi/tests/package.c | 10 +++++++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fef076f..741e834 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -189,7 +189,7 @@ static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, if (!row) return; MSI_RecordSetStringW(row, 0, message); MSI_RecordSetStringW(row, 1, action); - MSI_RecordSetInteger(row, 2, !rc); + MSI_RecordSetInteger(row, 2, start ? package->LastActionResult : !rc); MSI_ProcessMessage(package, INSTALLMESSAGE_INFO, row); msiobj_release(&row->hdr); } @@ -628,6 +628,7 @@ static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT return ERROR_SUCCESS; ui_actioninfo(package, action, FALSE, arc); + package->LastActionResult = !arc; return arc; } @@ -7800,6 +7801,7 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) ui_actioninfo( package, action, TRUE, 0 ); rc = StandardActions[i].handler( package ); ui_actioninfo( package, action, FALSE, rc ); + package->LastActionResult = !rc; if (StandardActions[i].action_rollback && !package->need_rollback) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bb9d224..a3c3c0f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -391,6 +391,7 @@ typedef struct tagMSIPACKAGE LPWSTR ActionFormat; LPWSTR LastAction; LPWSTR LastActionTemplate; + UINT LastActionResult; UINT action_progress_increment; HANDLE log_file; IAssemblyCache *cache_net[CLR_VERSION_MAX]; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7ba7c9a..325d212 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1099,6 +1099,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->LastAction = NULL; package->LastActionTemplate = NULL; + package->LastActionResult = MSI_NULL_INTEGER; package->WordCount = 0; package->PackagePath = strdupW( db->path ); package->BaseURL = strdupW( base_url ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4bf1f87..e15dc57 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9536,7 +9536,7 @@ static void test_externalui_message(void) /* Test a standard action */ r = MsiDoActionA(hpkg, "CostInitialize"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", TRUE); + ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", FALSE); /* Test a custom action */ r = MsiDoActionA(hpkg, "custom"); @@ -9575,7 +9575,7 @@ static void test_externalui_message(void) /* Test a custom action */ r = MsiDoActionA(hpkg, "custom"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok_sequence(doaction_custom_fullui_sequence, "MsiDoAction(\"custom\")", TRUE); + ok_sequence(doaction_custom_fullui_sequence, "MsiDoAction(\"custom\")", FALSE); retval = 0; r = MsiDoActionA(hpkg, "custom"); @@ -9584,13 +9584,17 @@ static void test_externalui_message(void) r = MsiDoActionA(hpkg, "dialog"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok_sequence(doaction_dialog_sequence, "MsiDoAction(\"dialog\")", TRUE); + ok_sequence(doaction_dialog_sequence, "MsiDoAction(\"dialog\")", FALSE); retval = -1; r = MsiDoActionA(hpkg, "error"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok_sequence(doaction_dialog_error_sequence, "MsiDoAction(\"error\")", FALSE); + r = MsiDoActionA(hpkg, "error"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_dialog_error_sequence, "MsiDoAction(\"error\")", FALSE); + MsiCloseHandle(hpkg); ok_sequence(closehandle_sequence, "MsiCloseHandle()", FALSE);

1 0

Michael Stefaniuc : d2d1: Make use of the available ARRAY_SIZE macro.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 6f22d67077f7fda1a3e9477df2a2148bbf9e3542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f22d67077f7fda1a3e9477df… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 7 17:15:14 2017 +0200 d2d1: Make use of the available ARRAY_SIZE macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 4 ++-- dlls/d2d1/brush.c | 4 ++-- dlls/d2d1/render_target.c | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43904bb..6d9c352 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -210,7 +210,7 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D2D1_ALPHA_MODE_IGNORE }, }; - for (i = 0; i < sizeof(supported_formats) / sizeof(*supported_formats); ++i) + for (i = 0; i < ARRAY_SIZE(supported_formats); ++i) { if (supported_formats[i].format == format->format && supported_formats[i].alphaMode == format->alphaMode) @@ -476,7 +476,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d return hr; } - for (i = 0, d2d_format = NULL; i < sizeof(format_lookup) / sizeof(*format_lookup); ++i) + for (i = 0, d2d_format = NULL; i < ARRAY_SIZE(format_lookup); ++i) { if (IsEqualGUID(&wic_format, format_lookup[i].wic)) { diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 601f40f..51ef71a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -868,7 +868,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (brush->type >= sizeof(brush_sizes) / sizeof(*brush_sizes)) + if (brush->type >= ARRAY_SIZE(brush_sizes)) { ERR("Unhandled brush type %#x.\n", brush->type); return E_NOTIMPL; @@ -877,7 +877,7 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b buffer_desc.ByteWidth = brush_sizes[brush->type]; if (opacity_brush) { - if (opacity_brush->type >= sizeof(brush_sizes) / sizeof(*brush_sizes)) + if (opacity_brush->type >= ARRAY_SIZE(brush_sizes)) { ERR("Unhandled opacity brush type %#x.\n", opacity_brush->type); return E_NOTIMPL; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 20ea534..37121d9 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -2738,7 +2738,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_outline, - sizeof(il_desc_outline) / sizeof(*il_desc_outline), vs_code_outline, sizeof(vs_code_outline), + ARRAY_SIZE(il_desc_outline), vs_code_outline, sizeof(vs_code_outline), &render_target->shape_resources[D2D_SHAPE_TYPE_OUTLINE].il))) { WARN("Failed to create outline input layout, hr %#x.\n", hr); @@ -2746,7 +2746,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_triangle, - sizeof(il_desc_triangle) / sizeof(*il_desc_triangle), vs_code_triangle, sizeof(vs_code_triangle), + ARRAY_SIZE(il_desc_triangle), vs_code_triangle, sizeof(vs_code_triangle), &render_target->shape_resources[D2D_SHAPE_TYPE_TRIANGLE].il))) { WARN("Failed to create triangle input layout, hr %#x.\n", hr); @@ -2754,8 +2754,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_bezier_outline, - sizeof(il_desc_bezier_outline) / sizeof(*il_desc_bezier_outline), - vs_code_bezier_outline, sizeof(vs_code_bezier_outline), + ARRAY_SIZE(il_desc_bezier_outline), vs_code_bezier_outline, sizeof(vs_code_bezier_outline), &render_target->shape_resources[D2D_SHAPE_TYPE_BEZIER_OUTLINE].il))) { WARN("Failed to create bezier outline input layout, hr %#x.\n", hr); @@ -2763,7 +2762,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t } if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->device, il_desc_bezier, - sizeof(il_desc_bezier) / sizeof(*il_desc_bezier), vs_code_bezier, sizeof(vs_code_bezier), + ARRAY_SIZE(il_desc_bezier), vs_code_bezier, sizeof(vs_code_bezier), &render_target->shape_resources[D2D_SHAPE_TYPE_BEZIER].il))) { WARN("Failed to create bezier input layout, hr %#x.\n", hr); @@ -2798,7 +2797,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t goto err; } - for (i = 0; i < sizeof(brush_shaders) / sizeof(*brush_shaders); ++i) + for (i = 0; i < ARRAY_SIZE(brush_shaders); ++i) { const struct brush_shader *bs = &brush_shaders[i]; if (FAILED(hr = ID3D10Device_CreatePixelShader(render_target->device, bs->byte_code, bs->byte_code_size,

1 0

Nikolay Sivov : d3drm: Use existing helper to manage lights array.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 0459a3273d92237787ca9326e1bbc0ec43f5e2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0459a3273d92237787ca9326e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:47 2017 +0300 d3drm: Use existing helper to manage lights array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/frame.c | 33 +++++++-------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 89e6414..16c1415 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -71,8 +71,8 @@ struct d3drm_frame ULONG nb_visuals; ULONG visuals_capacity; IDirect3DRMVisual **visuals; - ULONG nb_lights; - ULONG lights_capacity; + SIZE_T nb_lights; + SIZE_T lights_size; IDirect3DRMLight **lights; D3DRMMATRIX4D transform; D3DCOLOR scenebackground; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index ffe7506..7d89686 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -875,9 +875,8 @@ static HRESULT WINAPI d3drm_frame1_AddChild(IDirect3DRMFrame *iface, IDirect3DRM static HRESULT WINAPI d3drm_frame3_AddLight(IDirect3DRMFrame3 *iface, IDirect3DRMLight *light) { - struct d3drm_frame *This = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); ULONG i; - IDirect3DRMLight** lights; TRACE("iface %p, light %p.\n", iface, light); @@ -885,33 +884,15 @@ static HRESULT WINAPI d3drm_frame3_AddLight(IDirect3DRMFrame3 *iface, IDirect3DR return D3DRMERR_BADOBJECT; /* Check if already existing and return gracefully without increasing ref count */ - for (i = 0; i < This->nb_lights; i++) - if (This->lights[i] == light) + for (i = 0; i < frame->nb_lights; i++) + if (frame->lights[i] == light) return D3DRM_OK; - if ((This->nb_lights + 1) > This->lights_capacity) - { - ULONG new_capacity; - - if (!This->lights_capacity) - { - new_capacity = 16; - lights = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMLight*)); - } - else - { - new_capacity = This->lights_capacity * 2; - lights = HeapReAlloc(GetProcessHeap(), 0, This->lights, new_capacity * sizeof(IDirect3DRMLight*)); - } - - if (!lights) - return E_OUTOFMEMORY; - - This->lights_capacity = new_capacity; - This->lights = lights; - } + if (!d3drm_array_reserve((void **)&frame->lights, &frame->lights_size, + frame->nb_lights + 1, sizeof(*frame->lights))) + return E_OUTOFMEMORY; - This->lights[This->nb_lights++] = light; + frame->lights[frame->nb_lights++] = light; IDirect3DRMLight_AddRef(light); return D3DRM_OK;

1 0