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

Jacek Caban : mshtml: Alloc proper BSTR size in return_nscstr.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 9f4d05b11c32a5417ef31da8aa1041166d8cfe27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f4d05b11c32a5417ef31da8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:53:01 2019 +0100 mshtml: Alloc proper BSTR size in return_nscstr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xhr.js | 1 + dlls/mshtml/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 8c42816..cb7e461 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -29,6 +29,7 @@ function test_xhr() { next_test(); } var onload_func = xhr.onload = function() { + ok(xhr.statusText === "OK", "statusText = " + xhr.statusText); if(complete_cnt++) next_test(); }; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index e235bf9..5f844d5 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -80,7 +80,7 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) if(*str) { len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0); - *p = SysAllocStringLen(NULL, len); + *p = SysAllocStringLen(NULL, len - 1); if(!*p) { nsACString_Finish(nscstr); return E_OUTOFMEMORY;

1 0

Detlef Riekenberg : wer: Fix WER_REPORT_TYPE failures on recent win10.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 6202cf456016a25829a05d1e627175bb739462e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6202cf456016a25829a05d1e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Mar 26 19:21:55 2019 +0100 wer: Fix WER_REPORT_TYPE failures on recent win10. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 2 +- dlls/wer/tests/main.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 75a22a5..e4bda46 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -278,7 +278,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE } if (phandle) *phandle = NULL; - if (!eventtype || !eventtype[0] || !phandle) { + if (!eventtype || !eventtype[0] || !phandle || (reporttype >= WerReportInvalid)) { return E_INVALIDARG; } diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 11a02fb..7fa9a8c 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -1,7 +1,7 @@ /* * Unit test suite for windows error reporting in Vista and above * - * Copyright 2010 Detlef Riekenberg + * Copyright 2010,2019 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -207,8 +207,8 @@ static void test_WerReportCreate(void) hr = WerReportCreate(empty, WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); - /* WER_REPORT_TYPE is not checked during WerReportCreate */ - for (i = 0; i <= WerReportInvalid + 1; i++) { + /* a valid WER_REPORT_TYPE works */ + for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); @@ -217,9 +217,27 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); } + + /* values for WER_REPORT_TYPE are checked and invalid values are rejected since recent win10, + but older windows versions did not check the report type and WerReportCreate always succeeded */ + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + ok((hr == E_INVALIDARG) | broken(hr == S_OK), + "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } + report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, 42, NULL, &report); - ok(hr == S_OK, "42: got 0x%x and %p (expected S_OK)\n", hr, report); + ok((hr == E_INVALIDARG) | broken(hr == S_OK), + "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } /* multiple active reports are possible */ memset(table, 0, sizeof(table));

1 0

Henri Verbeet : wined3d: Do not take "draw_rect" into account when comparing attachment sizes in ffp_blitter_clear().
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 7551f01bd0ed1ac6a82663305bc2dfe9bc07d034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7551f01bd0ed1ac6a8266330… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 27 15:46:31 2019 +0430 wined3d: Do not take "draw_rect" into account when comparing attachment sizes in ffp_blitter_clear(). The scissor rectangle and viewport shouldn't affect whether attachment sizes are equal. The Intel i965 driver will do a fast clear when the scissor rectangle overlaps the intersection of the attachments, and that behaviour is allowed by the OpenGL spec. This commit fixes failures in the d3d8 and d3d9 depth_buffer_test() tests on the Intel i965 driver. See also commit 0530f33cc1644cd782ee2028966721bddf28c5d4. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4d5b777..11d0255 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2052,12 +2052,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { - BOOL have_previous_rect = FALSE, have_identical_size = TRUE; - struct wined3d_rendertarget_view *view; + struct wined3d_rendertarget_view *view, *previous = NULL; + BOOL have_identical_size = TRUE; struct wined3d_fb_state tmp_fb; unsigned int next_rt_count = 0; struct wined3d_blitter *next; - RECT previous_rect, rect; DWORD next_flags = 0; unsigned int i; @@ -2101,23 +2100,17 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (!(view = fb->render_targets[i])) continue; - SetRect(&rect, 0, 0, view->width, view->height); - IntersectRect(&rect, draw_rect, &rect); - if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous_rect = rect; - have_previous_rect = TRUE; + previous = view; } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = fb->depth_stencil; - SetRect(&rect, 0, 0, view->width, view->height); - IntersectRect(&rect, draw_rect, &rect); - if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous_rect = rect; - have_previous_rect = TRUE; + previous = view; } if (have_identical_size)

1 0

Henri Verbeet : wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: a5279a5fba452d779cafc2cbd3098e9ed81598d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5279a5fba452d779cafc2cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 27 15:46:32 2019 +0430 wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter. Astutely spotted by Józef Kucia. This fixes a regression introduced by commit 961a94ac046644004718c56bfeeb81740cb73793. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/surface.c | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05bd55a..92c6e47 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7841,6 +7841,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 55d99ab..5844b0c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13258,6 +13258,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11d0255..48ca35b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2213,6 +2213,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else

1 0

Isira Seneviratne : taskmgr: Replace repeated code with for loops.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: e0625660c8c076289e21d2fa80f3c2e4a5f33a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0625660c8c076289e21d2fa… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Mar 26 20:36:41 2019 +0530 taskmgr: Replace repeated code with for loops. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/affinity.c | 203 +++----------------------------------------- programs/taskmgr/resource.h | 2 +- 2 files changed, 12 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0625660c8c076289e21…

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

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

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 : 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

Nikolay Sivov : mfplat: Use current stream position when async request is made.
by Alexandre Julliard 27 Mar '19

27 Mar '19

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