February 2019 - Wine-Commits

Michael Stefaniuc : ntdll: Remove redundant not-NULL check (coccinellery).
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 244c15fe7b253841c60090d08d6cb489cef2ea18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=244c15fe7b253841c60090d0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:38 2019 +0100 ntdll: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c86ca88..76dc6c2 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2712,7 +2712,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T { *addr_ptr = wine_server_get_ptr( result.virtual_protect.addr ); *size_ptr = result.virtual_protect.size; - if (old_prot) *old_prot = result.virtual_protect.prot; + *old_prot = result.virtual_protect.prot; } return result.virtual_protect.status; }

1 0

Zebediah Figura : wined3d: Rename MAX_VERTEX_SAMPLERS to WINED3D_MAX_VERTEX_SAMPLERS.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 8a1e746ffb98b2e4679f518dc0f6a3f30470cde7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1e746ffb98b2e4679f518d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 20 14:53:59 2019 -0600 wined3d: Rename MAX_VERTEX_SAMPLERS to WINED3D_MAX_VERTEX_SAMPLERS. 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/context.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 58ecc87..42dcd2e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2036,12 +2036,12 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, } wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - if (base + MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context->rev_tex_unit_map)) + if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); return FALSE; } - for (i = 0; i < min(count, MAX_VERTEX_SAMPLERS); ++i) + for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i) { context->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i; context->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i; @@ -2368,7 +2368,7 @@ const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, break; case WINED3D_SHADER_TYPE_VERTEX: *base = WINED3D_MAX_FRAGMENT_SAMPLERS; - *count = MAX_VERTEX_SAMPLERS; + *count = WINED3D_MAX_VERTEX_SAMPLERS; break; default: ERR("Unhandled shader type %#x.\n", shader_version->type); @@ -3416,7 +3416,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons if (ps) ps_resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) { DWORD vsampler_idx = i + WINED3D_MAX_FRAGMENT_SAMPLERS; if (vs_resource_info[i].type) @@ -3729,7 +3729,7 @@ static void context_preload_textures(struct wined3d_context *context, const stru if (use_vs(state)) { - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) { if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info[i].type) context_preload_texture(context, state, WINED3D_MAX_FRAGMENT_SAMPLERS + i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d52791..770ba5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -261,8 +261,8 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define WINED3D_MAX_STREAMS 16 #define WINED3D_MAX_TEXTURES 8 #define WINED3D_MAX_FRAGMENT_SAMPLERS 16 -#define MAX_VERTEX_SAMPLERS 4 -#define MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS) +#define WINED3D_MAX_VERTEX_SAMPLERS 4 +#define MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 @@ -1996,7 +1996,7 @@ struct wined3d_context GLuint blit_vbo; DWORD tex_unit_map[MAX_COMBINED_SAMPLERS]; - DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS]; + DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS]; /* Extension emulation */ GLint gl_fog_source;

1 0

Michael Stefaniuc : kernelbase: Remove redundant not-NULL check ( coccinellery).
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: e441d882620ae73e895b6af2e5134b84a7ae52b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e441d882620ae73e895b6af2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 22 10:41:41 2019 +0800 kernelbase: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index dfcc825..3eefcd7 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -326,7 +326,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out); /* If path2 is fully qualified, use path2 only */ - if (path2 && ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))) + if ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\')) { path1 = path2; path2 = NULL;

1 0

Zhiyi Zhang : kernelbase/tests: Fix a possible test failure.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 397c15ab77bf3c0afd1fff9813ee16d62230db61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=397c15ab77bf3c0afd1fff98… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 22 10:35:09 2019 +0800 kernelbase/tests: Fix a possible test failure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7644c31..b5da303 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1035,6 +1035,7 @@ static void test_PathCchCanonicalize(void) ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); } + path_inW[0] = 0; hr = pPathCchCanonicalize(path_outW, 0, path_inW); ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr);

1 0

