wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Henri Verbeet : wined3d: Only invalidate the INDRAWABLE location for onscreen surfaces in surface_realize_palette ().
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: d9ace3c9f72512046dc7d1a01a75ce97aefdb69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ace3c9f72512046dc7d1a01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:16 2011 +0200 wined3d: Only invalidate the INDRAWABLE location for onscreen surfaces in surface_realize_palette(). For offscreen surfaces this might actually remove the texture we just loaded. --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d03a72..143333d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -611,7 +611,8 @@ static void surface_realize_palette(IWineD3DSurfaceImpl *surface) surface_load_location(surface, SFLAG_INTEXTURE, NULL); /* We want to force a palette refresh, so mark the drawable as not being up to date */ - surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); + if (!surface_is_offscreen(surface)) + surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); } else {

1 0

Henri Verbeet : wined3d: Rename "pCaps" to "caps".
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: a05841bd1a8abacdff80e8ae6cebfa7caa9c1ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05841bd1a8abacdff80e8ae6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:15 2011 +0200 wined3d: Rename "pCaps" to "caps". --- dlls/wined3d/arb_program_shader.c | 32 ++++++++-------- dlls/wined3d/glsl_shader.c | 22 ++++++------ dlls/wined3d/nvidia_texture_shader.c | 63 ++++++++++++++++----------------- dlls/wined3d/state.c | 50 +++++++++++++------------- 4 files changed, 83 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a05841bd1a8abacdff80e…

1 0

Marcus Meissner : sane.ds: Mark internal functions as hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: a247c7fd496302e10faff8f5b90feb7f71bdfed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a247c7fd496302e10faff8f5b… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 19:11:44 2011 +0200 sane.ds: Mark internal functions as hidden. --- dlls/sane.ds/sane_i.h | 158 ++++++++++++++++++++++++------------------------ 1 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a247c7fd496302e10faff…

1 0

Marcus Meissner : twain_32: Mark some functions static and other internal ones hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 2c1d581cedb655f372ca4dc3e951c6adfb505746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1d581cedb655f372ca4dc3e… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 11:10:28 2011 +0200 twain_32: Mark some functions static and other internal ones hidden. --- dlls/twain_32/dsm_ctrl.c | 4 ++++ dlls/twain_32/twain_i.h | 27 ++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index c34bd1d..b50dbc5 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -35,6 +35,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */ +static TW_UINT32 DSM_sourceId; /* source id generator */ +static TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */ + struct all_devices { char *modname; TW_IDENTITY identity; diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index ff777b6..ffe6bd9 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -39,32 +39,29 @@ typedef struct tagActiveDS DSENTRYPROC dsEntry; } activeDS; -TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */ -TW_UINT16 DSM_currentState; /* current state of Source Manager */ -TW_UINT16 DSM_twCC; /* current condition code of Source Manager */ -TW_UINT32 DSM_sourceId; /* source id generator */ -TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */ +TW_UINT16 DSM_currentState DECLSPEC_HIDDEN; /* current state of Source Manager */ +TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ -activeDS *activeSources; /* list of active data sources */ +activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_IdentityGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_IdentityGetFirst - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_IdentityGetNext - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_OpenDS - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_UserSelect - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_CloseDSM - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_OpenDSM - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_GetDSMStatus - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; #endif

1 0

André Hentschel : dbghelp: Implement sparc_map_dwarf_register.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: dae65898e2a339a3be6e877b9bf7e458ae387837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae65898e2a339a3be6e877b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 26 19:00:45 2011 +0200 dbghelp: Implement sparc_map_dwarf_register. --- dlls/dbghelp/cpu_sparc.c | 13 +++++++++++-- include/cvconst.h | 13 +++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c index 6a788b9..3309b76 100644 --- a/dlls/dbghelp/cpu_sparc.c +++ b/dlls/dbghelp/cpu_sparc.c @@ -54,8 +54,17 @@ static BOOL sparc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, C static unsigned sparc_map_dwarf_register(unsigned regno) { - FIXME("not done for Sparc\n"); - return 0; + if (regno <= 7) + return CV_SPARC_G0 + regno; + else if (regno >= 8 && regno <= 15) + return CV_SPARC_O0 + regno - 8; + else if (regno >= 16 && regno <= 23) + return CV_SPARC_L0 + regno - 16; + else if (regno >= 24 && regno <= 31) + return CV_SPARC_I0 + regno - 24; + + FIXME("Don't know how to map register %d\n", regno); + return CV_SPARC_NOREG; } static void* sparc_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) diff --git a/include/cvconst.h b/include/cvconst.h index d05c99b..00e64ae 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -530,6 +530,19 @@ enum CV_HREG_e CV_AMD64_R13 = 341, CV_AMD64_R14 = 342, CV_AMD64_R15 = 343, + + /* Wine extension */ + CV_SPARC_NOREG = CV_REG_NONE, + CV_SPARC_G0 = 10, /* includes g0 to g7 */ + CV_SPARC_O0 = 18, /* includes o0 to o7 */ + CV_SPARC_L0 = 26, /* includes l0 to l7 */ + CV_SPARC_I0 = 34, /* includes i0 to i7 */ + CV_SPARC_PSR = 42, + CV_SPARC_PC = 43, + CV_SPARC_NPC = 44, + CV_SPARC_Y = 45, + CV_SPARC_WIM = 46, + CV_SPARC_TBR = 47, }; typedef enum

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

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Apr '11

26 Apr '11

Module: wine Branch: master Commit: cff8753d26ac056bf2582dbe499bf39226154607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff8753d26ac056bf2582dbe4… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Apr 26 18:26:05 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 92a005c..bad9a0e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-14 18:18+0300\n" +"PO-Revision-Date: 2011-04-26 18:24+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -134,10 +134,9 @@ msgid "Separator" msgstr "Skirtukas" #: comctl32.rc:44 progman.rc:78 -#, fuzzy msgctxt "hotkey" msgid "None" -msgstr "Nėra" +msgstr "Joks" #: comctl32.rc:28 wordpad.rc:169 msgid "Close" @@ -1247,7 +1246,6 @@ msgid "Path Length Constraint=" msgstr "Kelio ilgio ribojimas=" #: crypt32.rc:198 -#, fuzzy msgctxt "path length" msgid "None" msgstr "Nėra" @@ -2048,7 +2046,6 @@ msgid "&Forward" msgstr "&Pirmyn" #: hhctrl.rc:73 -#, fuzzy msgctxt "table of contents" msgid "&Home" msgstr "Į p&radžią" @@ -2110,7 +2107,6 @@ msgid "Back" msgstr "Atgal" #: hhctrl.rc:44 -#, fuzzy msgctxt "table of contents" msgid "Home" msgstr "Į pradžią" @@ -6307,7 +6303,6 @@ msgid "&About Internet Explorer..." msgstr "&Apie interneto naršyklę..." #: shdocvw.rc:67 -#, fuzzy msgctxt "home page" msgid "Home" msgstr "Į pradžią" @@ -10375,7 +10370,6 @@ msgid "Hardware" msgstr "Aparatinis" #: winecfg.rc:76 -#, fuzzy msgctxt "vertex shader mode" msgid "None" msgstr "Nėra"

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

← Newer
1
...
9
10
11
12
13
14
15
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011