July 2016 - Wine-commits - list.winehq.org

Sebastian Lackner : vcomp/tests: Add tests for 16-bit atomic instructions.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: b86ed6fe154a15a0e5a8c9e8969eb1955ea99f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86ed6fe154a15a0e5a8c9e89… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 18 16:06:20 2016 +0200 vcomp/tests: Add tests for 16-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 3c59a13..f668cec 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -35,34 +35,45 @@ static VOID (WINAPI *pReleaseActCtx)(HANDLE); typedef CRITICAL_SECTION *omp_lock_t; typedef CRITICAL_SECTION *omp_nest_lock_t; +static void (CDECL *p_vcomp_atomic_add_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_add_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_add_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_atomic_add_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_add_r8)(double *dest, double val); +static void (CDECL *p_vcomp_atomic_and_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_and_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_and_i8)(LONG64 *dest, LONG64 val); +static void (CDECL *p_vcomp_atomic_div_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_div_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_atomic_div_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_div_r8)(double *dest, double val); +static void (CDECL *p_vcomp_atomic_div_ui2)(unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_atomic_div_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_div_ui8)(ULONG64 *dest, ULONG64 val); +static void (CDECL *p_vcomp_atomic_mul_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_mul_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_mul_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_atomic_mul_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_mul_r8)(double *dest, double val); +static void (CDECL *p_vcomp_atomic_or_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_or_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_or_i8)(LONG64 *dest, LONG64 val); +static void (CDECL *p_vcomp_atomic_shl_i2)(short *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_shl_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shl_i8)(LONG64 *dest, unsigned int val); +static void (CDECL *p_vcomp_atomic_shr_i2)(short *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_shr_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_i8)(LONG64 *dest, unsigned int val); +static void (CDECL *p_vcomp_atomic_shr_ui2)(unsigned short *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_shr_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_shr_ui8)(ULONG64 *dest, unsigned int val); +static void (CDECL *p_vcomp_atomic_sub_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_sub_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_sub_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_sub_r8)(double *dest, double val); +static void (CDECL *p_vcomp_atomic_xor_i2)(short *dest, short val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_xor_i8)(LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_barrier)(void); @@ -249,34 +260,45 @@ static BOOL init_vcomp(void) return FALSE; } + VCOMP_GET_PROC(_vcomp_atomic_add_i2); VCOMP_GET_PROC(_vcomp_atomic_add_i4); VCOMP_GET_PROC(_vcomp_atomic_add_i8); VCOMP_GET_PROC(_vcomp_atomic_add_r4); VCOMP_GET_PROC(_vcomp_atomic_add_r8); + VCOMP_GET_PROC(_vcomp_atomic_and_i2); VCOMP_GET_PROC(_vcomp_atomic_and_i4); VCOMP_GET_PROC(_vcomp_atomic_and_i8); + VCOMP_GET_PROC(_vcomp_atomic_div_i2); VCOMP_GET_PROC(_vcomp_atomic_div_i4); VCOMP_GET_PROC(_vcomp_atomic_div_i8); VCOMP_GET_PROC(_vcomp_atomic_div_r4); VCOMP_GET_PROC(_vcomp_atomic_div_r8); + VCOMP_GET_PROC(_vcomp_atomic_div_ui2); VCOMP_GET_PROC(_vcomp_atomic_div_ui4); VCOMP_GET_PROC(_vcomp_atomic_div_ui8); + VCOMP_GET_PROC(_vcomp_atomic_mul_i2); VCOMP_GET_PROC(_vcomp_atomic_mul_i4); VCOMP_GET_PROC(_vcomp_atomic_mul_i8); VCOMP_GET_PROC(_vcomp_atomic_mul_r4); VCOMP_GET_PROC(_vcomp_atomic_mul_r8); + VCOMP_GET_PROC(_vcomp_atomic_or_i2); VCOMP_GET_PROC(_vcomp_atomic_or_i4); VCOMP_GET_PROC(_vcomp_atomic_or_i8); + VCOMP_GET_PROC(_vcomp_atomic_shl_i2); VCOMP_GET_PROC(_vcomp_atomic_shl_i4); VCOMP_GET_PROC(_vcomp_atomic_shl_i8); + VCOMP_GET_PROC(_vcomp_atomic_shr_i2); VCOMP_GET_PROC(_vcomp_atomic_shr_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_i8); + VCOMP_GET_PROC(_vcomp_atomic_shr_ui2); VCOMP_GET_PROC(_vcomp_atomic_shr_ui4); VCOMP_GET_PROC(_vcomp_atomic_shr_ui8); + VCOMP_GET_PROC(_vcomp_atomic_sub_i2); VCOMP_GET_PROC(_vcomp_atomic_sub_i4); VCOMP_GET_PROC(_vcomp_atomic_sub_i8); VCOMP_GET_PROC(_vcomp_atomic_sub_r4); VCOMP_GET_PROC(_vcomp_atomic_sub_r8); + VCOMP_GET_PROC(_vcomp_atomic_xor_i2); VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_atomic_xor_i8); VCOMP_GET_PROC(_vcomp_barrier); @@ -1422,6 +1444,99 @@ static void test_omp_init_nest_lock(void) pomp_destroy_nest_lock(&lock); } +static void test_atomic_integer16(void) +{ + struct + { + void (CDECL *func)(short *, short); + short v1, v2, expected; + } + tests1[] = + { + { p_vcomp_atomic_add_i2, 0x1122, 0x7766, -0x7778 }, + { p_vcomp_atomic_and_i2, 0x1122, 0x7766, 0x1122 }, + { p_vcomp_atomic_div_i2, 0x7766, 0x1122, 6 }, + { p_vcomp_atomic_div_i2, 0x7766, -0x1122, -6 }, + { p_vcomp_atomic_mul_i2, 0x1122, 0x7766, -0x5e74 }, + { p_vcomp_atomic_mul_i2, 0x1122, -0x7766, 0x5e74 }, + { p_vcomp_atomic_or_i2, 0x1122, 0x7766, 0x7766 }, + { p_vcomp_atomic_sub_i2, 0x1122, 0x7766, -0x6644 }, + { p_vcomp_atomic_xor_i2, 0x1122, 0x7766, 0x6644 }, + }; + struct + { + void (CDECL *func)(short *, unsigned int); + short v1; + unsigned int v2; + short expected; + } + tests2[] = + { + { p_vcomp_atomic_shl_i2, 0x1122, 3, -0x76f0 }, + { p_vcomp_atomic_shl_i2, -0x1122, 3, 0x76f0 }, + { p_vcomp_atomic_shr_i2, 0x1122, 3, 0x224 }, + { p_vcomp_atomic_shr_i2, -0x1122, 3, -0x225 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shl_i2, 0x1122, 19, 0 }, + { p_vcomp_atomic_shl_i2, 0x1122, 35, -0x76f0 }, + { p_vcomp_atomic_shr_i2, 0x1122, 19, 0 }, + { p_vcomp_atomic_shr_i2, 0x1122, 35, 0x224 }, +#endif + }; + struct + { + void (CDECL *func)(unsigned short *, unsigned short); + unsigned short v1, v2, expected; + } + tests3[] = + { + { p_vcomp_atomic_div_ui2, 0x7766, 0x1122, 6 }, + { p_vcomp_atomic_div_ui2, 0x7766, 0xeede, 0 }, + }; + struct + { + void (CDECL *func)(unsigned short *, unsigned int); + unsigned short v1; + unsigned int v2; + unsigned short expected; + } + tests4[] = + { + { p_vcomp_atomic_shr_ui2, 0x1122, 3, 0x224 }, + { p_vcomp_atomic_shr_ui2, 0xeede, 3, 0x1ddb }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shr_ui2, 0x1122, 19, 0 }, + { p_vcomp_atomic_shr_ui2, 0x1122, 35, 0x224 }, +#endif + }; + int i; + + for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + { + short val = tests1[i].v1; + tests1[i].func(&val, tests1[i].v2); + ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); + } + for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + { + short val = tests2[i].v1; + tests2[i].func(&val, tests2[i].v2); + ok(val == tests2[i].expected, "test %d: expected val == %d, got %d\n", i, tests2[i].expected, val); + } + for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) + { + unsigned short val = tests3[i].v1; + tests3[i].func(&val, tests3[i].v2); + ok(val == tests3[i].expected, "test %d: expected val == %u, got %u\n", i, tests3[i].expected, val); + } + for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) + { + unsigned short val = tests4[i].v1; + tests4[i].func(&val, tests4[i].v2); + ok(val == tests4[i].expected, "test %d: expected val == %u, got %u\n", i, tests4[i].expected, val); + } +} + static void test_atomic_integer32(void) { struct @@ -1656,6 +1771,7 @@ START_TEST(vcomp) test_vcomp_flush(); test_omp_init_lock(); test_omp_init_nest_lock(); + test_atomic_integer16(); test_atomic_integer32(); test_atomic_integer64(); test_atomic_float();

1 0

Sebastian Lackner : vcomp: Implement 8-bit atomic instructions.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: c3fec9b556d0cfe16dce8766ec2e106d4cbefec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fec9b556d0cfe16dce8766e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 19 11:50:54 2016 +0200 vcomp: Implement 8-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 22 ++++----- dlls/vcomp100/vcomp100.spec | 22 ++++----- dlls/vcomp110/vcomp110.spec | 22 ++++----- dlls/vcomp120/vcomp120.spec | 22 ++++----- dlls/vcomp90/vcomp90.spec | 22 ++++----- 6 files changed, 164 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3fec9b556d0cfe16dce8…

1 0

Sebastian Lackner : vcomp/tests: Add tests for 8-bit atomic instructions.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: fc0ec2de7ef2d63e5f6b7c2a8c4cfc2a04f17488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0ec2de7ef2d63e5f6b7c2a8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 18 16:06:47 2016 +0200 vcomp/tests: Add tests for 8-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc0ec2de7ef2d63e5f6b7…

1 0

John Sheu : kernel32/tests: Add some tests for fiber-local storage.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 556fef3dd184e71e1f0345bd8f37259c88a6f078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556fef3dd184e71e1f0345bd8… Author: John Sheu <sheu(a)google.com> Date: Tue Jul 12 17:00:17 2016 -0700 kernel32/tests: Add some tests for fiber-local storage. Signed-off-by: John Sheu <sheu(a)google.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 254 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 222 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=556fef3dd184e71e1f034…

1 0

Nikolay Sivov : msscript: Implement Timeout property.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 37757d5e6c263bf37db83a7d7dcf7be4ee68a1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37757d5e6c263bf37db83a7d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 18 22:46:37 2016 +0300 msscript: Implement Timeout property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 27 ++++++++++++++--- dlls/msscript.ocx/tests/msscript.c | 62 +++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 4a1b378..319f901 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -76,6 +76,7 @@ struct ScriptControl { LONG ref; IOleClientSite *site; SIZEL extent; + LONG timeout; /* connection points */ ConnectionPoint *cp_list; @@ -642,15 +643,30 @@ static HRESULT WINAPI ScriptControl_get_SitehWnd(IScriptControl *iface, LONG *p) static HRESULT WINAPI ScriptControl_get_Timeout(IScriptControl *iface, LONG *p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!p) + return E_POINTER; + + *p = This->timeout; + return S_OK; } -static HRESULT WINAPI ScriptControl_put_Timeout(IScriptControl *iface, LONG milliseconds) +static HRESULT WINAPI ScriptControl_put_Timeout(IScriptControl *iface, LONG timeout) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%d)\n", This, milliseconds); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, timeout); + + if (timeout < -1) + return CTL_E_INVALIDPROPERTYVALUE; + + if (timeout != -1) + FIXME("execution timeout ignored\n"); + + This->timeout = timeout; + return S_OK; } static HRESULT WINAPI ScriptControl_get_AllowUI(IScriptControl *iface, VARIANT_BOOL *p) @@ -1659,6 +1675,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->site = NULL; script_control->cp_list = NULL; script_control->host = NULL; + script_control->timeout = 10000; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 0768174..427d0ca 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -33,6 +33,7 @@ #define TESTSCRIPT_CLSID "{178fc164-f585-4e24-9c13-4bb7faf80746}" static const GUID CLSID_TestScript = {0x178fc164,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; +static const WCHAR vbW[] = {'V','B','S','c','r','i','p','t',0}; #ifdef _WIN64 @@ -672,7 +673,6 @@ static void test_olecontrol(void) static void test_Language(void) { - static const WCHAR vbW[] = {'V','B','S','c','r','i','p','t',0}; static const WCHAR jsW[] = {'J','S','c','r','i','p','t',0}; static const WCHAR vb2W[] = {'v','B','s','c','r','i','p','t',0}; static const WCHAR dummyW[] = {'d','u','m','m','y',0}; @@ -920,6 +920,65 @@ static void test_pointerinactive(void) IScriptControl_Release(sc); } +static void test_timeout(void) +{ + IScriptControl *sc; + HRESULT hr; + LONG val; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_Timeout(sc, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + val = 0; + hr = IScriptControl_get_Timeout(sc, &val); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(val == 10000, "got %d\n", val); + + hr = IScriptControl_put_Timeout(sc, -1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + val = 0; + hr = IScriptControl_get_Timeout(sc, &val); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(val == -1, "got %d\n", val); + + hr = IScriptControl_put_Timeout(sc, -2); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + + val = 0; + hr = IScriptControl_get_Timeout(sc, &val); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(val == -1, "got %d\n", val); + + hr = IScriptControl_put_Timeout(sc, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + val = 1; + hr = IScriptControl_get_Timeout(sc, &val); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(val == 0, "got %d\n", val); + + str = SysAllocString(vbW); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + val = 1; + hr = IScriptControl_get_Timeout(sc, &val); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(val == 0, "got %d\n", val); + + hr = IScriptControl_put_Timeout(sc, 10000); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -943,6 +1002,7 @@ START_TEST(msscript) test_quickactivate(); test_viewobject(); test_pointerinactive(); + test_timeout(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : vcruntime140: Forward set_unexpected.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: ec0b875e35199b35b7d7f9a370024efb8cac6519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0b875e35199b35b7d7f9a37… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 19 08:00:07 2016 +0000 vcruntime140: Forward set_unexpected. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 06ef550..1e16e5f 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1156,7 +1156,7 @@ @ cdecl memcmp(ptr ptr long) ucrtbase.memcmp @ cdecl memcpy(ptr ptr long) ucrtbase.memcpy @ cdecl memmove(ptr ptr long) ucrtbase.memmove -@ stub set_unexpected +@ cdecl set_unexpected(ptr) ucrtbase.set_unexpected @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) ucrtbase.setjmp @ cdecl strchr(str long) ucrtbase.strchr @ cdecl strrchr(str long) ucrtbase.strrchr diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0d6b397..7058990 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2480,7 +2480,7 @@ @ cdecl scalbnf(float long) MSVCRT__scalbf @ cdecl scalbnl(double long) MSVCR120_scalbnl @ stub set_terminate -@ stub set_unexpected +@ cdecl set_unexpected(ptr) MSVCRT_set_unexpected @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index a49e7b9..a8dc379 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -77,7 +77,7 @@ @ cdecl memcpy(ptr ptr long) ucrtbase.memcpy @ cdecl memmove(ptr ptr long) ucrtbase.memmove @ cdecl memset(ptr long long) ucrtbase.memset -@ stub set_unexpected +@ cdecl set_unexpected(ptr) ucrtbase.set_unexpected @ cdecl strchr(str long) ucrtbase.strchr @ cdecl strrchr(str long) ucrtbase.strrchr @ cdecl strstr(str str) ucrtbase.strstr

1 0

Michael Stefaniuc : mshtml: Avoid using LPSTREAM.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 3223e15230d342ea8bd3a7fe6c046de614539a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3223e15230d342ea8bd3a7fe6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 10:03:12 2016 +0200 mshtml: Avoid using LPSTREAM. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/view.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a4a190c..2735ab5 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -876,7 +876,7 @@ static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) return S_FALSE; } -static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm) +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *pStm) { HTMLDocument *This = impl_from_IPersistStreamInit(iface); IMoniker *mon; @@ -900,7 +900,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM return hres; } -static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream *pStm, BOOL fClearDirty) { HTMLDocument *This = impl_from_IPersistStreamInit(iface); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 8ca3caf..4470a43 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -697,14 +697,14 @@ static HRESULT WINAPI OleDocumentView_CloseView(IOleDocumentView *iface, DWORD d return S_OK; } -static HRESULT WINAPI OleDocumentView_SaveViewState(IOleDocumentView *iface, LPSTREAM pstm) +static HRESULT WINAPI OleDocumentView_SaveViewState(IOleDocumentView *iface, IStream *pstm) { HTMLDocument *This = impl_from_IOleDocumentView(iface); FIXME("(%p)->(%p)\n", This, pstm); return E_NOTIMPL; } -static HRESULT WINAPI OleDocumentView_ApplyViewState(IOleDocumentView *iface, LPSTREAM pstm) +static HRESULT WINAPI OleDocumentView_ApplyViewState(IOleDocumentView *iface, IStream *pstm) { HTMLDocument *This = impl_from_IOleDocumentView(iface); FIXME("(%p)->(%p)\n", This, pstm);

1 0

Michael Stefaniuc : user32: Use SetRect() instead of open coding it.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 07ada9a85bc4f3d6cb36a515a5ee3130f5de707a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ada9a85bc4f3d6cb36a515a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:55:04 2016 +0200 user32: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 5 +---- dlls/user32/cursoricon.c | 5 +---- dlls/user32/dialog.c | 4 +--- dlls/user32/mdi.c | 5 +---- dlls/user32/menu.c | 5 +---- dlls/user32/uitools.c | 29 ++++++----------------------- dlls/user32/win.c | 6 +----- 7 files changed, 12 insertions(+), 47 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 13fc746..5ed9c92 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -690,11 +690,8 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) static BOOL CALLBACK BUTTON_DrawTextCallback(HDC hdc, LPARAM lp, WPARAM wp, int cx, int cy) { RECT rc; - rc.left = 0; - rc.top = 0; - rc.right = cx; - rc.bottom = cy; + SetRect(&rc, 0, 0, cx, cy); DrawTextW(hdc, (LPCWSTR)lp, -1, &rc, (UINT)wp); return TRUE; } diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4f93195..2b92307 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2289,10 +2289,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (DoOffscreen) { RECT r; - r.left = 0; - r.top = 0; - r.right = cxWidth; - r.bottom = cxWidth; + SetRect(&r, 0, 0, cxWidth, cxWidth); if (!(hdc_dest = CreateCompatibleDC(hdc))) goto failed; if (!(hB_off = CreateCompatibleBitmap(hdc, cxWidth, cyWidth))) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 9cb4b8d..0663693 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -517,9 +517,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, /* Create dialog main window */ - rect.left = rect.top = 0; - rect.right = MulDiv(template.cx, xBaseUnit, 4); - rect.bottom = MulDiv(template.cy, yBaseUnit, 8); + SetRect(&rect, 0, 0, MulDiv(template.cx, xBaseUnit, 4), MulDiv(template.cy, yBaseUnit, 8)); if (template.style & DS_CONTROL) template.style &= ~(WS_CAPTION|WS_SYSMENU); diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index c23a670..76999a8 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1244,10 +1244,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM { RECT rect; - rect.left = 0; - rect.top = 0; - rect.right = LOWORD(lParam); - rect.bottom = HIWORD(lParam); + SetRect(&rect, 0, 0, LOWORD(lParam), HIWORD(lParam)); AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE), 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) ); MoveWindow(ci->hwndActiveChild, rect.left, rect.top, diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 52d09ce..45ce7f5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1343,10 +1343,7 @@ MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc) hOrigBitmap = SelectObject(hdcMem, get_up_arrow_bitmap()); else hOrigBitmap = SelectObject(hdcMem, get_up_arrow_inactive_bitmap()); - rect.left = 0; - rect.top = 0; - rect.right = lppop->Width; - rect.bottom = arrow_bitmap_height; + SetRect(&rect, 0, 0, lppop->Width, arrow_bitmap_height); FillRect(hdc, &rect, GetSysColorBrush(COLOR_MENU)); BitBlt(hdc, (lppop->Width - arrow_bitmap_width) / 2, 0, arrow_bitmap_width, arrow_bitmap_height, hdcMem, 0, 0, SRCCOPY); diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index fa2e826..c3cd755 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -796,10 +796,7 @@ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) /* Define bounding box */ i = 14*SmallDiam/16; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; + SetRect(&myr, xc - i + i / 2, yc - i + i / 2, xc + i / 2, yc + i / 2); if((uFlags & 0xff) == DFCS_BUTTONRADIOMASK) { @@ -840,10 +837,7 @@ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) } i = 10*SmallDiam/16; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; + SetRect(&myr, xc - i + i / 2, yc - i + i / 2, xc + i / 2, yc + i / 2); i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; hpsave = SelectObject(dc, SYSCOLOR_GetPen(i)); hbsave = SelectObject(dc, GetSysColorBrush(i)); @@ -856,10 +850,7 @@ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) { i = 6*SmallDiam/16; i = i < 1 ? 1 : i; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; + SetRect(&myr, xc - i + i / 2, yc - i + i / 2, xc + i / 2, yc + i / 2); i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_WINDOWTEXT; hbsave = SelectObject(dc, GetSysColorBrush(i)); @@ -1189,10 +1180,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) yc = myr.top + SmallDiam - SmallDiam/2; i = 234*SmallDiam/750; i = i < 1 ? 1 : i; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; + SetRect(&myr, xc - i + i / 2, yc - i + i / 2, xc + i / 2, yc + i / 2); Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye); break; @@ -1648,10 +1636,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp if(!cy) cy = s.cy; } - rc.left = x; - rc.top = y; - rc.right = x + cx; - rc.bottom = y + cy; + SetRect(&rc, x, y, x + cx, y + cy); if(flags & DSS_RIGHT) /* This one is not documented in the win32.hlp file */ dtflags |= DT_RIGHT; @@ -1679,9 +1664,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp if(!memdc) goto cleanup; hbmsave = SelectObject(memdc, hbm); if(!hbmsave) goto cleanup; - rc.left = rc.top = 0; - rc.right = cx; - rc.bottom = cy; + SetRect(&rc, 0, 0, cx, cy); if(!FillRect(memdc, &rc, GetStockObject(WHITE_BRUSH))) goto cleanup; SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9051f7a..f69297c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3567,11 +3567,7 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); - rect.left = pt.x - wDragWidth; - rect.right = pt.x + wDragWidth; - - rect.top = pt.y - wDragHeight; - rect.bottom = pt.y + wDragHeight; + SetRect(&rect, pt.x - wDragWidth, pt.y - wDragHeight, pt.x + wDragWidth, pt.y + wDragHeight); SetCapture(hWnd);

