April 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Map() implementations.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 825341e7c2421adac0a2144f512c60bf563ec4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825341e7c2421adac0a2144f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:18 2011 +0200 wined3d: Merge the IWineD3DSurface::Map() implementations. --- dlls/wined3d/surface.c | 386 +++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 182 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=825341e7c2421adac0a21…

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Unmap() implementations .
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 34ba20fe352a3919d4dc4802f1b3c2975e4f0413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ba20fe352a3919d4dc4802f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:19 2011 +0200 wined3d: Merge the IWineD3DSurface::Unmap() implementations. --- dlls/wined3d/surface.c | 287 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 147 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34ba20fe352a3919d4dc4…

1 0

Marcus Meissner : shell32: Mark internal symbols as hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 448569624835379b0700a66b7882e67091931340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448569624835379b0700a66b7… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 19:23:52 2011 +0200 shell32: Mark internal symbols as hidden. --- dlls/shell32/cpanel.h | 4 +- dlls/shell32/debughlp.h | 6 +- dlls/shell32/ebrowser.c | 2 +- dlls/shell32/enumidlist.h | 6 +- dlls/shell32/pidl.h | 88 +++++++++++++------------- dlls/shell32/shell32_main.h | 140 +++++++++++++++++++++--------------------- dlls/shell32/shfldr.h | 24 ++++---- dlls/shell32/xdg.h | 22 ++++---- 8 files changed, 146 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=448569624835379b0700a…

1 0

Marcus Meissner : msxml3: Mark internal symbols as hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 1ef0fca7960486067921a7df040842e78a239546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef0fca7960486067921a7df0… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 18:41:22 2011 +0200 msxml3: Mark internal symbols as hidden. --- dlls/msxml3/msxml_private.h | 190 +++++++++++++++++++++--------------------- dlls/msxml3/xslpattern.h | 10 +- dlls/msxml3/xslpattern.l | 2 + dlls/msxml3/xslpattern.y | 2 + 4 files changed, 104 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ef0fca7960486067921a…

1 0

