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

Henri Verbeet : wined3d: Get rid of SFLAG_LOCKED.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 5ec56c9bc488d1280e890f69197b2a00755f578e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec56c9bc488d1280e890f691… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 20:48:34 2012 +0200 wined3d: Get rid of SFLAG_LOCKED. --- dlls/wined3d/surface.c | 22 +++++++++++----------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 148c014..da31801 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -581,7 +581,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->flags & SFLAG_DONOTFREE) + if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) return; HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); @@ -1441,7 +1441,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC fx->ddckSrcColorkey.color_space_high_value); } - if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) + if (dst_surface->resource.map_count || (src_surface && src_surface->resource.map_count)) { WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); return WINEDDERR_SURFACEBUSY; @@ -2257,7 +2257,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); - if (surface->flags & SFLAG_LOCKED) + if (surface->resource.map_count) { WARN("Uploading a surface that is currently mapped, setting SFLAG_PIN_SYSMEM.\n"); surface->flags |= SFLAG_PIN_SYSMEM; @@ -3081,9 +3081,9 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem { TRACE("surface %p, mem %p.\n", surface, mem); - if (surface->flags & (SFLAG_LOCKED | SFLAG_DCINUSE)) + if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) { - WARN("Surface is locked or the DC is in use.\n"); + WARN("Surface is mapped or the DC is in use.\n"); return WINED3DERR_INVALIDCALL; } @@ -3673,12 +3673,12 @@ HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); - if (!(surface->flags & SFLAG_LOCKED)) + if (!surface->resource.map_count) { WARN("Trying to unmap unmapped surface.\n"); return WINEDDERR_NOTLOCKED; } - surface->flags &= ~SFLAG_LOCKED; + --surface->resource.map_count; surface->surface_ops->surface_unmap(surface); @@ -3693,7 +3693,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", surface, map_desc, wine_dbgstr_rect(rect), flags); - if (surface->flags & SFLAG_LOCKED) + if (surface->resource.map_count) { WARN("Surface is already mapped.\n"); return WINED3DERR_INVALIDCALL; @@ -3717,7 +3717,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } - surface->flags |= SFLAG_LOCKED; + ++surface->resource.map_count; if (!(surface->flags & SFLAG_LOCKABLE)) WARN("Trying to lock unlockable surface.\n"); @@ -3797,7 +3797,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINEDDERR_DCALREADYCREATED; /* Can't GetDC if the surface is locked. */ - if (surface->flags & SFLAG_LOCKED) + if (surface->resource.map_count) return WINED3DERR_INVALIDCALL; /* Create a DIB section if there isn't a dc yet. */ @@ -5486,7 +5486,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); } - if (!(dst_surface->flags & SFLAG_DONOTFREE)) + if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) { HeapFree(GetProcessHeap(), 0, dst_surface->resource.heapMemory); dst_surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a98ac9f..14796d2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -714,7 +714,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r if (!(front->resource.usage & WINED3DUSAGE_RENDERTARGET)) return; - if (front->flags & SFLAG_LOCKED) + if (front->resource.map_count) ERR("Trying to blit a mapped surface.\n"); TRACE("Copying surface %p to screen.\n", front); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6dad53d..0525471 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2140,7 +2140,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ #define SFLAG_LOCKABLE 0x00000010 /* Surface can be locked. */ #define SFLAG_DYNLOCK 0x00000020 /* Surface is often locked by the application. */ -#define SFLAG_LOCKED 0x00000040 /* Surface is currently locked. */ +#define SFLAG_PIN_SYSMEM 0x00000040 /* Keep the surface in sysmem, at the same address. */ #define SFLAG_DCINUSE 0x00000080 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000100 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000200 /* The GL texture was created with a color key. */ @@ -2157,20 +2157,17 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INDRAWABLE 0x00100000 /* The GL drawable is current. */ #define SFLAG_INRB_MULTISAMPLE 0x00200000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ -#define SFLAG_PIN_SYSMEM 0x02000000 /* Keep the surface in sysmem, at the same address. */ -#define SFLAG_DISCARDED 0x04000000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_DISCARDED 0x00800000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long * SFLAG_DIBSECTION: The dib code manages the memory - * SFLAG_LOCKED: The app requires access to the surface data * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup */ #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ - SFLAG_LOCKED | \ SFLAG_CLIENT | \ SFLAG_DIBSECTION | \ SFLAG_USERPTR | \

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DDevice8Impl.
by Alexandre Julliard May 21, 2012

