wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Józef Kucia : wined3d: Avoid creating event queries manually.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 0edb71a35ffe00450b315a735b9853bd2d982e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edb71a35ffe00450b315a735… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:25:47 2017 +0200 wined3d: Avoid creating event queries manually. Fixes a regression introduced by commit be20ddc38b3f9e101460f5f8f04015b148d3e13d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 15 +++++++++------ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5740d65..9cd74fa 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -815,6 +815,8 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const struct wined3d_gl_info *gl_info) { enum wined3d_event_query_result ret; + struct wined3d_query *query; + HRESULT hr; /* No fencing needs to be done if the app promises not to overwrite * existing data. */ @@ -830,20 +832,21 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st if (!This->query) { - TRACE("Creating event query for buffer %p\n", This); + TRACE("Creating event query for buffer %p.\n", This); - if (!wined3d_event_query_supported(gl_info)) + hr = wined3d_query_create(This->resource.device, WINED3D_QUERY_TYPE_EVENT, + NULL, &wined3d_null_parent_ops, &query); + if (hr == WINED3DERR_NOTAVAILABLE) { FIXME("Event queries not supported, dropping async buffer locks.\n"); goto drop_query; } - - This->query = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->query)); - if (!This->query) + if (FAILED(hr)) { - ERR("Failed to allocate event query memory, dropping async buffer locks.\n"); + ERR("Failed to create event query, hr %#x.\n", hr); goto drop_query; } + This->query = CONTAINING_RECORD(query, struct wined3d_event_query, query); /* Since we don't know about old draws a glFinish is needed once */ gl_info->gl_ops.gl.p_glFinish(); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8445922..e76011c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -83,7 +83,7 @@ static struct wined3d_pipeline_statistics_query *wined3d_pipeline_statistics_que return CONTAINING_RECORD(query, struct wined3d_pipeline_statistics_query, query); } -BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) +static BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1025c98..d687e78 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1669,7 +1669,6 @@ enum wined3d_event_query_result enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; -BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_occlusion_query {

1 0

Mikhail Paulyshka : msvcp140: Implement _To_byte.
by Alexandre Julliard 10 Jul '17

10 Jul '17

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@details@Concurrency@@YAXPAU_Threadpool_chore@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 10 Jul '17

10 Jul '17

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 10 Jul '17

10 Jul '17

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

Alex Henrie : msvcr120: Correct asinh specfile definitions.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: fff25a6052cf5e204196b4f497b3ae4707955a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff25a6052cf5e204196b4f49… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 9 22:55:02 2017 -0600 msvcr120: Correct asinh specfile definitions. 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 | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 4 files changed, 12 insertions(+), 12 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 d5ade42..6a9ccae 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 @@ -129,9 +129,9 @@ @ stub acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf -@ cdecl asinh(double double) ucrtbase.asinh -@ cdecl asinhf(float float) ucrtbase.asinhf -@ cdecl asinhl(double double) ucrtbase.asinhl +@ cdecl asinh(double) ucrtbase.asinh +@ cdecl asinhf(float) ucrtbase.asinhf +@ cdecl asinhl(double) ucrtbase.asinhl @ cdecl atan(double) ucrtbase.atan @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 15cfe60..54f6c81 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2018,9 +2018,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ cdecl asinh(double double) MSVCR120_asinh -@ cdecl asinhf(float float) MSVCR120_asinhf -@ cdecl asinhl(double double) MSVCR120_asinhl +@ cdecl asinh(double) MSVCR120_asinh +@ cdecl asinhf(float) MSVCR120_asinhf +@ cdecl asinhl(double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 9690d4d..129456f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1684,9 +1684,9 @@ @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin @ cdecl -arch=arm,x86_64 asinf(float) msvcr120.asinf -@ cdecl asinh(double double) msvcr120.asinh -@ cdecl asinhf(float float) msvcr120.asinhf -@ cdecl asinhl(double double) msvcr120.asinhl +@ cdecl asinh(double) msvcr120.asinh +@ cdecl asinhf(float) msvcr120.asinhf +@ cdecl asinhl(double) msvcr120.asinhl @ cdecl atan(double) msvcr120.atan @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a27a2c6..5a0f957 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2160,9 +2160,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ cdecl asinh(double double) MSVCR120_asinh -@ cdecl asinhf(float float) MSVCR120_asinhf -@ cdecl asinhl(double double) MSVCR120_asinhl +@ cdecl asinh(double) MSVCR120_asinh +@ cdecl asinhf(float) MSVCR120_asinhf +@ cdecl asinhl(double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f

1 0

Alexandre Julliard : winex11: Load a monochrome cursor instead of converting a color one when possible.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 2e0a1cfd8355ee0328838eb56b283494103fcd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0a1cfd8355ee0328838eb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 11:42:08 2017 +0200 winex11: Load a monochrome cursor instead of converting a color one when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 259263d..5ace405 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1160,6 +1160,43 @@ done: } /*********************************************************************** + * create_xlib_load_mono_cursor + * + * Create a monochrome X cursor from a color Windows one by trying to load the monochrome resource. + */ +static Cursor create_xlib_load_mono_cursor( HDC hdc, HANDLE handle, int width, int height ) +{ + Cursor cursor = None; + HANDLE mono; + ICONINFOEXW info; + BITMAP bm; + + if (!(mono = CopyImage( handle, IMAGE_CURSOR, width, height, LR_MONOCHROME | LR_COPYFROMRESOURCE ))) + return None; + + info.cbSize = sizeof(info); + if (GetIconInfoExW( mono, &info )) + { + if (!info.hbmColor) + { + GetObjectW( info.hbmMask, sizeof(bm), &bm ); + bm.bmHeight = max( 1, bm.bmHeight / 2 ); + /* make sure hotspot is valid */ + if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + { + info.xHotspot = bm.bmWidth / 2; + info.yHotspot = bm.bmHeight / 2; + } + cursor = create_xlib_monochrome_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + } + else DeleteObject( info.hbmColor ); + DeleteObject( info.hbmMask ); + } + DestroyCursor( mono ); + return cursor; +} + +/*********************************************************************** * create_xlib_color_cursor * * Create a color X cursor from a Windows one. @@ -1334,6 +1371,7 @@ static Cursor create_cursor( HANDLE handle ) if (pXcursorImagesLoadCursor) cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif + if (!cursor) cursor = create_xlib_load_mono_cursor( hdc, handle, bm.bmWidth, bm.bmHeight ); if (!cursor) cursor = create_xlib_color_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor ); }

1 0

Alexandre Julliard : user32: Implement LR_MONOCHROME for loading cursors.
by Alexandre Julliard 10 Jul '17

10 Jul '17

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 10 Jul '17

10 Jul '17

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 10 Jul '17

10 Jul '17

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 10 Jul '17

10 Jul '17

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

← Newer
1
...
46
47
48
49
50
51
52
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017