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

Matteo Bruni : include: Fix D3DXF_FILELOADMEMORY definition.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: c9c74b8b10116c3f0b3bd4d08724963245499a92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9c74b8b10116c3f0b3bd4d0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 26 22:26:48 2019 +0100 include: Fix D3DXF_FILELOADMEMORY definition. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/xfile.c | 2 +- include/d3dx9xof.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 1575454..649ea96 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -588,7 +588,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * { D3DXF_FILELOADMEMORY *memory = (D3DXF_FILELOADMEMORY*)source; - dxfile_memory.lpMemory = memory->lpMemory; + dxfile_memory.lpMemory = (void *)memory->lpMemory; dxfile_memory.dSize = memory->dSize; dxfile_source = &dxfile_memory; dxfile_options = DXFILELOAD_FROMMEMORY; diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 35019f2..227f3a5 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -49,7 +49,7 @@ typedef struct _D3DXF_FILELOADRESOURCE typedef struct _D3DXF_FILELOADMEMORY { - void *lpMemory; + const void *lpMemory; SIZE_T dSize; } D3DXF_FILELOADMEMORY;

1 0

Nikolay Sivov : mfplat: Use current stream position when async request is made.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 17613e0a03ec74f9f4853b92b77d692762474c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17613e0a03ec74f9f4853b92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 27 10:13:10 2019 +0300 mfplat: Use current stream position when async request is made. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 83eaee9..c6cf471 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2013,6 +2013,7 @@ struct async_stream_op const BYTE *src; BYTE *dest; } u; + QWORD position; ULONG requested_length; ULONG actual_length; IMFAsyncResult *caller; @@ -2087,6 +2088,7 @@ static HRESULT bytestream_create_io_request(struct bytestream *stream, enum asyn op->IUnknown_iface.lpVtbl = &async_stream_op_vtbl; op->refcount = 1; op->u.src = data; + op->position = stream->position; op->requested_length = size; op->type = type; if (FAILED(hr = MFCreateAsyncResult((IUnknown *)&stream->IMFByteStream_iface, callback, state, &op->caller))) @@ -2645,7 +2647,7 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i op = impl_async_stream_op_from_IUnknown(object); - position.QuadPart = stream->position; + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { if (SUCCEEDED(hr = IStream_Read(stream->stream, op->u.dest, op->requested_length, &op->actual_length))) @@ -2676,7 +2678,7 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * op = impl_async_stream_op_from_IUnknown(object); - position.QuadPart = stream->position; + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { if (SUCCEEDED(hr = IStream_Write(stream->stream, op->u.src, op->requested_length, &op->actual_length)))

1 0

Zebediah Figura : msi: Perform partial copies in MsiViewGetError().
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 6a3dbf11923b96c93f1869c9b9ed34d68bdb2576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a3dbf11923b96c93f1869c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 26 18:56:16 2019 -0500 msi: Perform partial copies in MsiViewGetError(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 26 ++++++-------------------- dlls/msi/tests/db.c | 4 ++-- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 862805f..3c22a21 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -772,7 +772,6 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buf MSIQUERY *query; const WCHAR *column; MSIDBERROR r; - DWORD len; TRACE("%u %p %p\n", handle, buffer, buflen); @@ -786,15 +785,9 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buf if ((r = query->view->error)) column = query->view->error_column; else column = szEmpty; - len = strlenW( column ); - if (buffer) - { - if (*buflen > len) - strcpyW( buffer, column ); - else - r = MSIDBERROR_MOREDATA; - } - *buflen = len; + if (msi_strncpyW(column, -1, buffer, buflen) == ERROR_MORE_DATA) + r = MSIDBERROR_MOREDATA; + msiobj_release( &query->hdr ); return r; } @@ -804,7 +797,6 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR buffer, LPDWORD bufl MSIQUERY *query; const WCHAR *column; MSIDBERROR r; - DWORD len; TRACE("%u %p %p\n", handle, buffer, buflen); @@ -818,15 +810,9 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR buffer, LPDWORD bufl if ((r = query->view->error)) column = query->view->error_column; else column = szEmpty; - len = WideCharToMultiByte( CP_ACP, 0, column, -1, NULL, 0, NULL, NULL ); - if (buffer) - { - if (*buflen >= len) - WideCharToMultiByte( CP_ACP, 0, column, -1, buffer, *buflen, NULL, NULL ); - else - r = MSIDBERROR_MOREDATA; - } - *buflen = len - 1; + if (msi_strncpyWtoA(column, -1, buffer, buflen, FALSE) == ERROR_MORE_DATA) + r = MSIDBERROR_MOREDATA; + msiobj_release( &query->hdr ); return r; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 16b20e5..181301e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9163,14 +9163,14 @@ static void test_view_get_error(void) strcpy(buffer, "x"); err = MsiViewGetErrorA(view, buffer, &sz); ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); - todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + ok(!buffer[0], "got \"%s\"\n", buffer); ok(sz == 1, "got size %u\n", sz); sz = 1; strcpy(buffer, "x"); err = MsiViewGetErrorA(view, buffer, &sz); todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err); - todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + ok(!buffer[0], "got \"%s\"\n", buffer); todo_wine ok(sz == 0, "got size %u\n", sz); r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec);

