January 2019 - Wine-commits

Zebediah Figura : hal: Implement KeAcquireSpinLock().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 389b8fc3934f4445535f03a5530e3846732d6c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=389b8fc3934f4445535f03a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:36 2019 -0600 hal: Implement KeAcquireSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 19 ++++++++++++++++--- dlls/hal/hal.spec | 2 +- include/ddk/wdm.h | 3 +++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 924fd9e..fca4f23 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -69,11 +69,24 @@ BOOLEAN WINAPI DECLSPEC_HIDDEN __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMu } DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) -KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock( KSPIN_LOCK *lock ) { - FIXME( "(%p) stub!\n", SpinLock ); + KIRQL irql; + KeAcquireSpinLock( lock, &irql ); + return irql; +} - return 0; +static inline void small_pause(void) +{ + __asm__ __volatile__( "rep;nop" : : : "memory" ); +} + +void WINAPI KeAcquireSpinLock( KSPIN_LOCK *lock, KIRQL *irql ) +{ + TRACE("lock %p, irql %p.\n", lock, irql); + while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) + small_pause(); + *irql = 0; } DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 8596052..b4ec512 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -68,7 +68,7 @@ @ stub IoSetPartitionInformation @ stub IoWritePartitionTable @ stub KdComPortInUse -@ stub KeAcquireSpinLock +@ stdcall -arch=i386 KeAcquireSpinLock(ptr ptr) @ stub KeFlushWriteBuffer @ stdcall -arch=arm,arm64,i386 KeGetCurrentIrql() @ stub KeLowerIrql diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d964ecb..2822c69 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1419,6 +1419,9 @@ void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); +#ifdef __i386__ +void WINAPI KeAcquireSpinLock(KSPIN_LOCK*,KIRQL*); +#endif BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeAcquireSpinLockRaiseToDpc().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: fee112f90accd80805e9b499b9f8917661f76cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee112f90accd80805e9b499… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:37 2019 -0600 ntoskrnl.exe: Implement KeAcquireSpinLockRaiseToDpc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 20 ++++++++++++++++++++ include/ddk/wdm.h | 3 +++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index dd822c0..a48b9e3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3855,15 +3855,6 @@ void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) } /*********************************************************************** - * KeAcquireSpinLockRaiseToDpc (NTOSKRNL.EXE.@) - */ -KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) -{ - FIXME( "stub: %p\n", spinlock ); - return 0; -} - -/*********************************************************************** * IoCreateNotificationEvent (NTOSKRNL.EXE.@) */ PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ed3e2c6..8483b36 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -511,7 +511,7 @@ @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stub KeAcquireSpinLockAtDpcLevel -@ stdcall -arch=x86_64 KeAcquireSpinLockRaiseToDpc(ptr) +@ stdcall -arch=arm,arm64,x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stub KeAreApcsDisabled @ stub KeAttachProcess diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 832b048..74e84a6 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -384,6 +384,15 @@ void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) } #ifndef __i386__ +static inline void small_pause(void) +{ +#ifdef __x86_64__ + __asm__ __volatile__( "rep;nop" : : : "memory" ); +#else + __asm__ __volatile__( "" : : : "memory" ); +#endif +} + /*********************************************************************** * KeReleaseSpinLock (NTOSKRNL.EXE.@) */ @@ -392,4 +401,15 @@ void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) TRACE("lock %p, irql %u.\n", lock, irql); InterlockedExchangePointer( (void **)lock, 0 ); } + +/*********************************************************************** + * KeAcquireSpinLockRaiseToDpc (NTOSKRNL.EXE.@) + */ +KIRQL WINAPI KeAcquireSpinLockRaiseToDpc( KSPIN_LOCK *lock ) +{ + TRACE("lock %p.\n", lock); + while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) + small_pause(); + return 0; +} #endif diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 2822c69..1c12c1e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1421,6 +1421,9 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); #ifdef __i386__ void WINAPI KeAcquireSpinLock(KSPIN_LOCK*,KIRQL*); +#else +#define KeAcquireSpinLock( lock, irql ) *(irql) = KeAcquireSpinLockRaiseToDpc( lock ) +KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK*); #endif BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT);

1 0