May 21, 2012

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

Christian Costa : d3drm: Implement IDirect3DRMMesh_AddGroup.
by Alexandre Julliard May 21, 2012

May 21, 2012

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: Implement IDirect3DRMMeshBuilderX_Scale method.
by Alexandre Julliard May 21, 2012

May 21, 2012

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_GetGroupCount.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 5a979deeb338b0bf250aae51cfb308f0c242c1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a979deeb338b0bf250aae51c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 21 09:42:57 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetGroupCount. --- dlls/d3drm/meshbuilder.c | 4 ++-- dlls/d3drm/tests/d3drm.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bbe927d..4333516 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2508,9 +2508,9 @@ static DWORD WINAPI IDirect3DRMMeshImpl_GetGroupCount(IDirect3DRMMesh* iface) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return 0; + return This->nb_groups; } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroup(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 76cb790..ffe571a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -172,6 +172,7 @@ static void test_MeshBuilder(void) HRESULT hr; LPDIRECT3DRM pD3DRM; LPDIRECT3DRMMESHBUILDER pMeshBuilder; + LPDIRECT3DRMMESH mesh; D3DRMLOADMEMORY info; int val; DWORD val1, val2, val3; @@ -282,6 +283,19 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + /* No group in mesh when mesh builder is not loaded */ + hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh); + ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr); + if (hr == D3DRM_OK) + { + DWORD nb_groups; + + nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); + ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups); + + IDirect3DRMMesh_Release(mesh); + } + info.lpMemory = data_full; info.dSize = strlen(data_full); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); @@ -325,6 +339,18 @@ 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_CreateMesh(pMeshBuilder, &mesh); + ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr); + if (hr == D3DRM_OK) + { + DWORD nb_groups; + + nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); + ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups); + + IDirect3DRMMesh_Release(mesh); + } + hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4); ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr);

1 0