1 0

Matteo Bruni : d3dx9/tests: Improve D3DXMatrixInverse() test a tiny bit.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 5c052b699e7ac5c0e4f2324fe31e2d022dcf4bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c052b699e7ac5c0e4f2324f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 26 22:26:50 2019 +0100 d3dx9/tests: Improve D3DXMatrixInverse() test a tiny bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 1b9e120..becd55d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -321,11 +321,11 @@ static void D3DXMatrixTest(void) D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; BOOL expected, got, equal; float angle, determinant; - D3DXMATRIX *funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; D3DXVECTOR3 at, axis, eye, last; D3DXVECTOR4 light; + D3DXMATRIX *ret; U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; @@ -410,8 +410,11 @@ static void D3DXMatrixTest(void) expect_matrix(&expectedmat, &gotmat, 1); equal = compare_float(determinant, -147888.0f, 0); ok(equal, "Got unexpected determinant %.8e.\n", determinant); - funcpointer = D3DXMatrixInverse(&gotmat,NULL,&mat2); - ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + determinant = 5.0f; + ret = D3DXMatrixInverse(&gotmat, &determinant, &mat2); + ok(!ret, "Unexpected return value %p.\n", ret); + expect_matrix(&expectedmat, &gotmat, 1); + ok(compare_float(determinant, 5.0f, 0), "Unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixIsIdentity______________*/ expected = FALSE;

1 0

Detlef Riekenberg : schedsvc/tests: Avoid a crash in a SchRpcRegisterTask test.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 124dbb84b55b3008d019a130a89c8e2056772757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=124dbb84b55b3008d019a130… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 21 14:37:18 2019 +0100 schedsvc/tests: Avoid a crash in a SchRpcRegisterTask test. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 4aaafb6..9d9557f 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -526,13 +526,16 @@ todo_wine path = NULL; info = NULL; hr = SchRpcRegisterTask(NULL, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!info, "expected NULL, info %p\n", info); - hr = IIDFromString(path, &iid); - ok(hr == S_OK, "IIDFromString(%s) error %#x\n", wine_dbgstr_w(path), hr); - hr = SchRpcDelete(path, 0); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - MIDL_user_free(path); + ok(hr == S_OK || hr == E_ACCESSDENIED, "expected S_OK, got %#x\n", hr); + if (hr != E_ACCESSDENIED) + { + ok(!info, "expected NULL, info %p\n", info); + hr = IIDFromString(path, &iid); + ok(hr == S_OK, "IIDFromString(%s) error %#x\n", wine_dbgstr_w(path), hr); + hr = SchRpcDelete(path, 0); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + MIDL_user_free(path); + } hr = RpcBindingFree(&rpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr);

1 0

Isira Seneviratne : xcopy: Fix punctuation in STRING_HELP string.
by Alexandre Julliard March 26, 2019

March 26, 2019

1 0

Michael Stefaniuc : oleaut32/tests: Remove useless casts to self.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 829170f3d6b875f7a6f065072cc3334a20ff805e URL: https://source.winehq.org/git/wine.git/?a=commit;h=829170f3d6b875f7a6f06507… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 26 20:41:40 2019 +0100 oleaut32/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ef0c32c..a706481 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1138,9 +1138,9 @@ static int WINAPI int_func( int a0, int a1, int a2, int a3, int a4 ) static double WINAPI double_func( double a0, float a1, double a2, int a3 ) { - ok( a0 == 1.2, "wrong arg0 %f\n", (double)a0 ); + ok( a0 == 1.2, "wrong arg0 %f\n", a0 ); ok( a1 == 3.25, "wrong arg1 %f\n", (double)a1 ); - ok( a2 == 1.2e12, "wrong arg2 %f\n", (double)a2); + ok( a2 == 1.2e12, "wrong arg2 %f\n", a2); ok( a3 == -4433.0, "wrong arg3 %f\n", (double)a3 ); return 4321; }

1 0

Michael Stefaniuc : shell32: Avoid using the comma operator.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 9583bd004b7ad2a383b6ff4295ece4da8d28cbe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9583bd004b7ad2a383b6ff42… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 26 20:41:39 2019 +0100 shell32: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dataobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index ab72055..3e718a3 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -274,7 +274,7 @@ static ULONG WINAPI IDataObject_fnRelease(IDataObject *iface) { TRACE(" destroying IDataObject(%p)\n",This); _ILFreeaPidl(This->apidl, This->cidl); - ILFree(This->pidl), + ILFree(This->pidl); heap_free(This); } return refCount;

1 0

Michael Stefaniuc : cmd: Avoid using the comma operator.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 02e4210265ff42f30096a9088c07316232c423cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02e4210265ff42f30096a908… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 26 20:41:38 2019 +0100 cmd: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 637c0e9..589a39c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -505,7 +505,7 @@ WCHAR *WCMD_strip_quotes(WCHAR *cmd) { while((*dest=*src) != '\0') { if (*src=='\"') lastq=dest; - dest++, src++; + dest++; src++; } lastquote = lastq; if (lastq) {

1 0

Isira Seneviratne : winmm: Correct phrasing of some resource strings.
by Alexandre Julliard March 26, 2019

March 26, 2019

1 0