Zebediah Figura : quartz/tests/filesource: Add tests for IAsyncReader_SyncRead().
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 5e16cf4c3989e896c6a605c98ed0cffa362c39b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e16cf4c3989e896c6a605c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:43:01 2019 -0600 quartz/tests/filesource: Add tests for IAsyncReader_SyncRead(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 79 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index ddf0709..7f25596 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -666,6 +666,84 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_async_reader(void) +{ + IBaseFilter *filter = create_file_source(); + IFileSourceFilter *filesource; + LONGLONG length, available; + WCHAR filename[MAX_PATH]; + IAsyncReader *reader; + BYTE buffer[20]; + DWORD written; + HANDLE file; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + int i; + + GetTempPathW(ARRAY_SIZE(filename), filename); + lstrcatW(filename, avifile); + file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file, error %u.\n", GetLastError()); + for (i = 0; i < 600; i++) + { + BYTE b = i % 111; + WriteFile(file, &b, 1, &written, NULL); + } + CloseHandle(file); + + IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_QueryInterface(pin, &IID_IAsyncReader, (void **)&reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_Length(reader, &length, &available); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(length == 600, "Got length %s.\n", wine_dbgstr_longlong(length)); + ok(available == 600, "Got available length %s.\n", wine_dbgstr_longlong(available)); + + memset(buffer, 0xcc, sizeof(buffer)); + hr = IAsyncReader_SyncRead(reader, 0, 10, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == i % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + + hr = IAsyncReader_SyncRead(reader, 0, 10, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == i % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + + hr = IAsyncReader_SyncRead(reader, 10, 10, buffer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == (10 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + + hr = IAsyncReader_SyncRead(reader, 590, 20, buffer); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + for (i = 0; i < 10; i++) + ok(buffer[i] == (590 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); + for (; i < 20; i++) + ok(buffer[i] == 0xcc, "Got wrong byte %02x at %u.\n", buffer[i], i); + + memset(buffer, 0xcc, sizeof(buffer)); + hr = IAsyncReader_SyncRead(reader, 600, 10, buffer); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(buffer[0] == 0xcc, "Got wrong byte %02x.\n", buffer[0]); + + IAsyncReader_Release(reader); + IPin_Release(pin); + IFileSourceFilter_Release(filesource); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(filesource) { CoInitialize(NULL); @@ -676,6 +754,7 @@ START_TEST(filesource) test_pin_info(); test_filter_state(); test_file_source_filter(); + test_async_reader(); CoUninitialize(); }

1 0

Nikolay Sivov : mf: Assign node id on creation.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: e88a2535127b2bed36f3f98f63d5eb95b7087103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e88a2535127b2bed36f3f98f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:50 2019 +0300 mf: Assign node id on creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 8 ++++---- dlls/mf/topology.c | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d6091cb..38bf48e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -57,11 +57,10 @@ static void test_topology(void) ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); hr = IMFTopologyNode_GetTopoNodeID(node, &id); -todo_wine ok(hr == S_OK, "Failed to get node id, hr %#x.\n", hr); + ok(((id >> 32) == GetCurrentProcessId()) && !!(id & 0xffff), "Unexpected node id %s.\n", wine_dbgstr_longlong(id)); hr = IMFTopologyNode_SetTopoNodeID(node2, id); -todo_wine ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); count = 1; @@ -96,7 +95,6 @@ todo_wine { /* Change node id, add it again. */ hr = IMFTopologyNode_SetTopoNodeID(node, ++id); -todo_wine ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); hr = IMFTopology_GetNodeByID(topology, id, &node2); @@ -148,7 +146,6 @@ todo_wine { hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); hr = IMFTopologyNode_SetTopoNodeID(node2, id); -todo_wine ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); hr = IMFTopology_RemoveNode(topology, node2); todo_wine @@ -179,6 +176,9 @@ todo_wine { todo_wine ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + hr = IMFTopologyNode_SetTopoNodeID(node, 123); + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + IMFTopologyNode_Release(node); IMFTopology_Release(topology); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 308a1e3..54e9faf 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static LONG next_node_id; + struct topology { IMFTopology IMFTopology_iface; @@ -45,6 +47,7 @@ struct topology_node LONG refcount; IMFAttributes *attributes; MF_TOPOLOGY_TYPE node_type; + TOPOID id; }; struct seq_source @@ -887,16 +890,24 @@ static HRESULT WINAPI topology_node_GetNodeType(IMFTopologyNode *iface, MF_TOPOL static HRESULT WINAPI topology_node_GetTopoNodeID(IMFTopologyNode *iface, TOPOID *id) { - FIXME("(%p)->(%p)\n", iface, id); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, id); + + *id = node->id; + + return S_OK; } static HRESULT WINAPI topology_node_SetTopoNodeID(IMFTopologyNode *iface, TOPOID id) { - FIXME("(%p)->(%s)\n", iface, wine_dbgstr_longlong(id)); + struct topology_node *node = impl_from_IMFTopologyNode(iface); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", iface, wine_dbgstr_longlong(id)); + + node->id = id; + + return S_OK; } static HRESULT WINAPI topology_node_GetInputCount(IMFTopologyNode *iface, DWORD *count) @@ -1058,6 +1069,7 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode heap_free(object); return hr; } + object->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); *node = &object->IMFTopologyNode_iface;

1 0

Nikolay Sivov : mfplat: Implement MFCreateCollection().
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: a606abf245e22936eb771dcfc8f4e7d7eb78de41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a606abf245e22936eb771dcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 22 10:36:52 2019 +0300 mfplat: Implement MFCreateCollection(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 253 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 103 ++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 358 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a606abf245e22936eb77…

1 0

Jacek Caban : ntdll/tests: Introduce test_object_type helper.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 372852a2a8c18fdc4a07518e380952be94705d67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=372852a2a8c18fdc4a07518e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 13:13:43 2019 +0100 ntdll/tests: Introduce test_object_type helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 117 +++++++++++++++----------------------------------- 1 file changed, 35 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=372852a2a8c18fdc4a07…

1 0

Zebediah Figura : wined3d: Rename MAX_COMBINED_SAMPLERS to WINED3D_MAX_COMBINED_SAMPLERS.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 6bf349fc7cae0aa253f8131228ddadb5d60e472f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bf349fc7cae0aa253f81312… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 20 14:54:00 2019 -0600 wined3d: Rename MAX_COMBINED_SAMPLERS to WINED3D_MAX_COMBINED_SAMPLERS. 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/context.c | 6 +++--- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 22 +++++++++++----------- 5 files changed, 25 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bf349fc7cae0aa253f8…

1 0

Michael Stefaniuc : oledb32: Remove redundant not-NULL check (coccinellery ).
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 45553a97b06be46548b2617818c26544b5dea432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45553a97b06be46548b26178… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:39 2019 +0100 oledb32: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/rowpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 46904d3..c922f93 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -416,7 +416,7 @@ static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksin } This->sinks[i] = sink; - if (cookie) *cookie = i + 1; + *cookie = i + 1; return S_OK; }

1 0