André Hentschel : winedbg: Fill the dbg_internal_var array for ARM.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: b7ea0cb0840334f93bbd9ffa2de980fa5c573863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ea0cb0840334f93bbd9ffa2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 26 23:10:42 2011 +0200 winedbg: Fill the dbg_internal_var array for ARM. --- programs/winedbg/be_arm.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 732b581..0379bd9 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -76,7 +76,24 @@ static void be_arm_print_segment_info(HANDLE hThread, const CONTEXT* ctx) static struct dbg_internal_var be_arm_ctx[] = { - {0, NULL, 0, dbg_itype_none} + {CV_ARM_R0 + 0, "r0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R0), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 1, "r1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R1), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 2, "r2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R2), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 3, "r3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R3), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 4, "r4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R4), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 5, "r5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R5), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 6, "r6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R6), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 7, "r7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R7), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 8, "r8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R8), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 9, "r9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R9), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 10, "r10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R10), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 11, "r11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Fp), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 12, "r12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Ip), dbg_itype_unsigned_int}, + {CV_ARM_SP, "sp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_int}, + {CV_ARM_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Lr), dbg_itype_unsigned_int}, + {CV_ARM_PC, "pc", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_int}, + {CV_ARM_CPSR, "cpsr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Cpsr), dbg_itype_unsigned_int}, + {0, NULL, 0, dbg_itype_none} }; static unsigned be_arm_is_step_over_insn(const void* insn)

1 0

Dylan Smith : d3dx9: Support the option flags for D3DXCreateMesh.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: e4fd5d0a60750bbee30cc885be055e57c8dc3e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd5d0a60750bbee30cc885b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Apr 26 12:55:50 2011 -0400 d3dx9: Support the option flags for D3DXCreateMesh. --- dlls/d3dx9_36/mesh.c | 67 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 140cb2a..417a2ec 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -975,14 +975,65 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, IDirect3DVertexBuffer9 *vertex_buffer; IDirect3DIndexBuffer9 *index_buffer; ID3DXMeshImpl *object; + DWORD index_usage = 0; + D3DPOOL index_pool = D3DPOOL_DEFAULT; + D3DFORMAT index_format = D3DFMT_INDEX16; + DWORD vertex_usage = 0; + D3DPOOL vertex_pool = D3DPOOL_DEFAULT; - TRACE("(%d, %d, %d, %p, %p, %p)\n", numfaces, numvertices, options, declaration, device, mesh); + TRACE("(%d, %d, %x, %p, %p, %p)\n", numfaces, numvertices, options, declaration, device, mesh); - if (numfaces == 0 || numvertices == 0 || declaration == NULL || device == NULL || mesh == NULL) + if (numfaces == 0 || numvertices == 0 || declaration == NULL || device == NULL || mesh == NULL || + /* D3DXMESH_VB_SHARE is for cloning, and D3DXMESH_USEHWONLY is for ConvertToBlendedMesh */ + (options & (D3DXMESH_VB_SHARE | D3DXMESH_USEHWONLY | 0xfffe0000))) { return D3DERR_INVALIDCALL; } + if (options & D3DXMESH_32BIT) + index_format = D3DFMT_INDEX32; + + if (options & D3DXMESH_DONOTCLIP) { + index_usage |= D3DUSAGE_DONOTCLIP; + vertex_usage |= D3DUSAGE_DONOTCLIP; + } + if (options & D3DXMESH_POINTS) { + index_usage |= D3DUSAGE_POINTS; + vertex_usage |= D3DUSAGE_POINTS; + } + if (options & D3DXMESH_RTPATCHES) { + index_usage |= D3DUSAGE_RTPATCHES; + vertex_usage |= D3DUSAGE_RTPATCHES; + } + if (options & D3DXMESH_NPATCHES) { + index_usage |= D3DUSAGE_NPATCHES; + vertex_usage |= D3DUSAGE_NPATCHES; + } + + if (options & D3DXMESH_VB_SYSTEMMEM) + vertex_pool = D3DPOOL_SYSTEMMEM; + else if (options & D3DXMESH_VB_MANAGED) + vertex_pool = D3DPOOL_MANAGED; + + if (options & D3DXMESH_VB_WRITEONLY) + vertex_usage |= D3DUSAGE_WRITEONLY; + if (options & D3DXMESH_VB_DYNAMIC) + vertex_usage |= D3DUSAGE_DYNAMIC; + if (options & D3DXMESH_VB_SOFTWAREPROCESSING) + vertex_usage |= D3DUSAGE_SOFTWAREPROCESSING; + + if (options & D3DXMESH_IB_SYSTEMMEM) + index_pool = D3DPOOL_SYSTEMMEM; + else if (options & D3DXMESH_IB_MANAGED) + index_pool = D3DPOOL_MANAGED; + + if (options & D3DXMESH_IB_WRITEONLY) + index_usage |= D3DUSAGE_WRITEONLY; + if (options & D3DXMESH_IB_DYNAMIC) + index_usage |= D3DUSAGE_DYNAMIC; + if (options & D3DXMESH_IB_SOFTWAREPROCESSING) + index_usage |= D3DUSAGE_SOFTWAREPROCESSING; + hr = D3DXFVFFromDeclarator(declaration, &fvf); if (hr != D3D_OK) { @@ -1002,9 +1053,9 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, /* Create vertex buffer */ hr = IDirect3DDevice9_CreateVertexBuffer(device, numvertices * D3DXGetDeclVertexSize(declaration, declaration[0].Stream), - 0, + vertex_usage, fvf, - D3DPOOL_MANAGED, + vertex_pool, &vertex_buffer, NULL); if (FAILED(hr)) @@ -1016,10 +1067,10 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, /* Create index buffer */ hr = IDirect3DDevice9_CreateIndexBuffer(device, - numfaces * 6, /* 3 vertices per triangle, 2 triangles per face */ - 0, - D3DFMT_INDEX16, - D3DPOOL_MANAGED, + numfaces * 3 * ((index_format == D3DFMT_INDEX16) ? 2 : 4), + index_usage, + index_format, + index_pool, &index_buffer, NULL); if (FAILED(hr))

1 0

Dylan Smith : d3dx9: Implement ID3DXMesh::GenerateAdjacency.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: c8a8bc3a62efcea885eeafbb89b9398327baba77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a8bc3a62efcea885eeafbb8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Apr 26 12:56:02 2011 -0400 d3dx9: Implement ID3DXMesh::GenerateAdjacency. --- dlls/d3dx9_36/mesh.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 417a2ec..abcdcc8 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -293,13 +293,165 @@ static HRESULT WINAPI ID3DXMeshImpl_ConvertAdjacencyToPointReps(ID3DXMesh *iface return E_NOTIMPL; } +struct vertex_metadata { + float key; + DWORD vertex_index; + DWORD first_shared_index; +}; + +static int compare_vertex_keys(const void *a, const void *b) +{ + const struct vertex_metadata *left = a; + const struct vertex_metadata *right = b; + if (left->key == right->key) + return 0; + return left->key < right->key ? -1 : 1; +} + static HRESULT WINAPI ID3DXMeshImpl_GenerateAdjacency(ID3DXMesh *iface, FLOAT epsilon, DWORD *adjacency) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + HRESULT hr; + BYTE *vertices = NULL; + const DWORD *indices = NULL; + DWORD vertex_size; + DWORD buffer_size; + /* sort the vertices by (x + y + z) to quickly find coincident vertices */ + struct vertex_metadata *sorted_vertices; + /* shared_indices links together identical indices in the index buffer so + * that adjacency checks can be limited to faces sharing a vertex */ + DWORD *shared_indices = NULL; + const FLOAT epsilon_sq = epsilon * epsilon; + int i; - FIXME("(%p)->(%f,%p): stub\n", This, epsilon, adjacency); + TRACE("(%p)->(%f,%p)\n", This, epsilon, adjacency); - return E_NOTIMPL; + if (!adjacency) + return D3DERR_INVALIDCALL; + + buffer_size = This->numfaces * 3 * sizeof(*shared_indices) + This->numvertices * sizeof(*sorted_vertices); + if (!(This->options & D3DXMESH_32BIT)) + buffer_size += This->numfaces * 3 * sizeof(*indices); + shared_indices = HeapAlloc(GetProcessHeap(), 0, buffer_size); + if (!shared_indices) + return E_OUTOFMEMORY; + sorted_vertices = (struct vertex_metadata*)(shared_indices + This->numfaces * 3); + + hr = iface->lpVtbl->LockVertexBuffer(iface, D3DLOCK_READONLY, (void**)&vertices); + if (FAILED(hr)) goto cleanup; + hr = iface->lpVtbl->LockIndexBuffer(iface, D3DLOCK_READONLY, (void**)&indices); + if (FAILED(hr)) goto cleanup; + + if (!(This->options & D3DXMESH_32BIT)) { + const WORD *word_indices = (const WORD*)indices; + DWORD *dword_indices = (DWORD*)(sorted_vertices + This->numvertices); + indices = dword_indices; + for (i = 0; i < This->numfaces * 3; i++) + *dword_indices++ = *word_indices++; + } + + vertex_size = iface->lpVtbl->GetNumBytesPerVertex(iface); + for (i = 0; i < This->numvertices; i++) { + D3DXVECTOR3 *vertex = (D3DXVECTOR3*)(vertices + vertex_size * i); + sorted_vertices[i].first_shared_index = -1; + sorted_vertices[i].key = vertex->x + vertex->y + vertex->z; + sorted_vertices[i].vertex_index = i; + } + for (i = 0; i < This->numfaces * 3; i++) { + DWORD *first_shared_index = &sorted_vertices[indices[i]].first_shared_index; + shared_indices[i] = *first_shared_index; + *first_shared_index = i; + adjacency[i] = -1; + } + qsort(sorted_vertices, This->numvertices, sizeof(*sorted_vertices), compare_vertex_keys); + + for (i = 0; i < This->numvertices; i++) { + struct vertex_metadata *sorted_vertex_a = &sorted_vertices[i]; + D3DXVECTOR3 *vertex_a = (D3DXVECTOR3*)(vertices + sorted_vertex_a->vertex_index * vertex_size); + DWORD shared_index_a = sorted_vertex_a->first_shared_index; + + while (shared_index_a != -1) { + int j = i; + DWORD shared_index_b = shared_indices[shared_index_a]; + struct vertex_metadata *sorted_vertex_b = sorted_vertex_a; + + while (TRUE) { + while (shared_index_b != -1) { + /* faces are adjacent if they have another coincident vertex */ + DWORD base_a = (shared_index_a / 3) * 3; + DWORD base_b = (shared_index_b / 3) * 3; + BOOL adjacent = FALSE; + int k; + + for (k = 0; k < 3; k++) { + if (adjacency[base_b + k] == shared_index_a / 3) { + adjacent = TRUE; + break; + } + } + if (!adjacent) { + for (k = 1; k <= 2; k++) { + DWORD vertex_index_a = base_a + (shared_index_a + k) % 3; + DWORD vertex_index_b = base_b + (shared_index_b + (3 - k)) % 3; + adjacent = indices[vertex_index_a] == indices[vertex_index_b]; + if (!adjacent && epsilon >= 0.0f) { + D3DXVECTOR3 delta = {0.0f, 0.0f, 0.0f}; + FLOAT length_sq; + + D3DXVec3Subtract(&delta, + (D3DXVECTOR3*)(vertices + indices[vertex_index_a] * vertex_size), + (D3DXVECTOR3*)(vertices + indices[vertex_index_b] * vertex_size)); + length_sq = D3DXVec3LengthSq(&delta); + adjacent = epsilon == 0.0f ? length_sq == 0.0f : length_sq < epsilon_sq; + } + if (adjacent) { + DWORD adj_a = base_a + 2 - (vertex_index_a + shared_index_a + 1) % 3; + DWORD adj_b = base_b + 2 - (vertex_index_b + shared_index_b + 1) % 3; + if (adjacency[adj_a] == -1 && adjacency[adj_b] == -1) { + adjacency[adj_a] = base_b / 3; + adjacency[adj_b] = base_a / 3; + break; + } + } + } + } + + shared_index_b = shared_indices[shared_index_b]; + } + while (++j < This->numvertices) { + D3DXVECTOR3 *vertex_b; + + sorted_vertex_b++; + if (sorted_vertex_b->key - sorted_vertex_a->key > epsilon * 3.0f) { + /* no more coincident vertices to try */ + j = This->numvertices; + break; + } + /* check for coincidence */ + vertex_b = (D3DXVECTOR3*)(vertices + sorted_vertex_b->vertex_index * vertex_size); + if (fabsf(vertex_a->x - vertex_b->x) <= epsilon && + fabsf(vertex_a->y - vertex_b->y) <= epsilon && + fabsf(vertex_a->z - vertex_b->z) <= epsilon) + { + break; + } + } + if (j >= This->numvertices) + break; + shared_index_b = sorted_vertex_b->first_shared_index; + } + + sorted_vertex_a->first_shared_index = shared_indices[sorted_vertex_a->first_shared_index]; + shared_index_a = sorted_vertex_a->first_shared_index; + } + } + + hr = D3D_OK; +cleanup: + if (indices) iface->lpVtbl->UnlockIndexBuffer(iface); + if (vertices) iface->lpVtbl->UnlockVertexBuffer(iface); + HeapFree(GetProcessHeap(), 0, shared_indices); + return hr; } static HRESULT WINAPI ID3DXMeshImpl_UpdateSemantics(ID3DXMesh *iface, D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE])

