May 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8: Get rid of IDirect3DDevice8Impl.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 9b085a92609b8fcfeabcf6fc7be2bbe4b7121c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b085a92609b8fcfeabcf6fc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 20:48:36 2012 +0200 d3d8: Get rid of IDirect3DDevice8Impl. --- dlls/d3d8/buffer.c | 4 +- dlls/d3d8/d3d8_private.h | 29 +- dlls/d3d8/device.c | 1655 ++++++++++++++++++++--------------------- dlls/d3d8/directx.c | 2 +- dlls/d3d8/shader.c | 6 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/texture.c | 6 +- dlls/d3d8/vertexdeclaration.c | 4 +- dlls/d3d8/volume.c | 2 +- 10 files changed, 835 insertions(+), 877 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b085a92609b8fcfeabcf…

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DIndexBuffer8Impl.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 27ca37dbe088845c4e1cd9cf43a875452e8b5040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ca37dbe088845c4e1cd9cf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 20:48:37 2012 +0200 d3d8: Get rid of IDirect3DIndexBuffer8Impl. --- dlls/d3d8/buffer.c | 72 +++++++++++++++++++++++----------------------- dlls/d3d8/d3d8_private.h | 20 ++++--------- dlls/d3d8/device.c | 8 ++-- 3 files changed, 46 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27ca37dbe088845c4e1cd…

1 0

Hans Leidekker : fusion: Add support for enumerating version 4.0 assemblies .
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 0c6ab2464fec5c41a21e1a52d5d10eee5bc0a48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6ab2464fec5c41a21e1a52d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:25:43 2012 +0200 fusion: Add support for enumerating version 4.0 assemblies. --- dlls/fusion/asmenum.c | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 52229a8..e4f73e8 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -382,32 +382,50 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) { - WCHAR path[MAX_PATH]; - WCHAR buf[MAX_PATH]; + static const WCHAR gac[] = {'\\','G','A','C',0}; + static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0}; + static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0}; + WCHAR path[MAX_PATH], buf[MAX_PATH]; HRESULT hr; DWORD size; - static WCHAR under32[] = {'_','3','2',0}; - static WCHAR msil[] = {'_','M','S','I','L',0}; + size = MAX_PATH; + hr = GetCachePath(ASM_CACHE_ROOT_EX, buf, &size); + if (FAILED(hr)) + return hr; + + strcpyW(path, buf); + strcpyW(path + size - 1, gac_32); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + + strcpyW(path, buf); + strcpyW(path + size - 1, gac_msil); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; size = MAX_PATH; - hr = GetCachePath(ASM_CACHE_GAC, buf, &size); + hr = GetCachePath(ASM_CACHE_ROOT, buf, &size); if (FAILED(hr)) return hr; - lstrcpyW(path, buf); - lstrcatW(path, under32); + strcpyW(path, buf); + strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - lstrcpyW(path, buf); - lstrcatW(path, msil); + strcpyW(path, buf); + strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, buf); + strcpyW(path, buf); + strcpyW(path + size - 1, gac); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr;

1 0

Hans Leidekker : fusion: Add support for installing version 4.0 assemblies.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: fd1eab7f226550cc8bf6f0de5a2b31202dfecbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1eab7f226550cc8bf6f0de5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 21 11:26:07 2012 +0200 fusion: Add support for installing version 4.0 assemblies. --- dlls/fusion/asmcache.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index fdf8ab5..93047d4 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -94,39 +94,48 @@ static BOOL create_full_path(LPCWSTR path) return ret; } -static BOOL get_assembly_directory(LPWSTR dir, DWORD size, PEKIND architecture) +static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version, PEKIND architecture) { + static const WCHAR dotnet[] = {'\\','M','i','c','r','o','s','o','f','t','.','N','E','T','\\',0}; static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; - static const WCHAR msil[] = {'_','M','S','I','L',0}; static const WCHAR x86[] = {'_','3','2',0}; static const WCHAR amd64[] = {'_','6','4',0}; + DWORD len = GetWindowsDirectoryW(dir, size); - GetWindowsDirectoryW(dir, size); - strcatW(dir, gac); - + if (!strcmp(version, "v4.0.30319")) + { + strcpyW(dir + len, dotnet); + len += sizeof(dotnet)/sizeof(WCHAR) -1; + strcpyW(dir + len, gac + 1); + len += sizeof(gac)/sizeof(WCHAR) - 2; + } + else + { + strcpyW(dir + len, gac); + len += sizeof(gac)/sizeof(WCHAR) - 1; + } switch (architecture) { case peNone: break; case peMSIL: - strcatW(dir, msil); + strcpyW(dir + len, msil); break; case peI386: - strcatW(dir, x86); + strcpyW(dir + len, x86); break; case peAMD64: - strcatW(dir, amd64); + strcpyW(dir + len, amd64); break; default: WARN("unhandled architecture %u\n", architecture); return FALSE; } - return TRUE; } @@ -371,15 +380,11 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ASSEMBLY *assembly; - LPWSTR filename; - LPWSTR name = NULL; - LPWSTR token = NULL; - LPWSTR version = NULL; - LPWSTR asmpath = NULL; - WCHAR path[MAX_PATH]; - WCHAR asmdir[MAX_PATH]; - LPWSTR ext; + WCHAR *filename, *ext; + WCHAR *name = NULL, *token = NULL, *version = NULL, *asmpath = NULL; + WCHAR path[MAX_PATH], asmdir[MAX_PATH]; PEKIND architecture; + char *clr_version; HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, @@ -416,10 +421,14 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (FAILED(hr)) goto done; + hr = assembly_get_runtime_version(assembly, &clr_version); + if (FAILED(hr)) + goto done; + cache_lock( cache ); architecture = assembly_get_architecture(assembly); - get_assembly_directory(asmdir, MAX_PATH, architecture); + get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); sprintfW(path, format, asmdir, name, version, token);

