March 2019 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfplat: Add sample timestamp and duration methods.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 23237173b9ddb26fe26eb5b11b658dc78709f51e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23237173b9ddb26fe26eb5b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 13:00:59 2019 +0300 mfplat: Add sample timestamp and duration methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 63 ++++++++++++++++++++++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 25 ++++++++++++++++-- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index b07ec87..de08b1b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -34,6 +34,12 @@ struct memory_buffer DWORD current_length; }; +enum sample_prop_flags +{ + SAMPLE_PROP_HAS_DURATION = 1 << 0, + SAMPLE_PROP_HAS_TIMESTAMP = 1 << 1, +}; + struct sample { struct attributes attributes; @@ -44,6 +50,9 @@ struct sample size_t capacity; DWORD flags; CRITICAL_SECTION cs; + DWORD prop_flags; + LONGLONG duration; + LONGLONG timestamp; }; static inline struct memory_buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) @@ -487,32 +496,66 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) return S_OK; } -static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *sampletime) +static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *timestamp) { - FIXME("%p, %p.\n", iface, sampletime); + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, timestamp); + + EnterCriticalSection(&sample->cs); + if (sample->prop_flags & SAMPLE_PROP_HAS_TIMESTAMP) + *timestamp = sample->timestamp; + else + hr = MF_E_NO_SAMPLE_TIMESTAMP; + LeaveCriticalSection(&sample->cs); + + return hr; } -static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG sampletime) +static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(sampletime)); + struct sample *sample = impl_from_IMFSample(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(timestamp)); + + EnterCriticalSection(&sample->cs); + sample->timestamp = timestamp; + sample->prop_flags |= SAMPLE_PROP_HAS_TIMESTAMP; + LeaveCriticalSection(&sample->cs); + + return S_OK; } static HRESULT WINAPI sample_GetSampleDuration(IMFSample *iface, LONGLONG *duration) { - FIXME("%p, %p.\n", iface, duration); + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, duration); + + EnterCriticalSection(&sample->cs); + if (sample->prop_flags & SAMPLE_PROP_HAS_DURATION) + *duration = sample->duration; + else + hr = MF_E_NO_SAMPLE_DURATION; + LeaveCriticalSection(&sample->cs); + + return hr; } static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG duration) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); + struct sample *sample = impl_from_IMFSample(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); + + EnterCriticalSection(&sample->cs); + sample->duration = duration; + sample->prop_flags |= SAMPLE_PROP_HAS_DURATION; + LeaveCriticalSection(&sample->cs); + + return S_OK; } static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 31b6ba1..ba9e8c3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1280,6 +1280,7 @@ static void test_sample(void) { IMFMediaBuffer *buffer, *buffer2; DWORD count, flags, length; + IMFAttributes *attributes; IMFSample *sample; LONGLONG time; HRESULT hr; @@ -1287,6 +1288,11 @@ static void test_sample(void) hr = MFCreateSample( &sample ); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFSample_QueryInterface(sample, &IID_IMFAttributes, (void **)&attributes); + ok(hr == S_OK, "Failed to get attributes interface, hr %#x.\n", hr); + + CHECK_ATTR_COUNT(attributes, 0); + hr = IMFSample_GetBufferCount(sample, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1305,11 +1311,9 @@ static void test_sample(void) ok(flags == 0x123, "Unexpected flags %#x.\n", flags); hr = IMFSample_GetSampleTime(sample, &time); -todo_wine ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); hr = IMFSample_GetSampleDuration(sample, &time); -todo_wine ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); @@ -1363,6 +1367,23 @@ todo_wine IMFMediaBuffer_Release(buffer); + /* Duration */ + hr = IMFSample_SetSampleDuration(sample, 10); + ok(hr == S_OK, "Failed to set duration, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 0); + hr = IMFSample_GetSampleDuration(sample, &time); + ok(hr == S_OK, "Failed to get sample duration, hr %#x.\n", hr); + ok(time == 10, "Unexpected duration.\n"); + + /* Timestamp */ + hr = IMFSample_SetSampleTime(sample, 1); + ok(hr == S_OK, "Failed to set timestamp, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 0); + hr = IMFSample_GetSampleTime(sample, &time); + ok(hr == S_OK, "Failed to get sample time, hr %#x.\n", hr); + ok(time == 1, "Unexpected timestamp.\n"); + + IMFAttributes_Release(attributes); IMFSample_Release(sample); }

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_valid_parameter().
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 6ecc2c51b3849d313ad670a4b0ff14ca50aeb26a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ecc2c51b3849d313ad670a4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:12 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_valid_parameter(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 91 +++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ecc2c51b3849d313ad6…

1 0

Francois Gouget : xaudio2_7: Add a trailing '\n' to an ERR() message.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: e664c29351b63888a4e6f7192dad999bf85270fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e664c29351b63888a4e6f719… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:50:19 2019 +0100 xaudio2_7: Add a trailing '\n' to an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 3ccb3f1..9788cb3 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -337,7 +337,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Realloc ); #endif - ERR("Invalid XAPO CLSID!"); + ERR("Invalid XAPO CLSID!\n"); return E_INVALIDARG; }

1 0

Francois Gouget : d3d12/tests: A spelling fix in a skip() message.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 4b2fd6ee6776baa46837e4f6d0dec36b9fc0d088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b2fd6ee6776baa46837e4f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:48:16 2019 +0100 d3d12/tests: A spelling fix in a skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 76efb56..ae750af 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -914,7 +914,7 @@ static void test_create_device(void) } else { - skip("GetContaingOutput() is not supported.\n"); + skip("GetContainingOutput() is not supported.\n"); } refcount = IDXGISwapChain3_Release(swapchain);