1 0

Dylan Smith : d3dx9/tests: Added tests for ID3DXMesh::GenerateAdjacency.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 46a96b139e51d13737f12f39e2eff05e6ac2a683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a96b139e51d13737f12f39e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Apr 26 12:56:09 2011 -0400 d3dx9/tests: Added tests for ID3DXMesh::GenerateAdjacency. --- dlls/d3dx9_36/tests/mesh.c | 138 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index b54a92b..570e186 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -25,6 +25,8 @@ #define admitted_error 0.0001f +#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) + #define compare_vertex_sizes(type, exp) \ got=D3DXGetFVFVertexSize(type); \ ok(got==exp, "Expected: %d, Got: %d\n", exp, got); @@ -3155,6 +3157,141 @@ static void test_get_decl_vertex_size(void) } } +static void D3DXGenerateAdjacencyTest(void) +{ + HRESULT hr; + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh *d3dxmesh = NULL; + D3DXVECTOR3 *vertices = NULL; + WORD *indices = NULL; + int i; + struct { + DWORD num_vertices; + D3DXVECTOR3 vertices[6]; + DWORD num_faces; + WORD indices[3 * 3]; + FLOAT epsilon; + DWORD adjacency[3 * 3]; + } test_data[] = { + { /* for epsilon < 0, indices must match for faces to be adjacent */ + 4, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, + 2, {0, 1, 2, 0, 2, 3}, + -1.0, + {-1, -1, 1, 0, -1, -1}, + }, + { + 6, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, + 2, {0, 1, 2, 3, 4, 5}, + -1.0, + {-1, -1, -1, -1, -1, -1}, + }, + { /* for epsilon == 0, indices or vertices must match for faces to be adjacent */ + 6, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, + 2, {0, 1, 2, 3, 4, 5}, + 0.0, + {-1, -1, 1, 0, -1, -1}, + }, + { /* for epsilon > 0, vertices must be less than (but NOT equal to) epsilon distance away */ + 6, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 0.0, 0.25}, {1.0, 1.0, 0.25}, {0.0, 1.0, 0.25}}, + 2, {0, 1, 2, 3, 4, 5}, + 0.25, + {-1, -1, -1, -1, -1, -1}, + }, + { /* for epsilon > 0, vertices must be less than (but NOT equal to) epsilon distance away */ + 6, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 0.0, 0.25}, {1.0, 1.0, 0.25}, {0.0, 1.0, 0.25}}, + 2, {0, 1, 2, 3, 4, 5}, + 0.250001, + {-1, -1, 1, 0, -1, -1}, + }, + { /* length between vertices are compared to epsilon, not the individual dimension deltas */ + 6, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 0.25, 0.25}, {1.0, 1.25, 0.25}, {0.0, 1.25, 0.25}}, + 2, {0, 1, 2, 3, 4, 5}, + 0.353, /* < sqrt(0.25*0.25 + 0.25*0.25) */ + {-1, -1, -1, -1, -1, -1}, + }, + { + 6, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 0.25, 0.25}, {1.0, 1.25, 0.25}, {0.0, 1.25, 0.25}}, + 2, {0, 1, 2, 3, 4, 5}, + 0.354, /* > sqrt(0.25*0.25 + 0.25*0.25) */ + {-1, -1, 1, 0, -1, -1}, + }, + { /* adjacent faces must have opposite winding orders at the shared edge */ + 4, {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, + 2, {0, 1, 2, 0, 3, 2}, + 0.0, + {-1, -1, -1, -1, -1, -1}, + }, + }; + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + for (i = 0; i < ARRAY_SIZE(test_data); i++) + { + DWORD adjacency[ARRAY_SIZE(test_data[0].adjacency)]; + int j; + + if (d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + d3dxmesh = NULL; + + hr = D3DXCreateMeshFVF(test_data[i].num_faces, test_data[i].num_vertices, 0, D3DFVF_XYZ, device, &d3dxmesh); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, D3DLOCK_DISCARD, (void**)&vertices); + ok(hr == D3D_OK, "test %d: Got result %x, expected %x (D3D_OK)\n", i, hr, D3D_OK); + if (FAILED(hr)) continue; + CopyMemory(vertices, test_data[i].vertices, test_data[i].num_vertices * sizeof(test_data[0].vertices[0])); + d3dxmesh->lpVtbl->UnlockVertexBuffer(d3dxmesh); + + hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, D3DLOCK_DISCARD, (void**)&indices); + ok(hr == D3D_OK, "test %d: Got result %x, expected %x (D3D_OK)\n", i, hr, D3D_OK); + if (FAILED(hr)) continue; + CopyMemory(indices, test_data[i].indices, test_data[i].num_faces * 3 * sizeof(test_data[0].indices[0])); + d3dxmesh->lpVtbl->UnlockIndexBuffer(d3dxmesh); + + if (i == 0) { + hr = d3dxmesh->lpVtbl->GenerateAdjacency(d3dxmesh, 0.0f, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + } + + hr = d3dxmesh->lpVtbl->GenerateAdjacency(d3dxmesh, test_data[i].epsilon, adjacency); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + if (FAILED(hr)) continue; + + for (j = 0; j < test_data[i].num_faces * 3; j++) + ok(adjacency[j] == test_data[i].adjacency[j], + "Test %d adjacency %d: Got result %u, expected %u\n", i, j, + adjacency[j], test_data[i].adjacency[j]); + } + if (d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -3171,4 +3308,5 @@ START_TEST(mesh) test_get_decl_length(); test_get_decl_vertex_size(); test_fvf_decl_conversion(); + D3DXGenerateAdjacencyTest(); }

