September 2016 - Wine-commits

Sebastian Lackner : vcomp: Implement _vcomp_reduction_{u, i}2 and add tests.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 86dea350eac15f7dd8a276d937e3c087a8f6bfc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86dea350eac15f7dd8a276d93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 10:56:08 2016 +0200 vcomp: Implement _vcomp_reduction_{u,i}2 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 30 +++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp120/vcomp120.spec | 4 ++-- dlls/vcomp140/vcomp140.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 8 files changed, 91 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 53ad28a..a3a29db 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -516,6 +516,36 @@ void CDECL _vcomp_atomic_xor_i2(short *dest, short val) do old = *dest; while (interlocked_cmpxchg16(dest, old ^ val, old) != old); } +static void CDECL _vcomp_atomic_bool_and_i2(short *dest, short val) +{ + short old; + do old = *dest; while (interlocked_cmpxchg16(dest, old && val, old) != old); +} + +static void CDECL _vcomp_atomic_bool_or_i2(short *dest, short val) +{ + short old; + do old = *dest; while (interlocked_cmpxchg16(dest, old ? old : (val != 0), old) != old); +} + +void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) +{ + static void (CDECL * const funcs[])(short *, short) = + { + _vcomp_atomic_add_i2, + _vcomp_atomic_add_i2, + _vcomp_atomic_mul_i2, + _vcomp_atomic_and_i2, + _vcomp_atomic_or_i2, + _vcomp_atomic_xor_i2, + _vcomp_atomic_bool_and_i2, + _vcomp_atomic_bool_or_i2, + }; + unsigned int op = (flags >> 8) & 0xf; + op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + funcs[op](dest, val); +} + void CDECL _vcomp_atomic_add_i4(int *dest, int val) { interlocked_xchg_add(dest, val); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index dc84f98..5911601 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -103,7 +103,9 @@ static int (CDECL *p_vcomp_get_thread_num)(void); static void (CDECL *p_vcomp_leave_critsect)(CRITICAL_SECTION *critsect); static int (CDECL *p_vcomp_master_begin)(void); static void (CDECL *p_vcomp_master_end)(void); +static void (CDECL *p_vcomp_reduction_i2)(unsigned int flags, short *dest, short val); static void (CDECL *p_vcomp_reduction_i4)(unsigned int flags, int *dest, int val); +static void (CDECL *p_vcomp_reduction_u2)(unsigned int flags, unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_reduction_u4)(unsigned int flags, unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); @@ -346,7 +348,9 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_leave_critsect); VCOMP_GET_PROC(_vcomp_master_begin); VCOMP_GET_PROC(_vcomp_master_end); + VCOMP_GET_PROC(_vcomp_reduction_i2); VCOMP_GET_PROC(_vcomp_reduction_i4); + VCOMP_GET_PROC(_vcomp_reduction_u2); VCOMP_GET_PROC(_vcomp_reduction_u4); VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); @@ -1883,6 +1887,50 @@ static void test_atomic_double(void) } } +static void test_reduction_integer16(void) +{ + struct + { + unsigned int flags; + short v1, v2, expected; + } + tests[] = + { + { 0x000, 0x1122, 0x7766, -0x7778 }, + { VCOMP_REDUCTION_FLAGS_ADD, 0x1122, 0x7766, -0x7778 }, + { VCOMP_REDUCTION_FLAGS_MUL, 0x1122, 0x7766, -0x5e74 }, + { VCOMP_REDUCTION_FLAGS_MUL, 0x1122, -0x7766, 0x5e74 }, + { VCOMP_REDUCTION_FLAGS_AND, 0x1122, 0x7766, 0x1122 }, + { VCOMP_REDUCTION_FLAGS_OR, 0x1122, 0x7766, 0x7766 }, + { VCOMP_REDUCTION_FLAGS_XOR, 0x1122, 0x7766, 0x6644 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1, 2, 1 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0, 2, 1 }, + { 0x800, 0, 2, 1 }, + { 0x900, 0, 2, 1 }, + { 0xa00, 0, 2, 1 }, + { 0xb00, 0, 2, 1 }, + { 0xc00, 0, 2, 1 }, + { 0xd00, 0, 2, 1 }, + { 0xe00, 0, 2, 1 }, + { 0xf00, 0, 2, 1 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + short val = tests[i].v1; + p_vcomp_reduction_i2(tests[i].flags, &val, tests[i].v2); + ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); + } + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + unsigned short val = tests[i].v1; + p_vcomp_reduction_u2(tests[i].flags, &val, tests[i].v2); + ok(val == (unsigned short)tests[i].expected, + "test %d: expected val == %u, got %u\n", i, (unsigned short)tests[i].expected, val); + } +} + static void CDECL reduction_cb(int *a, int *b) { p_vcomp_reduction_i4(VCOMP_REDUCTION_FLAGS_ADD, a, 1); @@ -1989,6 +2037,7 @@ START_TEST(vcomp) test_atomic_integer64(); test_atomic_float(); test_atomic_double(); + test_reduction_integer16(); test_reduction_integer32(); release_vcomp(); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index ddb35b8..85df49e 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -74,13 +74,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) @ cdecl _vcomp_reduction_i4(long ptr long) @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) _vcomp_reduction_i2 @ cdecl _vcomp_reduction_u4(long ptr long) _vcomp_reduction_i4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 92f6a9d..49f5a1b 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -74,13 +74,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index cb2a21d..dd9537a 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -75,13 +75,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec index cb2a21d..dd9537a 100644 --- a/dlls/vcomp120/vcomp120.spec +++ b/dlls/vcomp120/vcomp120.spec @@ -75,13 +75,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec index cb2a21d..dd9537a 100644 --- a/dlls/vcomp140/vcomp140.spec +++ b/dlls/vcomp140/vcomp140.spec @@ -75,13 +75,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 92f6a9d..49f5a1b 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -74,13 +74,13 @@ @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end @ stub _vcomp_reduction_i1 -@ stub _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ stub _vcomp_reduction_i8 @ stub _vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ stub _vcomp_reduction_u1 -@ stub _vcomp_reduction_u2 +@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 @ stub _vcomp_reduction_u8 @ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init