Henri Verbeet : wined3d: Move the resource map count field up to wined3d_resource.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: f2fb3f11f935e4feaf4d6109a56c82eda8b3ec60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fb3f11f935e4feaf4d6109a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 20:48:33 2012 +0200 wined3d: Move the resource map count field up to wined3d_resource. --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0ee814b..aaa50d7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1008,7 +1008,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (!buffer_add_dirty_area(buffer, offset, size)) return E_OUTOFMEMORY; } - count = InterlockedIncrement(&buffer->lock_count); + count = ++buffer->resource.map_count; if (buffer->buffer_object) { @@ -1121,13 +1121,13 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) * number of Map calls, d3d returns always D3D_OK. * This is also needed to prevent Map from returning garbage on * the next call (this will happen if the lock_count is < 0). */ - if (!buffer->lock_count) + if (!buffer->resource.map_count) { WARN("Unmap called without a previous map call.\n"); return; } - if (InterlockedDecrement(&buffer->lock_count)) + if (--buffer->resource.map_count) { /* Delay loading the buffer until everything is unlocked */ TRACE("Ignoring unmap.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a78b65..6dad53d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1838,6 +1838,7 @@ struct wined3d_resource { LONG ref; LONG bind_count; + LONG map_count; struct wined3d_device *device; enum wined3d_resource_type type; const struct wined3d_format *format; @@ -2410,7 +2411,6 @@ struct wined3d_buffer UINT buffer_object_size; DWORD flags; - LONG lock_count; struct wined3d_map_range *maps; ULONG maps_size, modified_areas; struct wined3d_event_query *query;

1 0

Vincent Povirk : appwiz.cpl: Add Wine Mono to addons.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 8ea086b30802fd668f0580dec99a636a8b457198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea086b30802fd668f0580dec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 21 07:46:03 2012 -0500 appwiz.cpl: Add Wine Mono to addons. --- dlls/appwiz.cpl/addons.c | 11 +++++++ dlls/appwiz.cpl/appwiz.c | 6 ++++ dlls/appwiz.cpl/appwiz.h | 3 +- dlls/appwiz.cpl/appwiz.rc | 15 ++++++++++ dlls/appwiz.cpl/res.h | 1 + po/ar.po | 50 +++++++++++++++++++++------------ po/bg.po | 57 +++++++++++++++++++++++++------------ po/ca.po | 68 +++++++++++++++++++++++++++++++++------------ po/cs.po | 68 +++++++++++++++++++++++++++++++++------------ po/da.po | 67 ++++++++++++++++++++++++++++++++------------ po/de.po | 68 +++++++++++++++++++++++++++++++++------------ po/el.po | 50 +++++++++++++++++++++------------ po/en.po | 56 +++++++++++++++++++++++++------------ po/en_US.po | 56 +++++++++++++++++++++++++------------ po/eo.po | 52 ++++++++++++++++++++++------------ po/es.po | 67 ++++++++++++++++++++++++++++++++------------ po/fa.po | 50 +++++++++++++++++++++------------ po/fi.po | 67 ++++++++++++++++++++++++++++++++------------ po/fr.po | 68 +++++++++++++++++++++++++++++++++------------ po/he.po | 58 ++++++++++++++++++++++++++------------ po/hi.po | 50 +++++++++++++++++++++------------ po/hu.po | 68 +++++++++++++++++++++++++++++++++------------ po/it.po | 68 +++++++++++++++++++++++++++++++++------------ po/ja.po | 68 +++++++++++++++++++++++++++++++++------------ po/ko.po | 68 +++++++++++++++++++++++++++++++++------------ po/lt.po | 66 +++++++++++++++++++++++++++++++------------ po/ml.po | 50 +++++++++++++++++++++------------ po/nb_NO.po | 59 +++++++++++++++++++++++++++------------ po/nl.po | 67 ++++++++++++++++++++++++++++++++------------ po/or.po | 50 +++++++++++++++++++++------------ po/pa.po | 50 +++++++++++++++++++++------------ po/pl.po | 68 +++++++++++++++++++++++++++++++++------------ po/pt_BR.po | 68 +++++++++++++++++++++++++++++++++------------ po/pt_PT.po | 68 +++++++++++++++++++++++++++++++++------------ po/rm.po | 50 +++++++++++++++++++++------------ po/ro.po | 52 ++++++++++++++++++++++------------ po/ru.po | 68 +++++++++++++++++++++++++++++++++------------ po/sk.po | 68 +++++++++++++++++++++++++++++++++------------ po/sl.po | 68 +++++++++++++++++++++++++++++++++------------ po/sr_RS(a)cyrillic.po | 59 +++++++++++++++++++++++++++------------ po/sr_RS(a)latin.po | 59 +++++++++++++++++++++++++++------------ po/sv.po | 68 +++++++++++++++++++++++++++++++++------------ po/te.po | 50 +++++++++++++++++++++------------ po/th.po | 50 +++++++++++++++++++++------------ po/tr.po | 52 ++++++++++++++++++++++------------ po/uk.po | 68 +++++++++++++++++++++++++++++++++------------ po/wa.po | 50 +++++++++++++++++++++------------ po/wine.pot | 50 +++++++++++++++++++++------------ po/zh_CN.po | 65 +++++++++++++++++++++++++++++++------------ po/zh_TW.po | 66 +++++++++++++++++++++++++++++++------------ tools/wine.inf.in | 2 + 51 files changed, 1940 insertions(+), 811 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea086b30802fd668f058…

1 0

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

May 21, 2012

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

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

May 21, 2012

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

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

May 21, 2012

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