1 0

Matteo Bruni : d3dx9: Remove some redundant and compiler-unfriendly pixel format checking code.
by Alexandre Julliard 26 Apr '11

26 Apr '11

Module: wine Branch: master Commit: e1ac6078b53385cfa68960cf24a7c0d35cb7652a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ac6078b53385cfa68960cf2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 5 17:26:57 2011 +0200 d3dx9: Remove some redundant and compiler-unfriendly pixel format checking code. Spotted by Gerald Pfeifer and Nicolas Le Cam. --- dlls/d3dx9_36/surface.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1bc2d54..77cad08 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -702,13 +702,11 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, for(x = 0;x < minwidth;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) { - pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); - get_relevant_argb_components(&conv_info, pixel, channels); - } + pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); + get_relevant_argb_components(&conv_info, pixel, channels); /* recombine the components */ - if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels); + val = make_argb_color(&conv_info, channels); if(colorkey) { get_relevant_argb_components(&ck_conv_info, pixel, channels); @@ -769,13 +767,11 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsi DWORD val = 0; /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) { - pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); - get_relevant_argb_components(&conv_info, pixel, channels); - } + pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); + get_relevant_argb_components(&conv_info, pixel, channels); /* recombine the components */ - if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels); + val = make_argb_color(&conv_info, channels); if(colorkey) { get_relevant_argb_components(&ck_conv_info, pixel, channels);

1 0

Marcus Meissner : gphoto2.ds: Mark internal symbols as hidden.
by Alexandre Julliard 26 Apr '11

26 Apr '11

Module: wine Branch: master Commit: 0ecf958e72b9590404581454c9af85c8e4fe5fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecf958e72b9590404581454c… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 10:51:31 2011 +0200 gphoto2.ds: Mark internal symbols as hidden. --- dlls/gphoto2.ds/gphoto2_i.h | 54 +++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 517f794..02f5d11 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -59,7 +59,7 @@ #include "wine/list.h" -extern HINSTANCE GPHOTO2_instance; +extern HINSTANCE GPHOTO2_instance DECLSPEC_HIDDEN; struct gphoto2_file { struct list entry; @@ -104,58 +104,58 @@ struct tagActiveDS } activeDS; /* Helper functions */ -extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action); +extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; /* Implementation of operation triplets * From Application to Source (Image Information) */ TW_UINT16 GPHOTO2_CIEColorGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ExtImageInfoGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_GrayResponseReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_GrayResponseSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageFileXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageInfoGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageLayoutGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageLayoutGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageLayoutReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageLayoutSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageMemXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_ImageNativeXferGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_JPEGCompressionGet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_JPEGCompressionGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_JPEGCompressionReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_JPEGCompressionSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_Palette8Get - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_Palette8GetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_Palette8Reset - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_Palette8Set - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_RGBResponseReset - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; TW_UINT16 GPHOTO2_RGBResponseSet - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; /* UI function */ -BOOL DoCameraUI(void); -HWND TransferringDialogBox(HWND dialog, LONG progress); +BOOL DoCameraUI(void) DECLSPEC_HIDDEN; +HWND TransferringDialogBox(HWND dialog, LONG progress) DECLSPEC_HIDDEN; #ifdef HAVE_GPHOTO2 /* Helper function for GUI */ @@ -163,6 +163,6 @@ TW_UINT16 _get_gphoto2_file_as_DIB( const char *folder, const char *filename, CameraFileType type, HWND hwnd, HBITMAP *hDIB -); +) DECLSPEC_HIDDEN; #endif #endif

1 0