1 0

Michael Stefaniuc : user32: Simplify a RECT copy.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: e13011f63e43e589ea9f13bafe0367e664249fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13011f63e43e589ea9f13baf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:53:55 2016 +0200 user32: Simplify a RECT copy. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b73aa79..230f8da 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1059,14 +1059,10 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) else rect.bottom = rect.top + descr->items[i].height; + /* keep the focus rect, to paint the focus item after */ if (i == descr->focus_item) - { - /* keep the focus rect, to paint the focus item after */ - focusRect.left = rect.left; - focusRect.right = rect.right; - focusRect.top = rect.top; - focusRect.bottom = rect.bottom; - } + focusRect = rect; + LISTBOX_PaintItem( descr, hdc, &rect, i, ODA_DRAWENTIRE, TRUE ); rect.top = rect.bottom;

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice*::InitFromD3D.
by Alexandre Julliard 19 Jul '16

19 Jul '16

Module: wine Branch: master Commit: 3d343d6eee6a7b08b656ea5895fb068b93312057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d343d6eee6a7b08b656ea589… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Jul 15 21:13:45 2016 +0530 d3drm: Implement IDirect3DRMDevice*::InitFromD3D. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 18 ++++- dlls/d3drm/device.c | 26 ++++-- dlls/d3drm/tests/d3drm.c | 201 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 225 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d343d6eee6a7b08b656e…

1 0