Gabriel Ivăncescu : kernel32/tests: Test partially overlapping buffers for MultiByteToWideChar.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: ec89a9302834938aa9620227591760d30b1791b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec89a9302834938aa9620227… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 13:29:55 2019 +0200 kernel32/tests: Test partially overlapping buffers for MultiByteToWideChar. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index b15a3a1..38f094f 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -314,12 +314,22 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + /* limit such that strA's NUL terminator overlaps strW's NUL */ + size_t overlap_limit = (sizeof(strW)-sizeof(strA)) - (sizeof(strW[0])-sizeof(strA[0])); + SetLastError(0xdeadbeef); memcpy(buf + 1, strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buf + overlap_limit, strA, sizeof(strA)); + ret = MultiByteToWideChar(CP_ACP, 0, buf + overlap_limit, -1, (WCHAR *)buf, sizeof(buf) / sizeof(WCHAR)); + ok(ret == ARRAY_SIZE(strW), "unexpected ret %d\n", ret); + ok(!memcmp(buf, strW, sizeof(strW)), "conversion failed: %s\n", wine_dbgstr_wn((WCHAR *)buf, ARRAY_SIZE(strW))); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } static void test_string_conversion(LPBOOL bUsedDefaultChar)

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_shader_resource_view() .
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 8e70ce0872ae7f1e1978d1e08b3bf82f50d4f21e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e70ce0872ae7f1e1978d1e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:49 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_shader_resource_view(). It cannot be called while recording a stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b5460c9..4fa935f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2286,15 +2286,14 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic return; } - prev = device->update_state->shader_resource_view[type][idx]; + prev = device->state.shader_resource_view[type][idx]; if (view == prev) return; if (view) wined3d_shader_resource_view_incref(view); - device->update_state->shader_resource_view[type][idx] = view; - if (!device->recording) - wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); + device->state.shader_resource_view[type][idx] = view; + wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); if (prev) wined3d_shader_resource_view_decref(prev); }

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_sampler().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 7bb0d2d4e87c0290935da50c3fc79677f7ce3c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb0d2d4e87c0290935da50c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:50 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_sampler(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4fa935f..c910e83 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2337,15 +2337,14 @@ static void wined3d_device_set_sampler(struct wined3d_device *device, return; } - prev = device->update_state->sampler[type][idx]; + prev = device->state.sampler[type][idx]; if (sampler == prev) return; if (sampler) wined3d_sampler_incref(sampler); - device->update_state->sampler[type][idx] = sampler; - if (!device->recording) - wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler); + device->state.sampler[type][idx] = sampler; + wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler); if (prev) wined3d_sampler_decref(prev); }

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_pipeline_unordered_access_view ().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 6f721eede58b57dbf1a444795a9bd54d5a35578b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f721eede58b57dbf1a44479… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:51 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_pipeline_unordered_access_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c910e83..c466e0c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2950,15 +2950,14 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev return; } - prev = device->update_state->unordered_access_view[pipeline][idx]; + prev = device->state.unordered_access_view[pipeline][idx]; if (uav == prev && initial_count == ~0u) return; if (uav) wined3d_unordered_access_view_incref(uav); - device->update_state->unordered_access_view[pipeline][idx] = uav; - if (!device->recording) - wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); + device->state.unordered_access_view[pipeline][idx] = uav; + wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); if (prev) wined3d_unordered_access_view_decref(prev); }

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_stream_output().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 8973c22a485df5858971118f2ec70e1d8a53d435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8973c22a485df5858971118f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:52 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c466e0c..c799a57 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1329,15 +1329,14 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT return; } - stream = &device->update_state->stream_output[idx]; + stream = &device->state.stream_output[idx]; prev_buffer = stream->buffer; if (buffer) wined3d_buffer_incref(buffer); stream->buffer = buffer; stream->offset = offset; - if (!device->recording) - wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); + wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); }

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 6bb73652de78577161b98a3e1f92da7799455b22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bb73652de78577161b98a3e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:53 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c799a57..4f61eba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2247,15 +2247,14 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, return; } - prev = device->update_state->cb[type][idx]; + prev = device->state.cb[type][idx]; if (buffer == prev) return; if (buffer) wined3d_buffer_incref(buffer); - device->update_state->cb[type][idx] = buffer; - if (!device->recording) - wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + device->state.cb[type][idx] = buffer; + wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); }

1 0

Józef Kucia : d3d9: Validate surface parameter in d3d9_device_ColorFill().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: ac36e446c3b38e3092821087d64ef8629ab5e141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac36e446c3b38e3092821087… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:22 2019 +0100 d3d9: Validate surface parameter in d3d9_device_ColorFill(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46482 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/d3d9/device.c | 3 +++ dlls/d3d9/tests/visual.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a26d943..067ea2b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1757,6 +1757,9 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color); + if (!surface) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture, diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1f28fe1..c06acb7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1529,6 +1529,9 @@ static void color_fill_test(void) goto done; } + hr = IDirect3DDevice9_ColorFill(device, NULL, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* Test ColorFill on a the backbuffer (should pass) */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr);

1 0

Józef Kucia : d3d10core/tests: Add test for sample_c_lz instruction.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: e4069767e7338b593ba96381fe8367f707682f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4069767e7338b593ba96381… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:23 2019 +0100 d3d10core/tests: Add test for sample_c_lz instruction. 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/d3d10core/tests/d3d10core.c | 224 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4069767e7338b593ba9…

1 0