wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Matteo Bruni : d3dx9/tests: Improve D3DXMatrixInverse() test a tiny bit.
by Alexandre Julliard 27 Mar '19

27 Mar '19

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

Michael Müller : d3dx9/tests: Add initial tests for dummy skin info interface.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: aec8e12a3d71272b31aa8b5b075fe1cd88517c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec8e12a3d71272b31aa8b5b… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 26 22:26:49 2019 +0100 d3dx9/tests: Add initial tests for dummy skin info interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index e36ee0a..a33ed2c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -25,6 +25,9 @@ #include <limits.h> #include "wine/test.h" #include "d3dx9.h" +#include "initguid.h" +#include "rmxftmpl.h" +#include "rmxfguid.h" #ifndef NAN /* From wine/port.h */ @@ -11191,6 +11194,186 @@ static void test_D3DXFrameFind(void) ok(ret == &child3, "Unexpected frame, %p.\n", ret); } +static ID3DXFileData *get_mesh_data(const void *memory, SIZE_T length) +{ + ID3DXFileData *file_data, *ret = NULL; + ID3DXFileEnumObject *enum_obj = NULL; + D3DXF_FILELOADMEMORY source; + ID3DXFile *file; + SIZE_T i, count; + GUID guid; + + if (FAILED(D3DXFileCreate(&file))) + return NULL; + + if (FAILED(file->lpVtbl->RegisterTemplates(file, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES))) + goto cleanup; + + source.lpMemory = memory; + source.dSize = length; + if (FAILED(file->lpVtbl->CreateEnumObject(file, &source, D3DXF_FILELOAD_FROMMEMORY, &enum_obj))) + goto cleanup; + + if (FAILED(enum_obj->lpVtbl->GetChildren(enum_obj, &count))) + goto cleanup; + + for (i = 0; i < count; ++i) + { + if (FAILED(enum_obj->lpVtbl->GetChild(enum_obj, i, &file_data))) + goto cleanup; + + if (SUCCEEDED(file_data->lpVtbl->GetType(file_data, &guid)) + && IsEqualGUID(&guid, &TID_D3DRMMesh)) + { + ret = file_data; + break; + } + else + { + file_data->lpVtbl->Release(file_data); + } + } + +cleanup: + if (enum_obj) + enum_obj->lpVtbl->Release(enum_obj); + file->lpVtbl->Release(file); + + return ret; +} + +static void test_load_skin_mesh_from_xof(void) +{ + static const char simple_xfile[] = + "xof 0303txt 0032" + "Mesh {" + "3;" + "0.0; 0.0; 0.0;," + "0.0; 1.0; 0.0;," + "1.0; 1.0; 0.0;;" + "1;" + "3; 0, 1, 2;;" + "}"; + static const D3DVERTEXELEMENT9 expected_declaration[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; + ID3DXBuffer *adjacency, *materials, *effects; + DWORD max_influences[3], count, fvf; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + ID3DXSkinInfo *skin_info; + ID3DXFileData *file_data; + const char *bone_name; + D3DXMATRIX *matrix; + float influence; + ID3DXMesh *mesh; + IDirect3D9 *d3d; + ULONG refcount; + HRESULT hr; + HWND hwnd; + + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Failed to create application window.\n"); + return; + } + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Failed to create d3d object.\n"); + DestroyWindow(hwnd); + return; + } + + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create device, hr %#x.\n", hr); + DestroyWindow(hwnd); + return; + } + + file_data = get_mesh_data(simple_xfile, sizeof(simple_xfile) - 1); + ok(!!file_data, "Failed to load mesh data.\n"); + + adjacency = materials = effects = (void *)0xdeadbeef; + count = ~0u; + skin_info = (void *)0xdeadbeef; + mesh = (void *)0xdeadbeef; + + hr = D3DXLoadSkinMeshFromXof(file_data, 0, device, &adjacency, &materials, &effects, &count, + &skin_info, &mesh); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!!adjacency, "Got unexpected value %p.\n", adjacency); + ok(!materials, "Got unexpected value %p.\n", materials); + ok(!effects, "Got unexpected value %p.\n", effects); + ok(!count, "Got unexpected value %u.\n", count); + todo_wine ok(!!skin_info, "Got unexpected value %p.\n", skin_info); + ok(!!mesh, "Got unexpected value %p.\n", mesh); + count = mesh->lpVtbl->GetNumVertices(mesh); + ok(count == 3, "Got unexpected value %u.\n", count); + count = mesh->lpVtbl->GetNumFaces(mesh); + ok(count == 1, "Got unexpected value %u.\n", count); + + if (skin_info) + { + hr = skin_info->lpVtbl->GetDeclaration(skin_info, declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + compare_elements(declaration, expected_declaration, __LINE__, 0); + + fvf = skin_info->lpVtbl->GetFVF(skin_info); + ok(fvf == D3DFVF_XYZ, "Got unexpected value %u.\n", fvf); + + count = skin_info->lpVtbl->GetNumBones(skin_info); + ok(!count, "Got unexpected value %u.\n", count); + + influence = skin_info->lpVtbl->GetMinBoneInfluence(skin_info); + ok(!influence, "Got unexpected value %.8e.\n", influence); + + memset(max_influences, 0x55, sizeof(max_influences)); + hr = skin_info->lpVtbl->GetMaxVertexInfluences(skin_info, max_influences); + ok(hr == D3D_OK, "Got unexpected value %#x.\n", hr); + ok(!max_influences[0], "Got unexpected value %u.\n", max_influences[0]); + ok(max_influences[1] == 0x55555555, "Got unexpected value %u.\n", max_influences[1]); + ok(max_influences[2] == 0x55555555, "Got unexpected value %u.\n", max_influences[2]); + + bone_name = skin_info->lpVtbl->GetBoneName(skin_info, 0); + ok(!bone_name, "Got unexpected value %p.\n", bone_name); + + count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 0); + ok(!count, "Got unexpected value %u.\n", count); + + count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 1); + ok(!count, "Got unexpected value %u.\n", count); + + matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, -1); + ok(!matrix, "Got unexpected value %p.\n", matrix); + + matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, 0); + ok(!matrix, "Got unexpected value %p.\n", matrix); + + skin_info->lpVtbl->Release(skin_info); + } + + mesh->lpVtbl->Release(mesh); + adjacency->lpVtbl->Release(adjacency); + file_data->lpVtbl->Release(file_data); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(hwnd); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -11222,4 +11405,5 @@ START_TEST(mesh) test_optimize_faces(); test_compute_normals(); test_D3DXFrameFind(); + test_load_skin_mesh_from_xof(); }

1 0

Matteo Bruni : include: Fix D3DXF_FILELOADMEMORY definition.
by Alexandre Julliard 27 Mar '19

27 Mar '19

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

Alexandre Julliard : ntdll/tests: Mark as broken a test that fails on win2003.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 0dbca5803b90c236d32664c0f34ea9525e5d81d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dbca5803b90c236d32664c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 08:50:33 2019 +0100 ntdll/tests: Mark as broken a test that fails on win2003. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 57ad30f..accb5d8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -400,7 +400,8 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); - ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE), + ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) || + broken(context->ContextFlags == CONTEXT_FULL), /* win2003 */ "wrong context flags %x\n", context->ContextFlags ); /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT

1 0

Michael Stefaniuc : oleaut32/tests: Remove useless casts to self.
by Alexandre Julliard 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

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

Detlef Riekenberg : schedsvc/tests: Avoid a crash in a SchRpcRegisterTask test.
by Alexandre Julliard 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

1 0

Isira Seneviratne : winecfg: Fix some punctuation in error messages.
by Alexandre Julliard 26 Mar '19

26 Mar '19

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
110
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019