November 2019 - Wine-Devel - list.winehq.org

[PATCH] wmp/tests: Fix the spelling of an unused parameter name.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wmp/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index db466bf6d45..aaeb2aa82d9 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -124,7 +124,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL; -- 2.20.1

Nov. 28, 2019

[PATCH] rsaenh: A spelling fix in a comment.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/rsaenh/mpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 3fbca42a8ca..77c3fcaf748 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1009,7 +1009,7 @@ mp_add_d (mp_int * a, mp_digit b, mp_int * c) /* trim unused digits * * This is used to ensure that leading zero digits are - * trimed and the leading "used" digit will be non-zero + * trimmed and the leading "used" digit will be non-zero * Typically very fast. Also fixes the sign if there * are no more leading digits */ -- 2.20.1

Nov. 28, 2019

[PATCH] d3dx9_36: Fix the spelling of a TRACE() message.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b0bf8e3c38d..88168df1e1a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4254,7 +4254,7 @@ static HRESULT WINAPI d3dx_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHA struct d3dx_parameter_block *block = get_valid_parameter_block(parameter_block); struct d3dx_recorded_parameter *record; - TRACE("iface %p, paramater_block %p.\n", iface, parameter_block); + TRACE("iface %p, parameter_block %p.\n", iface, parameter_block); if (!block || !block->offset) return D3DERR_INVALIDCALL; -- 2.20.1

Nov. 28, 2019

[PATCH] vbscript/tests: Fix the name of a vbscript variable in the run test.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I'm a bit surprised that this is not causing more trouble. But it also does not really look like this was an intentional typo designed to test error handling. dlls/vbscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 5fc23707e39..ab32a4213b0 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2206,7 +2206,7 @@ static void test_callbacks(void) L" on error resume next\n" L" err.raise 2\n" L" call test.globalCallback(new CallbackClass)\n" - L" call ok(err.number = 2, \"err.number = \" & err.numner)\n" + L" call ok(err.number = 2, \"err.number = \" & err.number)\n" L"end function\n", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); -- 2.20.1

Nov. 28, 2019

[PATCH] d3d9/tests: Fix a typo in a field name of the visual test.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Yes. The field is actually never used directly: all that matters is that the structure has the right layout and its content will be used by d3d. dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f063d21fb0..cbfb98bec68 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26311,7 +26311,7 @@ static void test_sample_attached_rendertarget(void) static const struct { - struct vec3 posistion; + struct vec3 position; struct vec2 texcoord; } quad[] = -- 2.20.1

Nov. 28, 2019

[PATCH] wbemprox: Fix the spelling of the free_associations() function name.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53d4b169cdb..1f8afb46fe8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2600,7 +2600,7 @@ struct association WCHAR *ref2; }; -static void free_assocations( struct association *assoc, UINT count ) +static void free_associations( struct association *assoc, UINT count ) { UINT i; if (!assoc) return; @@ -2652,7 +2652,7 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2668,12 +2668,12 @@ static enum fill_status fill_diskdrivetodiskpartition( struct table *table, cons if (!(assoc = get_diskdrivetodiskpartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; } @@ -2953,7 +2953,7 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) *count = query->view->result_count; done: - if (!ret) free_assocations( ret, query->view->result_count ); + if (!ret) free_associations( ret, query->view->result_count ); free_query( query ); free_query( query2 ); return ret; @@ -2969,12 +2969,12 @@ static enum fill_status fill_logicaldisktopartition( struct table *table, const if (!(assoc = get_logicaldisktopartition_pairs( &count ))) return FILL_STATUS_FAILED; if (!count) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_UNFILTERED; } if (!resize_table( table, count, sizeof(*rec) )) { - free_assocations( assoc, count ); + free_associations( assoc, count ); return FILL_STATUS_FAILED; } -- 2.20.1

Nov. 28, 2019

[PATCH v3] gdi32/tests: MoveToEx() does not return the old point.

by Francois Gouget

This behavior goes back to at least Windows XP. But Wine depends on MoveToEx() returning the old point and changing Wine does not seem necessary. So expect the documented behavior and mark the current Windows behavior as broken. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v3: Accept the documented behavior. Wine no longer needs a todo. Better document the Windows behavior. dlls/gdi32/painting.c | 3 +++ dlls/gdi32/tests/metafile.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 81937b8bbb4..f0aee5b8d8c 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -257,6 +257,9 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) /*********************************************************************** * MoveToEx (GDI32.@) + * + * Wine returns the previous position in pt as per the documentation. + * However note that no Windows version does since at least XP. */ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) { diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ca433b33c03..84fefb305f4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2259,16 +2259,16 @@ static void test_mf_Graphics(void) ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 2, 2); ok( ret, "LineTo error %d.\n", GetLastError()); + oldpoint.x = oldpoint.y = 11235; ret = MoveToEx(hdcMetafile, 1, 1, &oldpoint); ok( ret, "MoveToEx error %d.\n", GetLastError()); - -/* oldpoint gets garbage under Win XP, so the following test would - * work under Wine but fails under Windows: - * - * ok((oldpoint.x == 2) && (oldpoint.y == 2), - * "MoveToEx: (x, y) = (%ld, %ld), should be (2, 2).\n", - * oldpoint.x, oldpoint.y); - */ + /* We want Wine to return the old position as per the documentation. + * But Windows since at least XP does not. + */ + ok((oldpoint.x == 2 && oldpoint.y == 2) || + broken(oldpoint.x == 11235 && oldpoint.y == 11235), + "MoveToEx: oldpoint = (%d, %d), should be (11235, 11235).\n", + oldpoint.x, oldpoint.y); ret = Ellipse(hdcMetafile, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); -- 2.20.1

Nov. 28, 2019

[PATCH] dmloader: Support DMUS_OBJ_MEMORY cache lookups

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 42209def94..9048c02dfc 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -191,8 +191,18 @@ static struct cache_entry *find_cache_object(IDirectMusicLoaderImpl *This, DMUS_ if (desc->dwValidData & DMUS_OBJ_STREAM) FIXME("Finding DMUS_OBJ_STREAM cached objects currently not supported.\n"); - if (desc->dwValidData & DMUS_OBJ_MEMORY) - FIXME("Finding DMUS_OBJ_MEMORY cached objects currently not supported.\n"); + if (desc->dwValidData & DMUS_OBJ_MEMORY) { + LIST_FOR_EACH_ENTRY(existing, &This->cache, struct cache_entry, entry) { + if (existing->Desc.dwValidData & DMUS_OBJ_MEMORY && + desc->llMemLength == existing->Desc.llMemLength && + (desc->pbMemData == existing->Desc.pbMemData || + !memcmp(desc->pbMemData, existing->Desc.pbMemData, desc->llMemLength)) ) { + TRACE("Found by DMUS_OBJ_MEMORY (%d)\n", + desc->pbMemData == existing->Desc.pbMemData); + return existing; + } + } + } if ((desc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) == (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) { -- 2.24.0

Nov. 28, 2019

Re: [PATCH v2] ntdll: Fix tick count calculation on Mac.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Nov. 28, 2019

Re: [PATCH] msiexec: Improve RegQueryValueExW() calls a bit.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Nov. 28, 2019