1 0

Józef Kucia : wined3d: Pass swap interval to swapchain ops.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 6d45ce4e5a56c73278976531966667245f028ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d45ce4e5a56c73278976531… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 17 18:51:04 2019 +0100 wined3d: Pass swap interval to swapchain ops. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 +-- dlls/wined3d/swapchain.c | 56 ++++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 47b23de..9960d06 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -526,9 +526,8 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); - wined3d_swapchain_set_swap_interval(swapchain, op->swap_interval); - swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); wined3d_resource_release(&swapchain->front_buffer->resource); for (i = 0; i < swapchain->desc.backbuffer_count; ++i) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 724ea16..c5060f9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -157,9 +157,9 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, { RECT s, d; - TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, flags %#x.\n", + TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, swap_interval %u, flags %#x.\n", swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), - dst_window_override, flags); + dst_window_override, swap_interval, flags); if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -348,6 +348,27 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, wined3d_texture_invalidate_location(texture, 0, WINED3D_LOCATION_DRAWABLE); } +static void swapchain_gl_set_swap_interval(struct wined3d_swapchain *swapchain, + struct wined3d_context *context, unsigned int swap_interval) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + swap_interval = swap_interval <= 4 ? swap_interval : 1; + if (swapchain->swap_interval == swap_interval) + return; + + swapchain->swap_interval = swap_interval; + + if (!gl_info->supported[WGL_EXT_SWAP_CONTROL]) + return; + + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + { + ERR("Failed to set swap interval %u for context %p, last error %#x.\n", + swap_interval, context, GetLastError()); + } +} + /* Context activation is done by the caller. */ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context *context) { @@ -396,7 +417,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str } static void swapchain_gl_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; @@ -416,6 +437,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, gl_info = context->gl_info; + swapchain_gl_set_swap_interval(swapchain, context, swap_interval); + if ((logo_texture = swapchain->device->logo_texture)) { RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; @@ -597,7 +620,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai } static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { struct wined3d_dc_info *front, *back; HBITMAP bitmap; @@ -689,31 +712,6 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } -void wined3d_swapchain_set_swap_interval(struct wined3d_swapchain *swapchain, - unsigned int swap_interval) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - swap_interval = swap_interval <= 4 ? swap_interval : 1; - if (swapchain->swap_interval == swap_interval) - return; - - swapchain->swap_interval = swap_interval; - - context = context_acquire(swapchain->device, swapchain->front_buffer, 0); - gl_info = context->gl_info; - - if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) - { - if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) - ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x.\n", - swap_interval, context, GetLastError()); - } - - context_release(context); -} - static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e70010e..9bf579e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4011,7 +4011,7 @@ static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_ struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, - const RECT *src_rect, const RECT *dst_rect, DWORD flags); + const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags); void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain); }; @@ -4049,8 +4049,6 @@ struct wined3d_swapchain }; void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; -void wined3d_swapchain_set_swap_interval(struct wined3d_swapchain *swapchain, - unsigned int swap_interval) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetVertexShader() helper.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 73a05456bf6eb1102c5e3cc361f906e65f62cfcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a05456bf6eb1102c5e3cc3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:11 2019 +0100 d3dx9: Merge the d3dx_effect_GetVertexShader() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0a52940..d2e03f5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,24 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) - { - if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) - IDirect3DVertexShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -3533,14 +3515,25 @@ static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE return D3DERR_INVALIDCALL; } -static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DVertexShader9 **shader) +static HRESULT WINAPI d3dx_effect_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DVertexShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); - return d3dx9_base_effect_get_vertex_shader(&effect->base_effect, parameter, shader); + if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) + { + if ((*shader = *(IDirect3DVertexShader9 **)param->data)) + IDirect3DVertexShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end)

1 0

Zhiyi Zhang : setupapi/tests: Add SetupDiOpenDeviceInfo() tests.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 0b9b1cbf56a035a78cce6003392b95d4c43a3144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9b1cbf56a035a78cce6003… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:42:08 2019 +0800 setupapi/tests: Add SetupDiOpenDeviceInfo() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 148 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 75ac8fe..de4d00e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -737,6 +737,153 @@ static void test_get_device_instance_id(void) SetupDiDestroyDeviceInfoList(set); } +static void test_open_device_info(void) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + CHAR id[MAX_DEVICE_ID_LEN + 2]; + HDEVINFO set; + DWORD i = 0; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info, error %#x.\n", GetLastError()); + + /* Open non-existent device */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\FFFF", NULL, 0, &device); + ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Open unregistered device */ + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1000", NULL, 0, &device); + ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device */ + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 2, NULL, NULL); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 2, NULL, NULL); + + /* Open registered device in an empty device info set */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device again */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device in a new device info set with wrong GUID */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid2, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == ERROR_CLASS_MISMATCH, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Open registered device in a new device info set with NULL GUID */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(NULL, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + /* NULL set */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + + /* NULL instance id */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, NULL, NULL, 0, &device); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Invalid SP_DEVINFO_DATA cbSize, device will be added despite failure */ + SetLastError(0xdeadbeef); + device.cbSize = 0; + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + device.cbSize = sizeof(device); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + /* NULL device */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, NULL); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Clean up */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } + SetupDiDestroyDeviceInfoList(set); +} + static void test_register_device_info(void) { SP_DEVINFO_DATA device = {0}; @@ -1725,6 +1872,7 @@ START_TEST(devinst) test_device_info(); test_device_property(); test_get_device_instance_id(); + test_open_device_info(); test_register_device_info(); test_device_iface(); test_device_iface_detail();