1 0

Michael Stefaniuc : d3d9/tests: Remove stray ok() call.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 3d9a4e8921b62ab797dfadce23fccfee57c2e190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9a4e8921b62ab797dfadce2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:12:40 2012 +0200 d3d9/tests: Remove stray ok() call. --- dlls/d3d9/tests/visual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0521791..be2d7dc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8614,7 +8614,6 @@ static void stencil_cull_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); } - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_KEEP);

1 0

Michael Stefaniuc : mshtml/tests: Remove duplicated ok() call.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: fc999cb362c9ac8b7210d32a5c92435807c32039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc999cb362c9ac8b7210d32a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:15:10 2012 +0200 mshtml/tests: Remove duplicated ok() call. --- dlls/mshtml/tests/protocol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 5825015..7e66347 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -478,7 +478,6 @@ static void test_res_protocol(void) memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, NULL, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &size, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); ok(size == sizeof(DWORD), "size=%d\n", size); ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf);

1 0

Christian Costa : dmusic: Simplify IPersistStream_Load by checking DLS header first and exit if it is wrong .
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 4c7fb67fc145c0009a276c6e0022ab2f29dc9c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7fb67fc145c0009a276c6e0… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 21 09:39:54 2012 +0200 dmusic: Simplify IPersistStream_Load by checking DLS header first and exit if it is wrong. --- dlls/dmusic/collection.c | 608 +++++++++++++++++++++++----------------------- 1 files changed, 302 insertions(+), 306 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c7fb67fc145c0009a276…

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshBuilderX_Scale method.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: e07f824241fb8ec6eafec9113c13de35e7d3d335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07f824241fb8ec6eafec9113… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 21 09:42:31 2012 +0200 d3drm: Implement IDirect3DRMMeshBuilderX_Scale method. --- dlls/d3drm/meshbuilder.c | 24 ++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 27 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 38a38e8..d58f229 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1,5 +1,5 @@ /* - * Implementation of IDirect3DRMMeshBuilder2 Interface + * Implementation of IDirect3DRMMeshBuilderX and IDirect3DRMMesh interfaces * * Copyright 2010, 2012 Christian Costa * Copyright 2011 André Hentschel @@ -19,10 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#define NONAMELESSUNION #define COBJMACROS +#include "wine/debug.h" + #include "winbase.h" #include "wingdi.h" #include "dxfile.h" @@ -472,9 +474,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Scale(IDirect3DRMMeshBuilder2* { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%f,%f,%f): stub\n", This, sx, sy, sz); + TRACE("(%p)->(%f,%f,%f)\n", This, sx, sy, sz); - return D3DRM_OK; + return IDirect3DRMMeshBuilder3_Scale(&This->IDirect3DRMMeshBuilder3_iface, sx, sy, sz); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Translate(IDirect3DRMMeshBuilder2* iface, @@ -1415,10 +1417,20 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Scale(IDirect3DRMMeshBuilder3* D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + int i; - FIXME("(%p)->(%f,%f,%f): stub\n", This, sx, sy, sz); + TRACE("(%p)->(%f,%f,%f)\n", This, sx, sy, sz); - return E_NOTIMPL; + for (i = 0; i < This->nb_vertices; i++) + { + This->pVertices[i].u1.x *= sx; + This->pVertices[i].u2.y *= sy; + This->pVertices[i].u3.z *= sz; + } + + /* Normals are not affected by Scale */ + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Translate(IDirect3DRMMeshBuilder3* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 3126fbd..76cb790 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -325,6 +325,33 @@ static void test_MeshBuilder(void) ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]); ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]); + hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4); + ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr); + + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2); + ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1); + ok(U1(v[0]).x == 0.1f*2, "Wrong component v[0].x = %f (expected %f)\n", U1(v[0]).x, 0.1f*2); + ok(U2(v[0]).y == 0.2f*3, "Wrong component v[0].y = %f (expected %f)\n", U2(v[0]).y, 0.2f*3); + ok(U3(v[0]).z == 0.3f*4, "Wrong component v[0].z = %f (expected %f)\n", U3(v[0]).z, 0.3f*4); + ok(U1(v[1]).x == 0.4f*2, "Wrong component v[1].x = %f (expected %f)\n", U1(v[1]).x, 0.4f*2); + ok(U2(v[1]).y == 0.5f*3, "Wrong component v[1].y = %f (expected %f)\n", U2(v[1]).y, 0.5f*3); + ok(U3(v[1]).z == 0.6f*4, "Wrong component v[1].z = %f (expected %f)\n", U3(v[1]).z, 0.6f*4); + ok(U1(v[2]).x == 0.7f*2, "Wrong component v[2].x = %f (expected %f)\n", U1(v[2]).x, 0.7f*2); + ok(U2(v[2]).y == 0.8f*3, "Wrong component v[2].y = %f (expected %f)\n", U2(v[2]).y, 0.8f*3); + ok(U3(v[2]).z == 0.9f*4, "Wrong component v[2].z = %f (expected %f)\n", U3(v[2]).z, 0.9f*4); + /* Normals are not affected by Scale */ + ok(U1(n[0]).x == 1.1f, "Wrong component n[0].x = %f (expected %f)\n", U1(n[0]).x, 1.1f); + ok(U2(n[0]).y == 1.2f, "Wrong component n[0].y = %f (expected %f)\n", U2(n[0]).y, 1.2f); + ok(U3(n[0]).z == 1.3f, "Wrong component n[0].z = %f (expected %f)\n", U3(n[0]).z, 1.3f); + ok(U1(n[1]).x == 1.4f, "Wrong component n[1].x = %f (expected %f)\n", U1(n[1]).x, 1.4f); + ok(U2(n[1]).y == 1.5f, "Wrong component n[1].y = %f (expected %f)\n", U2(n[1]).y, 1.5f); + ok(U3(n[1]).z == 1.6f, "Wrong component n[1].z = %f (expected %f)\n", U3(n[1]).z, 1.6f); + ok(U1(n[2]).x == 1.7f, "Wrong component n[2].x = %f (expected %f)\n", U1(n[2]).x, 1.7f); + ok(U2(n[2]).y == 1.8f, "Wrong component n[2].y = %f (expected %f)\n", U2(n[2]).y, 1.8f); + ok(U3(n[2]).z == 1.9f, "Wrong component n[2].z = %f (expected %f)\n", U3(n[2]).z, 1.9f); + IDirect3DRMMeshBuilder_Release(pMeshBuilder); IDirect3DRM_Release(pD3DRM);

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_AddGroup.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 43fed89d04c971a96e64ec7fe4affe82ae27a22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fed89d04c971a96e64ec7fe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 21 09:42:39 2012 +0200 d3drm: Implement IDirect3DRMMesh_AddGroup. --- dlls/d3drm/meshbuilder.c | 93 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index d58f229..8045857 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -37,8 +37,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); static HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj); typedef struct { + unsigned nb_vertices; + D3DRMVERTEX* vertices; + unsigned nb_faces; + unsigned vertex_per_face; + DWORD face_data_size; + unsigned* face_data; +} mesh_group; + +typedef struct { IDirect3DRMMesh IDirect3DRMMesh_iface; LONG ref; + DWORD groups_capacity; + DWORD nb_groups; + mesh_group* groups; } IDirect3DRMMeshImpl; typedef struct { @@ -2174,7 +2186,14 @@ static ULONG WINAPI IDirect3DRMMeshImpl_Release(IDirect3DRMMesh* iface) TRACE("(%p)->(): new ref = %d\n", This, ref); if (!ref) + { + int i; + + for (i = 0; i < This->nb_groups; i++) + HeapFree(GetProcessHeap(), 0, This->groups[i].vertices); + HeapFree(GetProcessHeap(), 0, This->groups); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -2294,14 +2313,80 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetBox(IDirect3DRMMesh* iface, } static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, - unsigned vCount, unsigned fCount, unsigned vPerFace, - unsigned *fData, D3DRMGROUPINDEX *returnId) + unsigned vertex_count, unsigned face_count, unsigned vertex_per_face, + unsigned *face_data, D3DRMGROUPINDEX *return_id) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); + mesh_group* group; - FIXME("(%p)->(%u,%u,%u,%p,%p): stub\n", This, vCount, fCount, vPerFace, fData, returnId); + TRACE("(%p)->(%u,%u,%u,%p,%p)\n", This, vertex_count, face_count, vertex_per_face, face_data, return_id); - return E_NOTIMPL; + if (!face_data || !return_id) + return E_POINTER; + + if ((This->nb_groups + 1) > This->groups_capacity) + { + ULONG new_capacity; + mesh_group* groups; + + if (!This->groups_capacity) + { + new_capacity = 16; + groups = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(mesh_group)); + } + else + { + new_capacity = This->groups_capacity * 2; + groups = HeapReAlloc(GetProcessHeap(), 0, This->groups, new_capacity * sizeof(mesh_group)); + } + + if (!groups) + return E_OUTOFMEMORY; + + This->groups_capacity = new_capacity; + This->groups = groups; + } + + group = This->groups + This->nb_groups; + + group->vertices = HeapAlloc(GetProcessHeap(), 0, vertex_count * sizeof(D3DRMVERTEX)); + if (!group->vertices) + return E_OUTOFMEMORY; + group->nb_vertices = vertex_count; + group->nb_faces = face_count; + group->vertex_per_face = vertex_per_face; + + if (vertex_per_face) + { + group->face_data_size = face_count * vertex_per_face; + } + else + { + int i; + unsigned nb_indices; + unsigned* face_data_ptr = face_data; + group->face_data_size = 0; + + for (i = 0; i < face_count; i++) + { + nb_indices = *face_data_ptr; + group->face_data_size += nb_indices + 1; + face_data_ptr += nb_indices; + } + } + + group->face_data = HeapAlloc(GetProcessHeap(), 0, group->face_data_size * sizeof(unsigned)); + if (!group->face_data) + { + HeapFree(GetProcessHeap(), 0 , group->vertices); + return E_OUTOFMEMORY; + } + + memcpy(group->face_data, face_data, group->face_data_size * sizeof(unsigned)); + + *return_id = This->nb_groups++; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetVertices(IDirect3DRMMesh* iface,

1 0

Christian Costa : d3drm: Improve IDirect3DRMMeshBuilder3_CreateMesh and forward IDirect3DRMMeshBuilder2_CreateMesh to it .
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 8bba7cd226c88f6ec0f81eda850f4f0029798969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bba7cd226c88f6ec0f81eda8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 21 09:42:48 2012 +0200 d3drm: Improve IDirect3DRMMeshBuilder3_CreateMesh and forward IDirect3DRMMeshBuilder2_CreateMesh to it. --- dlls/d3drm/meshbuilder.c | 56 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 8045857..bbe927d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -855,13 +855,13 @@ static D3DCOLOR WINAPI IDirect3DRMMeshBuilder2Impl_GetVertexColor(IDirect3DRMMes } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateMesh(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMMESH* ppMesh) + LPDIRECT3DRMMESH* mesh) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - TRACE("(%p)->(%p)\n", This, ppMesh); + TRACE("(%p)->(%p)\n", This, mesh); - return Direct3DRMMesh_create(ppMesh); + return IDirect3DRMMeshBuilder3_CreateMesh(&This->IDirect3DRMMeshBuilder3_iface, mesh); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GenerateNormals2(IDirect3DRMMeshBuilder2* iface, @@ -1812,13 +1812,57 @@ static D3DCOLOR WINAPI IDirect3DRMMeshBuilder3Impl_GetVertexColor(IDirect3DRMMes } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMMESH* Mesh) + LPDIRECT3DRMMESH* mesh) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + HRESULT hr; + D3DRMGROUPINDEX group; + + TRACE("(%p)->(%p)\n", This, mesh); + + if (!mesh) + return E_POINTER; + + hr = Direct3DRMMesh_create(mesh); + if (FAILED(hr)) + return hr; + + /* If there is mesh data, create a group and put data inside */ + if (This->nb_vertices) + { + unsigned* face_data; + unsigned* out_ptr; + DWORD* in_ptr = This->pFaceData; + int i, j; - TRACE("(%p)->(%p)\n", This, Mesh); + face_data = HeapAlloc(GetProcessHeap(), 0, This->face_data_size * sizeof(DWORD)); + if (!face_data) + { + IDirect3DRMMesh_Release(*mesh); + return E_OUTOFMEMORY; + } + out_ptr = face_data; + + /* Put only vertex indices */ + for (i = 0; i < This->nb_faces; i++) + { + DWORD nb_indices = *out_ptr++ = *in_ptr++; + for (j = 0; j < nb_indices; j++) + { + *out_ptr++ = *in_ptr++; + /* Skip normal index */ + in_ptr++; + } + } + + hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, 0, face_data, &group); + if (FAILED(hr)) + IDirect3DRMMesh_Release(*mesh); + + HeapFree(GetProcessHeap(), 0, face_data); + } - return Direct3DRMMesh_create(Mesh); + return hr; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3* iface,

1 0