August 2018 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11/tests: Add a test for CopySubresourceRegion() with 1D textures.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 249e20128427ebf76a3531de4775cbaf30f01921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=249e20128427ebf76a3531de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 20 13:09:26 2018 +0200 d3d11/tests: Add a test for CopySubresourceRegion() with 1D textures. 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/d3d11/tests/d3d11.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bc2a53e..e43b2f3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11908,6 +11908,94 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_1d(void) +{ + D3D11_SUBRESOURCE_DATA resource_data[4]; + struct d3d11_test_context test_context; + D3D11_TEXTURE1D_DESC texture1d_desc; + D3D11_TEXTURE2D_DESC texture2d_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture1D *texture1d; + ID3D11Texture2D *texture2d; + ID3D11Device *device; + unsigned int i, j; + D3D11_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture1d_desc.Width = 4; + texture1d_desc.MipLevels = 1; + texture1d_desc.ArraySize = 4; + texture1d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture1d_desc.Usage = D3D11_USAGE_DEFAULT; + texture1d_desc.BindFlags = 0; + texture1d_desc.CPUAccessFlags = 0; + texture1d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = &bitmap_data[4 * i]; + resource_data[i].SysMemPitch = texture1d_desc.Width * sizeof(bitmap_data); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D11Device_CreateTexture1D(device, &texture1d_desc, resource_data, &texture1d); + ok(hr == S_OK, "Failed to create 1d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_DEFAULT; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, 4, 1, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)texture2d, 0, + 0, i, 0, (ID3D11Resource *)texture1d, i, &box); + } + + get_texture_readback(texture2d, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, j, i, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11Texture1D_Release(texture1d); + ID3D11Texture2D_Release(texture2d); + release_test_context(&test_context); +} + static void test_copy_subresource_region_3d(void) { ID3D11ShaderResourceView *dst_srv, *src_srv; @@ -28075,6 +28163,7 @@ START_TEST(d3d11) queue_test(test_fragment_coords); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); + queue_test(test_copy_subresource_region_1d); queue_test(test_copy_subresource_region_3d); queue_test(test_resource_map); queue_for_each_feature_level(test_resource_access);

1 0

Zebediah Figura : winedbg/gdbproxy: Silence some noisy debug messages.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: e525e49976452ea86b1f0c285b0580c89261f911 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e525e49976452ea86b1f0c28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 18 11:28:24 2018 -0500 winedbg/gdbproxy: Silence some noisy debug messages. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 75654d3..512e011 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -434,7 +434,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) case EXCEPTION_DEBUG_EVENT: assert(dbg_curr_thread); - fprintf(stderr, "%08x:%08x: exception code=0x%08x\n", de->dwProcessId, + TRACE("%08x:%08x: exception code=0x%08x\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); if (fetch_context(gdbctx, dbg_curr_thread->handle, &gdbctx->context)) @@ -1286,7 +1286,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) reg = hex_to_int(gdbctx->in_packet, gdbctx->in_packet_len); if (reg >= gdbctx->process->be_cpu->gdb_num_regs) { - FIXME("Unhandled register %u\n", reg); + WARN("Unhandled register %u\n", reg); return packet_error; } if (dbg_curr_thread != gdbctx->other_thread && gdbctx->other_thread) @@ -1315,7 +1315,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) reg = strtoul(gdbctx->in_packet, &ptr, 16); if (ptr == NULL || reg >= gdbctx->process->be_cpu->gdb_num_regs || *ptr++ != '=') { - FIXME("Unhandled register %s\n", + WARN("Unhandled register %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len)); /* FIXME: if just the reg is above cpu_num_regs, don't tell gdb * it wouldn't matter too much, and it fakes our support for all regs

1 0

Michael Stefaniuc : dmusic: Add a stub midi out port.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 8c48fba6a207824676364b0e11929fdf4f1047f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c48fba6a207824676364b0e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 00:01:34 2018 +0200 dmusic: Add a stub midi out port. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 223 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7131756..2f8fb92 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -21,6 +21,7 @@ #include <assert.h> #include "dmusic_private.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -903,12 +904,232 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param return hr; } +struct midi_port { + IDirectMusicPort IDirectMusicPort_iface; + LONG ref; +}; + +static inline struct midi_port *impl_from_IDirectMusicPort(IDirectMusicPort *iface) +{ + return CONTAINING_RECORD(iface, struct midi_port, IDirectMusicPort_iface); +} + +static HRESULT WINAPI midi_IDirectMusicPort_QueryInterface(IDirectMusicPort *iface, REFIID riid, + void **ret_iface) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicPort)) + *ret_iface = iface; + else { + WARN("no interface for %s\n", debugstr_dmguid(riid)); + *ret_iface = NULL; + return E_NOINTERFACE; + } + + IDirectMusicPort_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI midi_IDirectMusicPort_AddRef(IDirectMusicPort *iface) +{ + struct midi_port *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI midi_IDirectMusicPort_Release(IDirectMusicPort *iface) +{ + struct midi_port *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref = %u\n", iface, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI midi_IDirectMusicPort_PlayBuffer(IDirectMusicPort *iface, + IDirectMusicBuffer *buffer) +{ + FIXME("(%p, %p) stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetReadNotificationHandle(IDirectMusicPort *iface, + HANDLE event) +{ + FIXME("(%p, %p) stub!\n", iface, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_Read(IDirectMusicPort *iface, + IDirectMusicBuffer *buffer) +{ + FIXME("(%p, %p) stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_DownloadInstrument(IDirectMusicPort *iface, + IDirectMusicInstrument *instrument, IDirectMusicDownloadedInstrument **downloaded, + DMUS_NOTERANGE *ranges, DWORD num_ranges) +{ + FIXME("(%p, %p, %p, %p, %u) stub!\n", iface, instrument, downloaded, ranges, num_ranges); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_UnloadInstrument(IDirectMusicPort *iface, + IDirectMusicDownloadedInstrument *downloaded) +{ + FIXME("(%p, %p) stub!\n", iface, downloaded); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetLatencyClock(IDirectMusicPort *iface, + IReferenceClock **clock) +{ + FIXME("(%p, %p) stub!\n", iface, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetRunningStats(IDirectMusicPort *iface, + DMUS_SYNTHSTATS *stats) +{ + FIXME("(%p, %p) stub!\n", iface, stats); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_Compact(IDirectMusicPort *iface) +{ + FIXME("(%p) stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS *caps) +{ + FIXME("(%p, %p) stub!\n", iface, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *iface, + DWORD io_control_code, void *in, DWORD size_in, void *out, DWORD size_out, DWORD *ret_len, + OVERLAPPED *overlapped) +{ + FIXME("(%p, %u, %p, %u, %p, %u, %p, %p) stub!\n", iface, io_control_code, in, size_in, out + , size_out, ret_len, overlapped); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetNumChannelGroups(IDirectMusicPort *iface, + DWORD cgroups) +{ + FIXME("(%p, %u) stub!\n", iface, cgroups); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetNumChannelGroups(IDirectMusicPort *iface, + DWORD *cgroups) +{ + FIXME("(%p, %p) stub!\n", iface, cgroups); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_Activate(IDirectMusicPort *iface, BOOL active) +{ + FIXME("(%p, %u) stub!\n", iface, active); + + return S_OK; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetChannelPriority(IDirectMusicPort *iface, + DWORD channel_group, DWORD channel, DWORD priority) +{ + FIXME("(%p, %u, %u, %u) stub!\n", iface, channel_group, channel, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetChannelPriority(IDirectMusicPort *iface, + DWORD channel_group, DWORD channel, DWORD *priority) +{ + FIXME("(%p, %u, %u, %p) stub!\n", iface, channel_group, channel, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetDirectSound(IDirectMusicPort *iface, + IDirectSound *dsound, IDirectSoundBuffer *dsbuffer) +{ + FIXME("(%p, %p, %p) stub!\n", iface, dsound, dsbuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *format, + DWORD *format_size, DWORD *buffer_size) +{ + FIXME("(%p, %p, %p, %p) stub!\n", iface, format, format_size, buffer_size); + + return E_NOTIMPL; +} + +static const IDirectMusicPortVtbl midi_port_vtbl = { + midi_IDirectMusicPort_QueryInterface, + midi_IDirectMusicPort_AddRef, + midi_IDirectMusicPort_Release, + midi_IDirectMusicPort_PlayBuffer, + midi_IDirectMusicPort_SetReadNotificationHandle, + midi_IDirectMusicPort_Read, + midi_IDirectMusicPort_DownloadInstrument, + midi_IDirectMusicPort_UnloadInstrument, + midi_IDirectMusicPort_GetLatencyClock, + midi_IDirectMusicPort_GetRunningStats, + midi_IDirectMusicPort_Compact, + midi_IDirectMusicPort_GetCaps, + midi_IDirectMusicPort_DeviceIoControl, + midi_IDirectMusicPort_SetNumChannelGroups, + midi_IDirectMusicPort_GetNumChannelGroups, + midi_IDirectMusicPort_Activate, + midi_IDirectMusicPort_SetChannelPriority, + midi_IDirectMusicPort_GetChannelPriority, + midi_IDirectMusicPort_SetDirectSound, + midi_IDirectMusicPort_GetFormat, +}; + HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { - FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); + struct midi_port *obj; - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", port_params, port_caps, port); + + if (!(obj = heap_alloc_zero(sizeof(*obj)))) + return E_OUTOFMEMORY; + + obj->IDirectMusicPort_iface.lpVtbl = &midi_port_vtbl; + obj->ref = 1; + + *port = &obj->IDirectMusicPort_iface; + + return S_OK; } HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params,

1 0

Michael Stefaniuc : dmusic: Support midi in ports too.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: fcedc2b92076437a38b504a539e93992ccd8da09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcedc2b92076437a38b504a5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 00:01:36 2018 +0200 dmusic: Support midi in ports too. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index ebc8506..4df8664 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1126,14 +1126,12 @@ static const IDirectMusicPortVtbl midi_port_vtbl = { midi_IDirectMusicPort_GetFormat, }; -HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, - DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) +HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, + IDirectMusicPort **port) { struct midi_port *obj; HRESULT hr; - TRACE("(%p, %p, %p)\n", port_params, port_caps, port); - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; @@ -1151,10 +1149,18 @@ HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_pa return S_OK; } -HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, - DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) +HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) { - FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); + TRACE("(%p, %p, %p, %p)\n", parent, params, caps, port); - return E_NOTIMPL; + return midi_port_create(parent, params, caps, port); +} + +HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) +{ + TRACE("(%p, %p, %p, %p)\n", parent, params, caps, port); + + return midi_port_create(parent, params, caps, port); }

1 0

Michael Stefaniuc : dmusic: Implement IDirectMusicPort_GetLatencyClock() for the midi port.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 25dcca4b30fbae830386eac90d57077b8965e6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=25dcca4b30fbae830386eac9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 00:01:35 2018 +0200 dmusic: Implement IDirectMusicPort_GetLatencyClock() for the midi port. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 2f8fb92..ebc8506 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -907,6 +907,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param struct midi_port { IDirectMusicPort IDirectMusicPort_iface; LONG ref; + IReferenceClock *clock; }; static inline struct midi_port *impl_from_IDirectMusicPort(IDirectMusicPort *iface) @@ -949,8 +950,11 @@ static ULONG WINAPI midi_IDirectMusicPort_Release(IDirectMusicPort *iface) TRACE("(%p) ref = %u\n", iface, ref); - if (!ref) + if (!ref) { + if (This->clock) + IReferenceClock_Release(This->clock); heap_free(This); + } return ref; } @@ -999,9 +1003,17 @@ static HRESULT WINAPI midi_IDirectMusicPort_UnloadInstrument(IDirectMusicPort *i static HRESULT WINAPI midi_IDirectMusicPort_GetLatencyClock(IDirectMusicPort *iface, IReferenceClock **clock) { - FIXME("(%p, %p) stub!\n", iface, clock); + struct midi_port *This = impl_from_IDirectMusicPort(iface); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, clock); + + if (!clock) + return E_POINTER; + + *clock = This->clock; + IReferenceClock_AddRef(*clock); + + return S_OK; } static HRESULT WINAPI midi_IDirectMusicPort_GetRunningStats(IDirectMusicPort *iface, @@ -1118,6 +1130,7 @@ HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_pa DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { struct midi_port *obj; + HRESULT hr; TRACE("(%p, %p, %p)\n", port_params, port_caps, port); @@ -1127,6 +1140,12 @@ HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_pa obj->IDirectMusicPort_iface.lpVtbl = &midi_port_vtbl; obj->ref = 1; + hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (void **)&obj->clock, NULL); + if (hr != S_OK) { + HeapFree(GetProcessHeap(), 0, obj); + return hr; + } + *port = &obj->IDirectMusicPort_iface; return S_OK;

1 0

Daniel Lehman : msvcrt/tests: Add tests for _strnicoll/_wcsnicoll.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 3467d71c275d97f95ef9e6765d73ef442f27ae81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3467d71c275d97f95ef9e676… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 17 18:51:42 2018 +0200 msvcrt/tests: Add tests for _strnicoll/_wcsnicoll. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 86f49db..ae23890 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3472,6 +3472,90 @@ static void test__tcsncoll(void) } } +static void test__tcsnicoll(void) +{ + struct test { + const char *locale; + const char *str1; + const char *str2; + size_t count; + int exp; + BOOL todo; + }; + static const struct test tests[] = { + { "English", "abcd", "ABCD", 4, 0 }, + { "English", "abcd", "ABCD", 10, 0 }, + + { "English", "abc", "ABCD", 3, 0 }, + { "English", "abc", "ABCD", 4, -1 }, + { "English", "abc", "ABCD", 10, -1 }, + + { "English", "abcd", "ABC", 3, 0 }, + { "English", "abcd", "ABC", 4, 1 }, + { "English", "abcd", "ABC", 10, 1 }, + + { "English", "abcE", "ABCF", 3, 0 }, + + { "C", "abcd", "ABCD", 4, 0 }, + { "C", "abcd", "ABCD", 10, 0 }, + + { "C", "abc", "ABCD", 3, 0 }, + { "C", "abc", "ABCD", 10, -1 }, + + { "C", "abcd", "ABC", 3, 0 }, + { "C", "abcd", "ABC", 10, 1 }, + + { "C", "abce", "ABCf", 3, 0 }, + }; + WCHAR str1W[16]; + WCHAR str2W[16]; + char str1[16]; + char str2[16]; + size_t len; + int i, ret; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + if (!setlocale(LC_ALL, tests[i].locale)) + { + win_skip("%s locale _tcsnicoll tests\n", tests[i].locale); + for (; i+1 < ARRAY_SIZE(tests); i++) + if (strcmp(tests[i].locale, tests[i+1].locale)) break; + continue; + } + + memset(str1, 0xee, sizeof(str1)); + strcpy(str1, tests[i].str1); + + memset(str2, 0xff, sizeof(str2)); + strcpy(str2, tests[i].str2); + + ret = _strnicoll(str1, str2, tests[i].count); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else + ok(ret > 0, "expected > 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + + memset(str1W, 0xee, sizeof(str1W)); + len = mbstowcs(str1W, str1, ARRAY_SIZE(str1W)); + str1W[len] = 0; + + memset(str2W, 0xff, sizeof(str2W)); + len = mbstowcs(str2W, str2, ARRAY_SIZE(str2W)); + str2W[len] = 0; + + ret = _wcsnicoll(str1W, str2W, tests[i].count); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + else + ok(ret > 0, "expected > 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + } +} + START_TEST(string) { char mem[100]; @@ -3596,4 +3680,5 @@ START_TEST(string) test__memicmp_l(); test__strupr(); test__tcsncoll(); + test__tcsnicoll(); }

1 0

Zebediah Figura : hid/tests: Use DIGCF_PRESENT.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 4526c5923cc55a7de0a6d803631898d63da325c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4526c5923cc55a7de0a6d803… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:40 2018 -0500 hid/tests: Use DIGCF_PRESENT. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ce9b3a5..f20677f 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -66,7 +66,7 @@ static void run_for_each_device(device_test *test) data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + detail_size); data->cbSize = sizeof(*data); - info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) { index ++; @@ -74,11 +74,13 @@ static void run_for_each_device(device_test *test) if (SetupDiGetDeviceInterfaceDetailW(info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) { HANDLE file = CreateFileW(data->DevicePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED) { - trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath)); continue; } + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", + wine_dbgstr_w(data->DevicePath), GetLastError()); test(file); @@ -108,7 +110,7 @@ static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD a data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size); data->cbSize = sizeof(*data); - info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) { index ++; @@ -118,11 +120,13 @@ static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD a PHIDP_PREPARSED_DATA ppd; HIDP_CAPS Caps; HANDLE file = CreateFileW(data->DevicePath, access, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); - if (file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED) { - trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath)); continue; } + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + rc = HidD_GetPreparsedData(file, &ppd); ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); status = HidP_GetCaps(ppd, &Caps);

1 0

Daniel Lehman : msvcrt: Don't read past end of string in _strncoll/ _wcsncoll.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 368e9f39b4151a1094f62defeb308374061e137b URL: https://source.winehq.org/git/wine.git/?a=commit;h=368e9f39b4151a1094f62def… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 17 18:51:00 2018 +0200 msvcrt: Don't read past end of string in _strncoll/_wcsncoll. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 +++- dlls/msvcrt/wcs.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index c8cd390..37bc224 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -666,7 +666,9 @@ int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, MSVCRT_size_t if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) return strncmp(str1, str2, count); - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, + str1, MSVCRT_strnlen(str1, count), + str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL; } /********************************************************************* diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ed73fc6..3b22f62 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -335,7 +335,9 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) return strncmpW(str1, str2, count); - return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, + str1, MSVCRT_wcsnlen(str1, count), + str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL; } /*********************************************************************

1 0

Zebediah Figura : hidclass.sys: Update the interface state when a device is added or removed.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 91ac8eb00ab85bc5d7bfaae1a32c9a8cc08c8a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91ac8eb00ab85bc5d7bfaae1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 16 18:37:42 2018 -0500 hidclass.sys: Update the interface state when a device is added or removed. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 3 +++ dlls/hidclass.sys/pnp.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a5cbee9..3364eb3 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "ddk/hidsdi.h" #include "ddk/hidtypes.h" +#include "ddk/wdm.h" #include "initguid.h" #include "devguid.h" @@ -166,6 +167,8 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device TRACE("Delete link %s\n", debugstr_w(ext->link_name)); RtlInitUnicodeString(&linkW, ext->link_name); + IoSetDeviceInterfaceState(&linkW, FALSE); + status = IoDeleteSymbolicLink(&linkW); if (status != STATUS_SUCCESS) ERR("Delete Symbolic Link failed (%x)\n",status); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 6ee89c1..34bd944 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include "hid.h" #include "ddk/hidtypes.h" +#include "ddk/wdm.h" #include "regstr.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -282,6 +283,17 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } break; } + case IRP_MN_START_DEVICE: + { + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + UNICODE_STRING linkU; + + rc = minidriver->PNPDispatch(device, irp); + + RtlInitUnicodeString(&linkU, ext->link_name); + IoSetDeviceInterfaceState(&linkU, TRUE); + return rc; + } case IRP_MN_REMOVE_DEVICE: { return PNP_RemoveDevice(minidriver, device, irp);

1 0

Gerald Pfeifer : wbemprox: Use WS_AF_INET instead of AF_INET in get_ipsubnet.
by Alexandre Julliard Aug. 20, 2018

Aug. 20, 2018

Module: wine Branch: master Commit: 37fdbf9afa4985edb4e158bef3cbb7c0dbb688a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37fdbf9afa4985edb4e158be… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 19 09:18:42 2018 +0800 wbemprox: Use WS_AF_INET instead of AF_INET in get_ipsubnet. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 72c6b4e..9fe22d0 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -37,6 +37,7 @@ #ifdef __MINGW32__ # include "winsock2.h" # include "ws2tcpip.h" +# define WS_AF_INET AF_INET # define WS_AF_UNSPEC AF_UNSPEC # define WS_NI_MAXHOST NI_MAXHOST # define WS_NI_NAMEREQD NI_NAMEREQD @@ -2496,14 +2497,14 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } for (address = list; address; address = address->Next) { - if (address->Address.lpSockaddr->sa_family == AF_INET) + if (address->Address.lpSockaddr->sa_family == WS_AF_INET) { WCHAR buf[INET_ADDRSTRLEN]; SOCKADDR_IN addr; ULONG buflen = sizeof(buf)/sizeof(buf[0]); memset( &addr, 0, sizeof(addr) ); - addr.sin_family = AF_INET; + addr.sin_family = WS_AF_INET; if (ConvertLengthToIpv4Mask( address->OnLinkPrefixLength, &addr.sin_addr.S_un.S_addr ) != NO_ERROR || WSAAddressToStringW( (SOCKADDR*)&addr, sizeof(addr), NULL, buf, &buflen)) ptr[i] = NULL;

1 0