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

Andrew Nguyen : msxml3: Extend the lifetime of the SAX callback BSTRs beyond the callback invocation .
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 9c5d5d8ed5b95e60b61b8a31e85d5c5edee28c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5d5d8ed5b95e60b61b8a31e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 15 07:38:07 2011 -0500 msxml3: Extend the lifetime of the SAX callback BSTRs beyond the callback invocation. --- dlls/msxml3/saxreader.c | 135 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 106 insertions(+), 29 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4f0a5f1..5bf6eda 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,6 +49,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +struct bstrpool +{ + BSTR *pool; + unsigned int index; + unsigned int len; +}; + typedef struct _saxreader { IVBSAXXMLReader IVBSAXXMLReader_iface; @@ -64,6 +71,7 @@ typedef struct _saxreader struct IVBSAXDeclHandler *vbdeclHandler; xmlSAXHandler sax; BOOL isParsing; + struct bstrpool pool; } saxreader; typedef struct _saxlocator @@ -164,6 +172,45 @@ static int namespacePop(saxlocator *locator) return locator->nsStack[--locator->nsStackLast]; } +static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) +{ + if (!pool->pool) + { + pool->pool = HeapAlloc(GetProcessHeap(), 0, 16 * sizeof(*pool->pool)); + if (!pool->pool) + return FALSE; + + pool->index = 0; + pool->len = 16; + } + else if (pool->index == pool->len) + { + BSTR *realloc = HeapReAlloc(GetProcessHeap(), 0, pool->pool, pool->len * 2 * sizeof(*realloc)); + + if (!realloc) + return FALSE; + + pool->pool = realloc; + pool->len *= 2; + } + + pool->pool[pool->index++] = pool_entry; + return TRUE; +} + +static void free_bstr_pool(struct bstrpool *pool) +{ + unsigned int i; + + for (i = 0; i < pool->index; i++) + SysFreeString(pool->pool[i]); + + HeapFree(GetProcessHeap(), 0, pool->pool); + + pool->pool = NULL; + pool->index = pool->len = 0; +} + static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) { DWORD dLen; @@ -200,6 +247,45 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) return bstr; } +static BSTR pooled_bstr_from_xmlChar(struct bstrpool *pool, const xmlChar *buf) +{ + BSTR pool_entry = bstr_from_xmlChar(buf); + + if (pool_entry && !bstr_pool_insert(pool, pool_entry)) + { + SysFreeString(pool_entry); + return NULL; + } + + return pool_entry; +} + +static BSTR pooled_bstr_from_xmlCharN(struct bstrpool *pool, const xmlChar *buf, int len) +{ + BSTR pool_entry = bstr_from_xmlCharN(buf, len); + + if (pool_entry && !bstr_pool_insert(pool, pool_entry)) + { + SysFreeString(pool_entry); + return NULL; + } + + return pool_entry; +} + +static BSTR pooled_QName_from_xmlChar(struct bstrpool *pool, const xmlChar *prefix, const xmlChar *name) +{ + BSTR pool_entry = QName_from_xmlChar(prefix, name); + + if (pool_entry && !bstr_pool_insert(pool, pool_entry)) + { + SysFreeString(pool_entry); + return NULL; + } + + return pool_entry; +} + static void format_error_message_from_id(saxlocator *This, HRESULT hr) { xmlStopParser(This->pParserCtxt); @@ -1021,8 +1107,8 @@ static void libxmlStartElementNS( { for(index=0; index<nb_namespaces; index++) { - Prefix = bstr_from_xmlChar(namespaces[2*index]); - Uri = bstr_from_xmlChar(namespaces[2*index+1]); + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, namespaces[2*index]); + Uri = pooled_bstr_from_xmlChar(&This->saxreader->pool, namespaces[2*index+1]); if(This->vbInterface) hr = IVBSAXContentHandler_startPrefixMapping( @@ -1034,9 +1120,6 @@ static void libxmlStartElementNS( Prefix, SysStringLen(Prefix), Uri, SysStringLen(Uri)); - SysFreeString(Prefix); - SysFreeString(Uri); - if(hr != S_OK) { format_error_message_from_id(This, hr); @@ -1044,9 +1127,9 @@ static void libxmlStartElementNS( } } - NamespaceUri = bstr_from_xmlChar(URI); - LocalName = bstr_from_xmlChar(localname); - QName = QName_from_xmlChar(prefix, localname); + NamespaceUri = pooled_bstr_from_xmlChar(&This->saxreader->pool, URI); + LocalName = pooled_bstr_from_xmlChar(&This->saxreader->pool, localname); + QName = pooled_QName_from_xmlChar(&This->saxreader->pool, prefix, localname); hr = SAXAttributes_create(&attr, nb_namespaces, namespaces, nb_attributes, attributes); if(hr == S_OK) @@ -1061,10 +1144,6 @@ static void libxmlStartElementNS( ISAXAttributes_Release(&attr->ISAXAttributes_iface); } - - SysFreeString(NamespaceUri); - SysFreeString(LocalName); - SysFreeString(QName); } if(hr != S_OK) @@ -1094,9 +1173,9 @@ static void libxmlEndElementNS( if(has_content_handler(This)) { - NamespaceUri = bstr_from_xmlChar(URI); - LocalName = bstr_from_xmlChar(localname); - QName = QName_from_xmlChar(prefix, localname); + NamespaceUri = pooled_bstr_from_xmlChar(&This->saxreader->pool, URI); + LocalName = pooled_bstr_from_xmlChar(&This->saxreader->pool, localname); + QName = pooled_QName_from_xmlChar(&This->saxreader->pool, prefix, localname); if(This->vbInterface) hr = IVBSAXContentHandler_endElement( @@ -1109,10 +1188,6 @@ static void libxmlEndElementNS( LocalName, SysStringLen(LocalName), QName, SysStringLen(QName)); - SysFreeString(NamespaceUri); - SysFreeString(LocalName); - SysFreeString(QName); - if(hr != S_OK) { format_error_message_from_id(This, hr); @@ -1122,7 +1197,7 @@ static void libxmlEndElementNS( for(index=This->pParserCtxt->nsNr-2; index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) { - Prefix = bstr_from_xmlChar(This->pParserCtxt->nsTab[index]); + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); if(This->vbInterface) hr = IVBSAXContentHandler_endPrefixMapping( @@ -1132,8 +1207,6 @@ static void libxmlEndElementNS( This->saxreader->contentHandler, Prefix, SysStringLen(Prefix)); - SysFreeString(Prefix); - if(hr != S_OK) { format_error_message_from_id(This, hr); @@ -1178,7 +1251,7 @@ static void libxmlCharacters( if(!lastEvent) *end = '\n'; - Chars = bstr_from_xmlCharN(cur, end-cur+1); + Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur+1); if(This->vbInterface) hr = IVBSAXContentHandler_characters( This->saxreader->vbcontentHandler, &Chars); @@ -1186,7 +1259,6 @@ static void libxmlCharacters( hr = ISAXContentHandler_characters( This->saxreader->contentHandler, Chars, SysStringLen(Chars)); - SysFreeString(Chars); if(hr != S_OK) { @@ -1251,7 +1323,7 @@ static void libxmlComment(void *ctx, const xmlChar *value) if(!This->vbInterface && !This->saxreader->lexicalHandler) return; if(This->vbInterface && !This->saxreader->vblexicalHandler) return; - bValue = bstr_from_xmlChar(value); + bValue = pooled_bstr_from_xmlChar(&This->saxreader->pool, value); if(This->vbInterface) hr = IVBSAXLexicalHandler_comment( @@ -1261,8 +1333,6 @@ static void libxmlComment(void *ctx, const xmlChar *value) This->saxreader->lexicalHandler, bValue, SysStringLen(bValue)); - SysFreeString(bValue); - if(FAILED(hr)) format_error_message_from_id(This, hr); @@ -1363,7 +1433,7 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) if(has_content_handler(This)) { - Chars = bstr_from_xmlCharN(cur, end-cur+1); + Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur+1); if(This->vbInterface) hr = IVBSAXContentHandler_characters( This->saxreader->vbcontentHandler, &Chars); @@ -1371,7 +1441,6 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) hr = ISAXContentHandler_characters( This->saxreader->contentHandler, Chars, SysStringLen(Chars)); - SysFreeString(Chars); } if(change) *end = '\r'; @@ -1998,6 +2067,9 @@ static HRESULT internal_parse( TRACE("(%p)->(%s)\n", This, debugstr_variant(&varInput)); + /* Dispose of the BSTRs in the pool from a prior run, if any. */ + free_bstr_pool(&This->pool); + switch(V_VT(&varInput)) { case VT_BSTR: @@ -2320,6 +2392,8 @@ static ULONG WINAPI saxxmlreader_Release( if(This->vbdeclHandler) IVBSAXDeclHandler_Release(This->vbdeclHandler); + free_bstr_pool(&This->pool); + heap_free( This ); } @@ -2817,6 +2891,9 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->declHandler = NULL; reader->vbdeclHandler = NULL; reader->isParsing = FALSE; + reader->pool.pool = NULL; + reader->pool.index = 0; + reader->pool.len = 0; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC;

1 0

Andrew Nguyen : msxml3/tests: Fix two minor leaks in test_mxwriter_properties().
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 2ed7a025f6dc908fd794fb7b894d7a74832be93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed7a025f6dc908fd794fb7b8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 15 07:38:20 2011 -0500 msxml3/tests: Fix two minor leaks in test_mxwriter_properties(). --- dlls/msxml3/tests/saxreader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ec1c1ec..14c5e5a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1012,6 +1012,7 @@ static void test_mxwriter_properties(void) hr = IMXWriter_get_encoding(writer, &str); ok(hr == S_OK, "got %08x\n", hr); ok(lstrcmpW(str, utf16W) == 0, "expected empty string, got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); /* invalid encoding name */ str = SysAllocString(testW); @@ -1025,6 +1026,7 @@ static void test_mxwriter_properties(void) hr = IMXWriter_get_version(writer, &str); ok(hr == S_OK, "got %08x\n", hr); ok(!lstrcmpW(str, _bstr_("1.0")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); IMXWriter_Release(writer); free_bstrs();

1 0

Huw Davies : gdi32: Zero-pad the end of the scanlines.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 9b56cec9c5cbf31b3dda770c09a4e3363906f2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b56cec9c5cbf31b3dda770c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 15 14:19:09 2011 +0100 gdi32: Zero-pad the end of the scanlines. --- dlls/gdi32/dibdrv/primitives.c | 164 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 156 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b56cec9c5cbf31b3dda7…

1 0

Huw Davies : gdi32: Move the query info code to a separate function.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: ff17abc695c66dc4f6b20fd9a9df2470ec7f0978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff17abc695c66dc4f6b20fd9a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 15 14:19:10 2011 +0100 gdi32: Move the query info code to a separate function. --- dlls/gdi32/dib.c | 100 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 52 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index cebe474..ed68a90 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -444,6 +444,57 @@ static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; static const DWORD bit_fields_565[3] = {0xf800, 0x07e0, 0x001f}; static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; +static int fill_query_info( BITMAPINFO *info, BITMAPOBJ *bmp ) +{ + BITMAPINFOHEADER header; + + header.biSize = info->bmiHeader.biSize; /* Ensure we don't overwrite the original size when we copy back */ + header.biWidth = bmp->bitmap.bmWidth; + header.biHeight = bmp->bitmap.bmHeight; + header.biPlanes = 1; + + if (bmp->dib) + { + header.biBitCount = bmp->dib->dsBm.bmBitsPixel; + switch (bmp->dib->dsBm.bmBitsPixel) + { + case 16: + case 32: + header.biCompression = BI_BITFIELDS; + break; + default: + header.biCompression = BI_RGB; + break; + } + } + else + { + header.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; + header.biBitCount = bmp->bitmap.bmBitsPixel; + } + + header.biSizeImage = DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, + bmp->bitmap.bmHeight, + bmp->bitmap.bmBitsPixel ); + header.biXPelsPerMeter = 0; + header.biYPelsPerMeter = 0; + header.biClrUsed = 0; + header.biClrImportant = 0; + + if ( info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER) ) + { + BITMAPCOREHEADER *coreheader = (BITMAPCOREHEADER *)info; + + coreheader->bcWidth = header.biWidth; + coreheader->bcHeight = header.biHeight; + coreheader->bcPlanes = header.biPlanes; + coreheader->bcBitCount = header.biBitCount; + } + else + info->bmiHeader = header; + + return abs(bmp->bitmap.bmHeight); +} /************************************************************************ * copy_color_info @@ -519,7 +570,6 @@ INT WINAPI GetDIBits( BITMAPOBJ * bmp; int i; int bitmap_type; - BOOL core_header; LONG width; LONG height; WORD planes, bpp; @@ -535,7 +585,6 @@ INT WINAPI GetDIBits( ERR("Invalid bitmap format\n"); return 0; } - core_header = (bitmap_type == 0); if (!(dc = get_dc_ptr( hdc ))) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -551,55 +600,10 @@ INT WINAPI GetDIBits( if (bpp == 0) /* query bitmap info only */ { - if (core_header) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) info; - coreheader->bcWidth = bmp->bitmap.bmWidth; - coreheader->bcHeight = bmp->bitmap.bmHeight; - coreheader->bcPlanes = 1; - coreheader->bcBitCount = bmp->bitmap.bmBitsPixel; - } - else - { - info->bmiHeader.biWidth = bmp->bitmap.bmWidth; - info->bmiHeader.biHeight = bmp->bitmap.bmHeight; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biSizeImage = - DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, - bmp->bitmap.bmHeight, - bmp->bitmap.bmBitsPixel ); - if (bmp->dib) - { - info->bmiHeader.biBitCount = bmp->dib->dsBm.bmBitsPixel; - switch (bmp->dib->dsBm.bmBitsPixel) - { - case 16: - case 32: - info->bmiHeader.biCompression = BI_BITFIELDS; - break; - default: - info->bmiHeader.biCompression = BI_RGB; - break; - } - } - else - { - info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - } - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biClrImportant = 0; - - /* Windows 2000 doesn't touch the additional struct members if - it's a BITMAPV4HEADER or a BITMAPV5HEADER */ - } - lines = abs(bmp->bitmap.bmHeight); + lines = fill_query_info( info, bmp ); goto done; } - /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our own copy and transfer the colour info back at the end */

1 0

Michael Mc Donnell : d3dx9: Implemented ConvertAdjacencyToPointReps mesh method.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: ea5ed35edfa56d1259edebe9a74af00b29906789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5ed35edfa56d1259edebe9a… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Tue Jun 7 22:37:42 2011 +0200 d3dx9: Implemented ConvertAdjacencyToPointReps mesh method. --- dlls/d3dx9_36/mesh.c | 161 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 18 +++--- 2 files changed, 168 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index dfe6a35..717c356 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -441,13 +441,170 @@ static HRESULT WINAPI ID3DXMeshImpl_ConvertPointRepsToAdjacency(ID3DXMesh *iface return E_NOTIMPL; } +/* ConvertAdjacencyToPointReps helper function. + * + * Goes around the edges of each face and replaces the vertices in any adjacent + * face's edge with its own vertices(if its vertices have a lower index). This + * way as few as possible low index vertices are shared among the faces. The + * re-ordered index buffer is stored in new_indices. + * + * The vertices in a point representation must be ordered sequentially, e.g. + * index 5 holds the index of the vertex that replaces vertex 5, i.e. if + * vertex 5 is replaced by vertex 3 then index 5 would contain 3. If no vertex + * replaces it, then it contains the same number as the index itself, e.g. + * index 5 would contain 5. */ +static HRESULT propagate_face_vertices(CONST DWORD *adjacency, DWORD *point_reps, + CONST DWORD *indices, DWORD *new_indices, + CONST DWORD face, CONST DWORD numfaces) +{ + const unsigned int VERTS_PER_FACE = 3; + DWORD edge, opp_edge; + DWORD face_base = VERTS_PER_FACE * face; + + for (edge = 0; edge < VERTS_PER_FACE; edge++) + { + DWORD adj_face = adjacency[face_base + edge]; + DWORD adj_face_base; + DWORD i,j; + if (adj_face == -1) /* No adjacent face. */ + continue; + else if (adj_face >= numfaces) + { + /* This throws exception on Windows */ + WARN("Index out of bounds. Got %d expected less than %d.\n", + adj_face, numfaces); + return D3DERR_INVALIDCALL; + } + adj_face_base = 3 * adj_face; + + /* Find opposite edge in adjacent face. */ + for (opp_edge = 0; opp_edge < VERTS_PER_FACE; opp_edge++) + { + DWORD opp_edge_index = adj_face_base + opp_edge; + if (adjacency[opp_edge_index] == face) + break; /* Found opposite edge. */ + } + + /* Replaces vertices in opposite edge with vertices from current edge. */ + for (i = 0, j = 1; i < 2 && (j+1) > 0; i++, j--) + { + DWORD from = face_base + (edge + j) % VERTS_PER_FACE; + DWORD to = adj_face_base + (opp_edge + i) % VERTS_PER_FACE; + + /* Propagate lowest index. */ + if (new_indices[to] > new_indices[from]) + { + new_indices[to] = new_indices[from]; + point_reps[indices[to]] = new_indices[from]; + } + } + } + + return D3D_OK; +} + static HRESULT WINAPI ID3DXMeshImpl_ConvertAdjacencyToPointReps(ID3DXMesh *iface, CONST DWORD *adjacency, DWORD *point_reps) { + HRESULT hr; + DWORD face; + DWORD i; + DWORD *indices = NULL; + WORD *indices_16bit = NULL; + DWORD *new_indices = NULL; + const unsigned int VERTS_PER_FACE = 3; + ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); - FIXME("(%p)->(%p,%p): stub\n", This, adjacency, point_reps); + TRACE("(%p)->(%p,%p)\n", This, adjacency, point_reps); - return E_NOTIMPL; + if (!adjacency) + { + WARN("NULL adjacency.\n"); + hr = D3DERR_INVALIDCALL; + goto cleanup; + } + + if (!point_reps) + { + WARN("NULL point_reps.\n"); + hr = D3DERR_INVALIDCALL; + goto cleanup; + } + + /* Should never happen as CreateMesh does not allow meshes with 0 faces */ + if (This->numfaces == 0) + { + ERR("Number of faces was zero."); + hr = D3DERR_INVALIDCALL; + goto cleanup; + } + + new_indices = HeapAlloc(GetProcessHeap(), 0, VERTS_PER_FACE * This->numfaces * sizeof(*indices)); + if (!new_indices) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + if (This->options & D3DXMESH_32BIT) + { + hr = iface->lpVtbl->LockIndexBuffer(iface, D3DLOCK_READONLY, (void**)&indices); + if (FAILED(hr)) goto cleanup; + memcpy(new_indices, indices, VERTS_PER_FACE * This->numfaces * sizeof(*indices)); + } + else + { + /* Make a widening copy of indices_16bit into indices and new_indices + * in order to re-use the helper function */ + hr = iface->lpVtbl->LockIndexBuffer(iface, D3DLOCK_READONLY, (void**)&indices_16bit); + if (FAILED(hr)) goto cleanup; + indices = HeapAlloc(GetProcessHeap(), 0, VERTS_PER_FACE * This->numfaces * sizeof(*indices)); + if (!indices) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + for (i = 0; i < VERTS_PER_FACE * This->numfaces; i++) + { + new_indices[i] = indices_16bit[i]; + indices[i] = indices_16bit[i]; + } + } + + /* Vertices are ordered sequentially in the point representation. */ + for (i = 0; i < This->numvertices; i++) + { + point_reps[i] = i; + } + + /* Propagate vertices with low indices so as few vertices as possible + * are used in the mesh. + */ + for (face = 0; face < This->numfaces; face++) + { + hr = propagate_face_vertices(adjacency, point_reps, indices, new_indices, face, This->numfaces); + if (FAILED(hr)) goto cleanup; + } + /* Go in opposite direction to catch all face orderings */ + for (face = This->numfaces - 1; face + 1 > 0; face--) + { + hr = propagate_face_vertices(adjacency, point_reps, indices, new_indices, face, This->numfaces); + if (FAILED(hr)) goto cleanup; + } + + hr = D3D_OK; +cleanup: + if (This->options & D3DXMESH_32BIT) + { + if (indices) iface->lpVtbl->UnlockIndexBuffer(iface); + } + else + { + if (indices_16bit) iface->lpVtbl->UnlockIndexBuffer(iface); + HeapFree(GetProcessHeap(), 0, indices); + } + HeapFree(GetProcessHeap(), 0, new_indices); + return hr; } struct vertex_metadata { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index b3aed39..6522ff1 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -5386,16 +5386,16 @@ static void test_convert_adjacency_to_point_reps(void) /* Convert adjacency to point representation */ memset(point_reps, -1, tc[i].num_vertices * sizeof(*point_reps)); hr = mesh->lpVtbl->ConvertAdjacencyToPointReps(mesh, tc[i].adjacency, point_reps); - todo_wine ok(hr == D3D_OK, "ConvertAdjacencyToPointReps failed case %d. " + ok(hr == D3D_OK, "ConvertAdjacencyToPointReps failed case %d. " "Got %x expected D3D_OK\n", i, hr); /* Check point representation */ for (j = 0; j < tc[i].num_vertices; j++) { - todo_wine ok(point_reps[j] == tc[i].exp_point_reps[j], - "Unexpected point representation at (%d, %d)." - " Got %d expected %d\n", - i, j, point_reps[j], tc[i].exp_point_reps[j]); + ok(point_reps[j] == tc[i].exp_point_reps[j], + "Unexpected point representation at (%d, %d)." + " Got %d expected %d\n", + i, j, point_reps[j], tc[i].exp_point_reps[j]); } HeapFree(GetProcessHeap(), 0, point_reps); @@ -5406,11 +5406,11 @@ static void test_convert_adjacency_to_point_reps(void) /* NULL checks */ hr = mesh_null_check->lpVtbl->ConvertAdjacencyToPointReps(mesh_null_check, tc[0].adjacency, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ConvertAdjacencyToPointReps point_reps NULL. " - "Got %x expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "ConvertAdjacencyToPointReps point_reps NULL. " + "Got %x expected D3DERR_INVALIDCALL\n", hr); hr = mesh_null_check->lpVtbl->ConvertAdjacencyToPointReps(mesh_null_check, NULL, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ConvertAdjacencyToPointReps adjacency and point_reps NULL. " - "Got %x expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "ConvertAdjacencyToPointReps adjacency and point_reps NULL. " + "Got %x expected D3DERR_INVALIDCALL\n", hr); cleanup: if (mesh_null_check)

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 5846ba142bd40abf52da23571c7165c3362e8e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5846ba142bd40abf52da23571… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jul 15 11:28:03 2011 +0900 po: Updated Korean translation. --- po/ko.po | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/po/ko.po b/po/ko.po index 72fa63e..bef4078 100644 --- a/po/ko.po +++ b/po/ko.po @@ -168,10 +168,9 @@ msgid "System Path" msgstr "시스템 경로" #: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103 -#, fuzzy msgctxt "display name" msgid "Desktop" -msgstr "데스크탑" +msgstr "바탕화면" #: comdlg32.rc:35 winhlp32.rc:46 winhlp32.rc:67 msgid "Fonts" @@ -6358,10 +6357,9 @@ msgid "Properties" msgstr "속성" #: shell32.rc:82 -#, fuzzy msgctxt "recycle bin" msgid "&Restore" -msgstr "복구(&R)" +msgstr "복원(&R)" #: shell32.rc:83 msgid "&Erase" @@ -6493,10 +6491,9 @@ msgid "My Videos" msgstr "내 비디오" #: shell32.rc:207 -#, fuzzy msgctxt "directory" msgid "Desktop" -msgstr "데스크탑" +msgstr "바탕화면" #: shell32.rc:208 msgid "NetHood" @@ -6592,7 +6589,7 @@ msgstr "Music\\Playlists" #: shell32.rc:231 shell32.rc:244 msgid "Downloads" -msgstr "Downloads" +msgstr "다운로드" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -6600,7 +6597,7 @@ msgstr "상태" #: shell32.rc:149 msgid "Location" -msgstr "랜 연결" +msgstr "위치" #: shell32.rc:150 msgid "Model" @@ -6840,10 +6837,9 @@ msgid " sec" msgstr "초" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 -#, fuzzy msgctxt "window" msgid "&Restore" -msgstr "복구(&R)" +msgstr "복원(&R)" #: user32.rc:28 user32.rc:41 msgid "&Move"

1 0

Lucas Fialho Zawacki : dinput/tests: Tests for EnumObjects with different types of device objects.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: d1a6d70e89275bfba436a99662ea078f0bcfc929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a6d70e89275bfba436a9966… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 14 16:24:17 2011 -0300 dinput/tests: Tests for EnumObjects with different types of device objects. --- dlls/dinput/tests/device.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index ea25482..e79c564 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -64,11 +64,20 @@ static BOOL CALLBACK enum_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info) return DIENUM_CONTINUE; } +static BOOL CALLBACK enum_type_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info) +{ + DWORD expected = *(DWORD*)info; + ok (expected & DIDFT_GETTYPE(oi->dwType), "EnumObjects() enumerated wrong type for obj %s, expected: %08x got: %08x\n", oi->tszName, expected, oi->dwType); + return DIENUM_CONTINUE; +} + static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) { HRESULT hr; DIPROPDWORD dp; DIDEVICEOBJECTINSTANCE obj_info; + DWORD obj_types[] = {DIDFT_BUTTON, DIDFT_AXIS, DIDFT_POV}; + int type_index; int cnt = 0, cnt1 = 0; hr = IDirectInputDevice_EnumObjects(device, enum_callback, &cnt, DIDFT_ALL); @@ -82,6 +91,13 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) if (0) /* fails for joystick only */ ok(cnt == cnt1, "Enum count changed from %d to %d\n", cnt, cnt1); + /* Testing EnumObjects with different types of device objects */ + for (type_index=0; type_index < sizeof(obj_types)/sizeof(obj_types[0]); type_index++) + { + hr = IDirectInputDevice_EnumObjects(device, enum_type_callback, &obj_types[type_index], obj_types[type_index]); + ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); + } + /* No need to test devices without axis */ obj_info.dwSize = sizeof(obj_info); hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET);

1 0

Lucas Fialho Zawacki : dinput: Using DIDFT_GETTYPE in EnumObjects instead of DIEFT_GETTYPE.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: efdad2c1ce14b5b68a8a61a71832595a1fc6702f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdad2c1ce14b5b68a8a61a71… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Jul 14 16:25:03 2011 -0300 dinput: Using DIDFT_GETTYPE in EnumObjects instead of DIEFT_GETTYPE. --- dlls/dinput/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 5d81227..22632ea 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -888,7 +888,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, { LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); - if (dwFlags != DIDFT_ALL && !(dwFlags & DIEFT_GETTYPE(odf->dwType))) continue; + if (dwFlags != DIDFT_ALL && !(dwFlags & DIDFT_GETTYPE(odf->dwType))) continue; if (IDirectInputDevice_GetObjectInfo(iface, &ddoi, odf->dwType, DIPH_BYID) != DI_OK) continue; @@ -918,7 +918,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, { LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); - if (dwFlags != DIDFT_ALL && !(dwFlags & DIEFT_GETTYPE(odf->dwType))) continue; + if (dwFlags != DIDFT_ALL && !(dwFlags & DIDFT_GETTYPE(odf->dwType))) continue; if (IDirectInputDevice_GetObjectInfo(iface, &ddoi, odf->dwType, DIPH_BYID) != DI_OK) continue;

1 0

Michael Mc Donnell : d3dx9/tests: Implemented ConvertAdjacencyToPointReps test.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 7a1b18a742cd9058db03b01d3c8b341ae4777e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1b18a742cd9058db03b01d3… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri May 27 16:24:18 2011 +0200 d3dx9/tests: Implemented ConvertAdjacencyToPointReps test. --- dlls/d3dx9_36/tests/mesh.c | 516 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 516 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a1b18a742cd9058db03b…

1 0

Jacek Caban : dxgi.idl: Added IDXGIResource, IDXGIAdapter1 and IDXGIFactory1 declarations.
by Alexandre Julliard 15 Jul '11

15 Jul '11

Module: wine Branch: master Commit: 58bcc0ae440fe451db77dffce68a4aff7f8019c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bcc0ae440fe451db77dffce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 15 12:07:53 2011 +0200 dxgi.idl: Added IDXGIResource, IDXGIAdapter1 and IDXGIFactory1 declarations. --- include/dxgi.idl | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 0559769..e74b525 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -178,6 +178,20 @@ interface IDXGIDeviceSubObject : IDXGIObject [ object, + uuid(035f3ab4-482e-4e50-b41f-8a7f8bd8960b), + local, + pointer_default(unique) +] +interface IDXGIResource : IDXGIDeviceSubObject +{ + HRESULT GetSharedHandle([out] HANDLE *pSharedHandle); + HRESULT GetUsage([out] DXGI_USAGE *pUsage); + HRESULT SetEvictionPriority([in] UINT EvictionPriority); + HRESULT GetEvictionPriority([out, retval] UINT *pEvictionPriority); +} + +[ + object, local, uuid(cafcb56c-6ac3-4889-bf47-9e23bbd260ec) ] @@ -376,3 +390,45 @@ interface IDXGIDevice : IDXGIObject [out] INT *priority ); } + +typedef enum DXGI_ADAPTER_FLAG { + DXGI_ADAPTER_FLAG_NONE = 0, + DXGI_ADAPTER_FLAG_REMOTE = 1, + DXGI_ADAPTER_FLAG_FORCE_DWORD = 0xFFFFFFFF +} DXGI_ADAPTER_FLAG; + +typedef struct DXGI_ADAPTER_DESC1 { + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; + UINT Flags; +} DXGI_ADAPTER_DESC1; + +[ + object, + uuid(29038f61-3839-4626-91fd-086879011a05), + local, + pointer_default(unique) +] +interface IDXGIAdapter1 : IDXGIAdapter +{ + HRESULT GetDesc1([out] DXGI_ADAPTER_DESC1 *pDesc); +} + +[ + object, + uuid(770aae78-f26f-4dba-a829-253c83d1b387), + local, + pointer_default(unique) + ] +interface IDXGIFactory1 : IDXGIFactory +{ + HRESULT EnumAdapters1([in] UINT Adapter, [out] IDXGIAdapter1 **ppAdapter); + BOOL IsCurrent(); +}

1 0