1 0

Sebastian Lackner : vcomp: Implement _vcomp_reduction_{u, i}1 and add tests.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: b5f95498a9e4c17188d6fdb94efe1c097b1a7999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f95498a9e4c17188d6fdb94… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 10:56:16 2016 +0200 vcomp: Implement _vcomp_reduction_{u,i}1 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 30 +++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp120/vcomp120.spec | 4 ++-- dlls/vcomp140/vcomp140.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 8 files changed, 91 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5f95498a9e4c17188d6f…

1 0

Aric Stewart : ntoskrnl.exe: Implement IoGetAttachedDevice and IoGetAttachedDeviceReference.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 562ce28d1bc1ae2f88165fa18e84a2089735992f URL: http://source.winehq.org/git/wine.git/?a=commit;h=562ce28d1bc1ae2f88165fa18… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 7 11:21:22 2016 +0200 ntoskrnl.exe: Implement IoGetAttachedDevice and IoGetAttachedDeviceReference. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 31 +++++++++++++++++++++++++++---- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b671e81..91e08d9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1105,13 +1105,19 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc /*********************************************************************** * IoGetAttachedDevice (NTOSKRNL.EXE.@) */ -PDEVICE_OBJECT WINAPI IoGetAttachedDevice( PDEVICE_OBJECT device ) +DEVICE_OBJECT* WINAPI IoGetAttachedDevice( DEVICE_OBJECT *device ) { - FIXME( "stub: %p\n", device ); + DEVICE_OBJECT *result = device; - return device; + TRACE( "(%p)\n", device ); + + while (result->AttachedDevice) + result = result->AttachedDevice; + + return result; } + /*********************************************************************** * IoGetDeviceProperty (NTOSKRNL.EXE.@) */ @@ -2121,6 +2127,12 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, } +static void ObReferenceObject( void *obj ) +{ + TRACE( "(%p): stub\n", obj ); +} + + /*********************************************************************** * ObDereferenceObject (NTOSKRNL.EXE.@) */ @@ -2140,7 +2152,7 @@ void WINAPI __regs_ObfReferenceObject( void *obj ) void WINAPI ObfReferenceObject( void *obj ) #endif { - FIXME( "(%p): stub\n", obj ); + ObReferenceObject( obj ); } @@ -2159,6 +2171,17 @@ void WINAPI ObfDereferenceObject( void *obj ) /*********************************************************************** + * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) + */ +DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) +{ + DEVICE_OBJECT *result = IoGetAttachedDevice( device ); + ObReferenceObject( result ); + return result; +} + + +/*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c94b902..c1b5749 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -374,7 +374,7 @@ @ stdcall IoFreeMdl(ptr) @ stub IoFreeWorkItem @ stdcall IoGetAttachedDevice(ptr) -@ stub IoGetAttachedDeviceReference +@ stdcall IoGetAttachedDeviceReference(ptr) @ stub IoGetBaseFileSystemDeviceObject @ stub IoGetBootDiskInformation @ stdcall IoGetConfigurationInformation()

1 0