1 0

Zhiyi Zhang : setupapi: Set phantom value after device creation.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 64c09819cf937b87344b41d049d43e4b8754fb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64c09819cf937b87344b41d0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:41:02 2019 +0800 setupapi: Set phantom value after device creation. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 4 ++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2c95b5c..331db87 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -723,6 +723,7 @@ static void delete_device(struct device *device) static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, const GUID *class, const WCHAR *instanceid, BOOL phantom) { + const DWORD one = 1; struct device *device; WCHAR guidstr[39]; @@ -752,6 +753,9 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + if (phantom) + RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); + SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3add9b2..75ac8fe 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -778,9 +778,9 @@ static void test_register_device_info(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); size = sizeof(phantom); ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); - todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); - todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); - todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError());

1 0

Zhiyi Zhang : setupapi: Implement SetupDiOpenDeviceInfoW().
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: cb5d191064e56e9d846d7515b43f09633e9fcb66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb5d191064e56e9d846d7515… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:41:14 2019 +0800 setupapi: Implement SetupDiOpenDeviceInfoW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ------- 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 331db87..81b6e35 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3317,6 +3317,92 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( } /*********************************************************************** + * SetupDiOpenDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + struct DeviceInfoSet *set; + struct device *device = NULL, *enum_device; + WCHAR classW[40]; + GUID guid; + HKEY enumKey = NULL; + HKEY instanceKey = NULL; + DWORD phantom; + DWORD size; + DWORD error = ERROR_NO_SUCH_DEVINST; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data); + + if (!(set = get_device_set(devinfo))) + return FALSE; + + if (!instance_id) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (hwnd_parent) + FIXME("hwnd_parent unsupported\n"); + + if (flags) + FIXME("flags unsupported: 0x%08x\n", flags); + + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &enumKey, NULL); + /* Instance needs to be already existent in registry, if not, report ERROR_NO_SUCH_DEVINST */ + if (RegOpenKeyExW(enumKey, instance_id, 0, KEY_READ, &instanceKey)) + goto done; + + /* If it's an unregistered instance, aka phantom instance, report ERROR_NO_SUCH_DEVINST */ + size = sizeof(phantom); + if (!RegQueryValueExW(instanceKey, Phantom, NULL, NULL, (BYTE *)&phantom, &size)) + goto done; + + /* Check class GUID */ + size = sizeof(classW); + if (RegQueryValueExW(instanceKey, ClassGUID, NULL, NULL, (BYTE *)classW, &size)) + goto done; + + classW[37] = 0; + UuidFromStringW(&classW[1], &guid); + + if (!IsEqualGUID(&set->ClassGuid, &GUID_NULL) && !IsEqualGUID(&guid, &set->ClassGuid)) + { + error = ERROR_CLASS_MISMATCH; + goto done; + } + + /* If current set already contains a same instance, don't create new ones */ + LIST_FOR_EACH_ENTRY(enum_device, &set->devices, struct device, entry) + { + if (!strcmpiW(instance_id, enum_device->instanceId)) + { + device = enum_device; + break; + } + } + + if (!device && !(device = SETUPDI_CreateDeviceInfo(set, &guid, instance_id, FALSE))) + goto done; + + if (!device_data || device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + { + if (device_data) + copy_device_data(device_data, device); + error = NO_ERROR; + } + else + error = ERROR_INVALID_USER_BUFFER; + +done: + RegCloseKey(instanceKey); + RegCloseKey(enumKey); + SetLastError(error); + return !error; +} + +/*********************************************************************** * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ BOOL WINAPI SetupDiOpenDeviceInterfaceW( diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4db32dd..b64c1a1 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -323,17 +323,6 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceI } /*********************************************************************** - * SetupDiOpenDeviceInfoW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - -/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)

1 0

Zhiyi Zhang : setupapi/tests: Add more SetupDiCreateDeviceInfo() tests.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 7876234e3ad3f664bdc02e976458dc87fb00f0a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7876234e3ad3f664bdc02e97… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 15 11:42:18 2019 +0800 setupapi/tests: Add more SetupDiCreateDeviceInfo() tests. SetupDiCreateDeviceInfo() should report last error ERROR_DEVINST_ALREADY_EXISTS when an registered instance exists when creating a device for an empty set. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index de4d00e..01891b1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -212,6 +212,7 @@ static void test_device_info(void) char id[MAX_DEVICE_ID_LEN + 2]; HDEVINFO set; BOOL ret; + INT i = 0; SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); @@ -344,6 +345,31 @@ static void test_device_info(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set , &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, NULL, NULL); + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + todo_wine ok(!ret, "Expect failure\n"); + todo_wine ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); + todo_wine check_device_info(set, 0, NULL, NULL); + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } + SetupDiDestroyDeviceInfoList(set); } static void test_device_property(void)

1 0