Nikolay Sivov : d3d11/tests: Extend GetDC() tests.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 9b264ab3c5be48933adc3e143e797e06dfb3ed75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b264ab3c5be48933adc3e143… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 6 14:41:19 2016 +0300 d3d11/tests: Extend GetDC() tests. 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/d3d11/tests/Makefile.in | 2 +- dlls/d3d11/tests/d3d11.c | 169 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 152 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b264ab3c5be48933adc3…

1 0

Michael Stefaniuc : d3d9: Avoid a cast from a COM object to an interface.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 5562339681de3437898d301bdf484720fbb4c4ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5562339681de3437898d301bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 7 13:17:19 2016 +0200 d3d9: Avoid a cast from a COM object to an interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 8f5f143..5772c11 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -498,7 +498,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U } TRACE("Created device %p.\n", object); - *device = (IDirect3DDevice9 *)object; + *device = (IDirect3DDevice9 *)&object->IDirect3DDevice9Ex_iface; return D3D_OK; }

1 0

Huw Davies : winmm/tests: Pass the full size of MIDIHDR to midiOutPrepareHeader().
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 54f7a638454890d73fd580b04c9c5dd400800d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f7a638454890d73fd580b04… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 7 11:12:58 2016 +0100 winmm/tests: Pass the full size of MIDIHDR to midiOutPrepareHeader(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index b80d5d2..f3ea62c 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -514,8 +514,8 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)-1); ok(rc==MMSYSERR_INVALPARAM, "midiOutPrepare tiny rc=%s\n", mmsys_error(rc)); - rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); - ok(!rc, "midiOutPrepare old size rc=%s\n", mmsys_error(rc)); + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepare size rc=%s\n", mmsys_error(rc)); ok(mhdr.dwFlags & MHDR_PREPARED, "MHDR.dwFlags when prepared %x\n", mhdr.dwFlags); /* The device is still in paused mode and should queue the message. */ @@ -557,9 +557,9 @@ static void test_midiStream(UINT udev, HWND hwnd) /* Native fills dwOffset regardless of the cbMidiHdr size argument to midiStreamOut */ ok(1234567890!=mhdr.dwOffset, "play left MIDIHDR.dwOffset at %u\n", mhdr.dwOffset); - rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); - rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare #2 rc=%s\n", mmsys_error(rc)); trace("MIDIHDR stream flags=%x when finished\n", mhdr.dwFlags); @@ -584,9 +584,9 @@ static void test_midiStream(UINT udev, HWND hwnd) mhdr.dwFlags |= MHDR_ISSTRM; /* Preset flags (e.g. MHDR_ISSTRM) do not disturb. */ - rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutPrepare used flags %x rc=%s\n", mhdr.dwFlags, mmsys_error(rc)); - rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, offsetof(MIDIHDR,dwOffset)); + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare used flags %x rc=%s\n", mhdr.dwFlags, mmsys_error(rc)); rc = midiStreamRestart(hm);

1 0

André Hentschel : kernel32/tests: Allow ERROR_ACCESS_DENIED for GetThreadContext.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 59504204c338f6555114d045575156e7cb4f6f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59504204c338f6555114d0455… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 19:06:12 2016 +0200 kernel32/tests: Allow ERROR_ACCESS_DENIED for GetThreadContext. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index ac09bb8..001128b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1083,10 +1083,10 @@ static void test_SetThreadContext(void) ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef); ret = GetThreadContext( thread, &ctx ); - ok( (!ret && (GetLastError() == ERROR_GEN_FAILURE)) || + ok( (!ret && ((GetLastError() == ERROR_GEN_FAILURE) || (GetLastError() == ERROR_ACCESS_DENIED))) || (!ret && broken(GetLastError() == ERROR_INVALID_HANDLE)) || /* win2k */ broken(ret), /* 32bit application on NT 5.x 64bit */ - "got %d with %u (expected FALSE with ERROR_GEN_FAILURE)\n", + "got %d with %u (expected FALSE with ERROR_GEN_FAILURE or ERROR_ACCESS_DENIED)\n", ret, GetLastError() ); SetLastError(0xdeadbeef);

1 0

André Hentschel : setupapi/tests: Also check for ERROR_CALL_NOT_IMPLEMENTED at the second call to SetupDiCreateDeviceInfoListExW.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: cfcffd9799dea0044076eea178621f33998f68f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfcffd9799dea0044076eea17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 19:15:24 2016 +0200 setupapi/tests: Also check for ERROR_CALL_NOT_IMPLEMENTED at the second call to SetupDiCreateDeviceInfoListExW. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 319bb31..b6439d5 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -281,6 +281,12 @@ static void test_SetupDiCreateDeviceInfoListEx(void) devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL); error = GetLastError(); + if (error == ERROR_CALL_NOT_IMPLEMENTED) + { + /* win10 reports ERROR_CALL_NOT_IMPLEMENTED at first here */ + win_skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); + return; + } ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); ok(error == ERROR_INVALID_MACHINENAME || error == ERROR_MACHINE_UNAVAILABLE, "GetLastError returned wrong value : %d, (expected %d or %d)\n", error, ERROR_INVALID_MACHINENAME, ERROR_MACHINE_UNAVAILABLE);

1 0

Andrey Gusev : api-ms-win-core-localization-obsolete-l1-2-0: Add dll.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 8888459330028784a35c9a224697bcd94a1208a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8888459330028784a35c9a224… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 7 12:28:18 2016 +0300 api-ms-win-core-localization-obsolete-l1-2-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-localization-obsolete-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-localization-obsolete-l1-2-0.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 3ed4a60..1fde1d0 100755 --- a/configure +++ b/configure @@ -908,6 +908,7 @@ enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 enable_api_ms_win_core_localization_obsolete_l1_1_0 +enable_api_ms_win_core_localization_obsolete_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 @@ -17455,6 +17456,7 @@ wine_fn_config_dll api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_lo wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-2-0 enable_api_ms_win_core_localization_obsolete_l1_2_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 diff --git a/configure.ac b/configure.ac index 8d5116c..52b217e 100644 --- a/configure.ac +++ b/configure.ac @@ -2673,6 +2673,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) diff --git a/dlls/api-ms-win-core-localization-obsolete-l1-2-0/Makefile.in b/dlls/api-ms-win-core-localization-obsolete-l1-2-0/Makefile.in new file mode 100644 index 0000000..f393ad0 --- /dev/null +++ b/dlls/api-ms-win-core-localization-obsolete-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-obsolete-l1-2-0.dll diff --git a/dlls/api-ms-win-core-localization-obsolete-l1-2-0/api-ms-win-core-localization-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-localization-obsolete-l1-2-0/api-ms-win-core-localization-obsolete-l1-2-0.spec new file mode 100644 index 0000000..541dbc9 --- /dev/null +++ b/dlls/api-ms-win-core-localization-obsolete-l1-2-0/api-ms-win-core-localization-obsolete-l1-2-0.spec @@ -0,0 +1,10 @@ +@ stdcall CompareStringA(long long str long str long) kernel32.CompareStringA +@ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) kernel32.EnumLanguageGroupLocalesW +@ stdcall EnumSystemLanguageGroupsW(ptr long ptr) kernel32.EnumSystemLanguageGroupsW +@ stdcall EnumUILanguagesW(ptr long long) kernel32.EnumUILanguagesW +@ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW +@ stdcall GetStringTypeA(long long str long ptr) kernel32.GetStringTypeA +@ stdcall GetSystemDefaultLocaleName(ptr long) kernel32.GetSystemDefaultLocaleName +@ stdcall GetSystemDefaultUILanguage() kernel32.GetSystemDefaultUILanguage +@ stdcall GetUserDefaultUILanguage() kernel32.GetUserDefaultUILanguage +@ stdcall LCIDToLocaleName(long ptr long long) kernel32.LCIDToLocaleName diff --git a/tools/make_specfiles b/tools/make_specfiles index 57287ea..1b81db3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -162,6 +162,7 @@ my @dll_groups = "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-obsolete-l1-1-0", + "api-ms-win-core-localization-obsolete-l1-2-0", "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-memory-l1-1-2",

1 0

Sebastian Lackner : server: Do not store unix_pid in process_snapshot struct.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Module: wine Branch: master Commit: 7c06f1c218a2ecb1f2dda2cfb97b3a2c5b7f01e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c06f1c218a2ecb1f2dda2cfb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 12:51:39 2016 +0200 server: Do not store unix_pid in process_snapshot struct. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 1 - server/process.h | 1 - 2 files changed, 2 deletions(-) diff --git a/server/process.c b/server/process.c index 48ada99..2f2d1ad 100644 --- a/server/process.c +++ b/server/process.c @@ -1067,7 +1067,6 @@ struct process_snapshot *process_snap( int *count ) ptr->count = process->obj.refcount; ptr->priority = process->priority; ptr->handles = get_handle_table_count(process); - ptr->unix_pid = process->unix_pid; grab_object( process ); ptr++; } diff --git a/server/process.h b/server/process.h index eaa4adb..4e6de69 100644 --- a/server/process.h +++ b/server/process.h @@ -104,7 +104,6 @@ struct process_snapshot int threads; /* number of threads */ int priority; /* priority class */ int handles; /* number of handles */ - int unix_pid; /* Unix pid */ }; #define CPU_FLAG(cpu) (1 << (cpu))

1 0