January 2013 - Wine-commits

Christian Costa : d3dx9_36: Implement partially ID3DXFileImpl_CreateEnumObject with stubbed ID3DXFileEnumObject interface .
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 5c5deb34c8b6b12c69a5c0fdf2139c177df6d417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5deb34c8b6b12c69a5c0fdf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 8 08:46:44 2013 +0100 d3dx9_36: Implement partially ID3DXFileImpl_CreateEnumObject with stubbed ID3DXFileEnumObject interface. --- dlls/d3dx9_36/xfile.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 125 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 6c9403e..aaf1391 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -50,12 +50,119 @@ typedef struct { IDirectXFile *dxfile; } ID3DXFileImpl; +typedef struct { + ID3DXFileEnumObject ID3DXFileEnumObject_iface; + LONG ref; +} ID3DXFileEnumObjectImpl; static inline ID3DXFileImpl* impl_from_ID3DXFile(ID3DXFile *iface) { return CONTAINING_RECORD(iface, ID3DXFileImpl, ID3DXFile_iface); } +static inline ID3DXFileEnumObjectImpl* impl_from_ID3DXFileEnumObject(ID3DXFileEnumObject *iface) +{ + return CONTAINING_RECORD(iface, ID3DXFileEnumObjectImpl, ID3DXFileEnumObject_iface); +} + + +/*** IUnknown methods ***/ + +static HRESULT WINAPI ID3DXFileEnumObjectImpl_QueryInterface(ID3DXFileEnumObject *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXFileEnumObject)) + { + iface->lpVtbl->AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); + *ret_iface = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXFileEnumObjectImpl_AddRef(ID3DXFileEnumObject *iface) +{ + ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ID3DXFileEnumObjectImpl_Release(ID3DXFileEnumObject *iface) +{ + ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref %u\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + + +/*** ID3DXFileEnumObject methods ***/ + +static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetFile(ID3DXFileEnumObject *iface, ID3DXFile **file) +{ + FIXME("(%p)->(%p): stub\n", iface, file); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChildren(ID3DXFileEnumObject *iface, SIZE_T *children) +{ + FIXME("(%p)->(%p): stub\n", iface, children); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChild(ID3DXFileEnumObject *iface, SIZE_T id, ID3DXFileData **object) +{ + FIXME("(%p)->(%lu, %p): stub\n", iface, id, object); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetDataObjectById(ID3DXFileEnumObject *iface, REFGUID guid, ID3DXFileData **object) +{ + FIXME("(%p)->(%s, %p): stub\n", iface, debugstr_guid(guid), object); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetDataObjectByName(ID3DXFileEnumObject *iface, const char *name, ID3DXFileData **object) +{ + FIXME("(%p)->(%s, %p): stub\n", iface, debugstr_a(name), object); + + return E_NOTIMPL; +} + + +static const ID3DXFileEnumObjectVtbl ID3DXFileEnumObject_Vtbl = +{ + ID3DXFileEnumObjectImpl_QueryInterface, + ID3DXFileEnumObjectImpl_AddRef, + ID3DXFileEnumObjectImpl_Release, + ID3DXFileEnumObjectImpl_GetFile, + ID3DXFileEnumObjectImpl_GetChildren, + ID3DXFileEnumObjectImpl_GetChild, + ID3DXFileEnumObjectImpl_GetDataObjectById, + ID3DXFileEnumObjectImpl_GetDataObjectByName +}; + /*** IUnknown methods ***/ @@ -109,9 +216,25 @@ static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const void *source, D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) { - FIXME("(%p)->(%p, %x, %p): stub\n", iface, source, options, enum_object); + ID3DXFileEnumObjectImpl *object; - return E_NOTIMPL; + FIXME("(%p)->(%p, %x, %p): partial stub\n", iface, source, options, enum_object); + + if (!enum_object) + return E_POINTER; + + *enum_object = NULL; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFileEnumObject_iface.lpVtbl = &ID3DXFileEnumObject_Vtbl; + object->ref = 1; + + *enum_object = &object->ID3DXFileEnumObject_iface; + + return S_OK; }

1 0

Christian Costa : d3drm: Avoid LP stuff and rename some variables.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 1db9fb9036d9d58826b4c085a9338910855d9f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db9fb9036d9d58826b4c085a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 8 08:47:12 2013 +0100 d3drm: Avoid LP stuff and rename some variables. --- dlls/d3drm/meshbuilder.c | 51 +++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 3e6aa6d..46e95ac 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1137,14 +1137,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBu return D3DRM_OK; } -HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) +HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - LPDIRECTXFILEOBJECT pObject = NULL; - LPDIRECTXFILEDATA pData2 = NULL; - const GUID* pGuid; + IDirectXFileData *pData2 = NULL; + const GUID* guid; DWORD size; - LPBYTE ptr; + BYTE *ptr; HRESULT hr; HRESULT ret = D3DRMERR_BADOBJECT; DWORD* faces_vertex_idx_data = NULL; @@ -1194,12 +1193,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, memcpy(faces_vertex_idx_data, ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD), faces_vertex_idx_size); /* Each vertex index will have its normal index counterpart so just allocate twice the size */ - This->pFaceData = HeapAlloc(GetProcessHeap(), 0, faces_vertex_idx_size*2); + This->pFaceData = HeapAlloc(GetProcessHeap(), 0, faces_vertex_idx_size * 2); faces_data_ptr = (DWORD*)This->pFaceData; while (1) { - hr = IDirectXFileData_GetNextObject(pData, &pObject); + IDirectXFileObject *object; + + hr = IDirectXFileData_GetNextObject(pData, &object); if (hr == DXFILEERR_NOMOREOBJECTS) { TRACE("No more object\n"); @@ -1208,18 +1209,18 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, if (hr != DXFILE_OK) goto end; - hr = IDirectXFileObject_QueryInterface(pObject, &IID_IDirectXFileData, (void**)&pData2); - IDirectXFileObject_Release(pObject); + hr = IDirectXFileObject_QueryInterface(object, &IID_IDirectXFileData, (void**)&pData2); + IDirectXFileObject_Release(object); if (hr != DXFILE_OK) goto end; - hr = IDirectXFileData_GetType(pData2, &pGuid); + hr = IDirectXFileData_GetType(pData2, &guid); if (hr != DXFILE_OK) goto end; - TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + TRACE("Found object type whose GUID = %s\n", debugstr_guid(guid)); - if (IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) + if (IsEqualGUID(guid, &TID_D3DRMMeshNormals)) { DWORD nb_faces_normals; DWORD faces_normal_idx_size; @@ -1238,11 +1239,11 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); - faces_normal_idx_size = size - (2*sizeof(DWORD) + This->nb_normals * sizeof(D3DVECTOR)); + faces_normal_idx_size = size - (2 * sizeof(DWORD) + This->nb_normals * sizeof(D3DVECTOR)); faces_normal_idx_ptr = faces_normal_idx_data = HeapAlloc(GetProcessHeap(), 0, faces_normal_idx_size); memcpy(faces_normal_idx_data, ptr + sizeof(DWORD) + This->nb_normals * sizeof(D3DVECTOR) + sizeof(DWORD), faces_normal_idx_size); } - else if (IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords)) + else if (IsEqualGUID(guid, &TID_D3DRMMeshTextureCoords)) { hr = IDirectXFileData_GetData(pData2, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) @@ -1256,12 +1257,12 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); } - else if (IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) + else if (IsEqualGUID(guid, &TID_D3DRMMeshMaterialList)) { DWORD nb_materials; DWORD nb_face_indices; DWORD data_size; - LPDIRECTXFILEOBJECT child; + IDirectXFileObject *child; DWORD i = 0; float* values; @@ -1295,9 +1296,9 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(pData2, &child)) && (i < nb_materials)) { - LPDIRECTXFILEDATA data; - LPDIRECTXFILEDATAREFERENCE reference; - LPDIRECTXFILEOBJECT material_child; + IDirectXFileData *data; + IDirectXFileDataReference *reference; + IDirectXFileObject *material_child; hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) @@ -1349,13 +1350,13 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, hr = IDirectXFileData_GetNextObject(data, &material_child); if (hr == S_OK) { - LPDIRECTXFILEDATA data; - char** filename; + IDirectXFileData *data; + char **filename; hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) { - LPDIRECTXFILEDATAREFERENCE reference; + IDirectXFileDataReference *reference; hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileDataReference, (void **)&reference); if (FAILED(hr)) @@ -1367,10 +1368,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, goto end; } - hr = IDirectXFileData_GetType(data, &pGuid); + hr = IDirectXFileData_GetType(data, &guid); if (hr != DXFILE_OK) goto end; - if (!IsEqualGUID(pGuid, &TID_D3DRMTextureFilename)) + if (!IsEqualGUID(guid, &TID_D3DRMTextureFilename)) { WARN("Not a texture filename\n"); goto end; @@ -1433,7 +1434,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, IDirectXFileData *pData, } else { - FIXME("Unknown GUID %s, ignoring...\n", debugstr_guid(pGuid)); + FIXME("Unknown GUID %s, ignoring...\n", debugstr_guid(guid)); } IDirectXFileData_Release(pData2);

1 0

Nikolay Sivov : xmllite: Report node value for comment nodes.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 57148ae964314378ad8999b904fafab6b616858c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57148ae964314378ad8999b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 8 14:32:21 2013 +0400 xmllite: Report node value for comment nodes. --- dlls/xmllite/reader.c | 23 ++++++++++++----- dlls/xmllite/tests/reader.c | 58 +++++++++++++++++++++++++----------------- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 82aca68..7d3d93a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -56,6 +56,7 @@ typedef enum { StringValue_LocalName, StringValue_QualifiedName, + StringValue_Value, StringValue_Last } XmlReaderStringValue; @@ -889,7 +890,7 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) /* [15] Comment ::= '' */ static HRESULT reader_parse_comment(xmlreader *reader) { - const WCHAR *start, *ptr; + WCHAR *start, *ptr; /* skip '' */ reader_skipn(reader, 3); reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &value); reader->nodetype = XmlNodeType_Comment; return S_OK; } @@ -1421,12 +1425,14 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, return E_NOTIMPL; } -static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, - LPCWSTR *value, - UINT *value_length) +static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, LPCWSTR *value, UINT *len) { - FIXME("(%p %p %p): stub\n", iface, value, value_length); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, value, len); + *value = This->strvalues[StringValue_Value].str; + if (len) *len = This->strvalues[StringValue_Value].len; + return S_OK; } static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, @@ -1600,6 +1606,7 @@ static const struct IUnknownVtbl xmlreaderinput_vtbl = HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; + int i; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); @@ -1628,7 +1635,9 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; - memset(&reader->strvalues, 0, sizeof(reader->strvalues)); + + for (i = 0; i < StringValue_Last; i++) + reader->strvalues[i] = strval_empty; *obj = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 2de1047..cd22f49 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -648,10 +648,8 @@ static void test_read_xmldeclaration(void) test_read_state(reader, XmlReadState_Interactive, -1, 0); hr = IXmlReader_GetValue(reader, &val, NULL); -todo_wine ok(hr == S_OK, "got %08x\n", hr); - if (hr == S_OK) - ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); @@ -717,14 +715,16 @@ todo_wine { struct test_entry { const char *xml; const char *name; + const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ }; static struct test_entry comment_tests[] = { - { "", "", S_OK }, - { "", "", S_OK }, - { "", NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, + { "", "", " comment ", S_OK }, + { "", "", " - comment", S_OK }, + { "", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, + { "", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, { NULL } }; @@ -754,29 +754,39 @@ static void test_read_comment(void) ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); if (hr == S_OK) { - const WCHAR *name; - WCHAR *name_exp; + const WCHAR *str; + WCHAR *str_exp; UINT len; ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); len = 1; - name = NULL; - hr = IXmlReader_GetLocalName(reader, &name, &len); + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); - name_exp = a2w(test->name); - ok(!lstrcmpW(name, name_exp), "got %s\n", wine_dbgstr_w(name)); - free_str(name_exp); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); len = 1; - name = NULL; - hr = IXmlReader_GetQualifiedName(reader, &name, &len); + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); - name_exp = a2w(test->name); - ok(!lstrcmpW(name, name_exp), "got %s\n", wine_dbgstr_w(name)); - free_str(name_exp); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); } IStream_Release(stream); @@ -787,12 +797,12 @@ static void test_read_comment(void) } static struct test_entry pi_tests[] = { - { "<?pi?>", "pi", S_OK }, - { "<?pi ?>", "pi", S_OK }, - { "<?pi:pi?>", NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER }, - { "<?:pi ?>", NULL, WC_E_PI, WC_E_NAMECHARACTER }, - { "<?-pi ?>", NULL, WC_E_PI, WC_E_NAMECHARACTER }, - { "<?xml-stylesheet ?>", "xml-stylesheet", S_OK }, + { "<?pi?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, + { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER }, + { "<?:pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, + { "<?-pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, + { "<?xml-stylesheet ?>", "xml-stylesheet", "", S_OK }, { NULL } };

1 0

Nikolay Sivov : xmllite: Report value for PI nodes.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: e79b2b3fc4f7d3ef66bca7429ea2d3559ceb20ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79b2b3fc4f7d3ef66bca7429… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 8 15:42:57 2013 +0400 xmllite: Report value for PI nodes. --- dlls/xmllite/reader.c | 6 +++++- dlls/xmllite/tests/reader.c | 36 ++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 7d3d93a..fec4234 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1031,7 +1031,7 @@ static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) /* [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' */ static HRESULT reader_parse_pi(xmlreader *reader) { - const WCHAR *ptr, *start; + WCHAR *ptr, *start; strval target; HRESULT hr; @@ -1051,6 +1051,7 @@ static HRESULT reader_parse_pi(xmlreader *reader) reader->nodetype = XmlNodeType_ProcessingInstruction; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } @@ -1066,12 +1067,15 @@ static HRESULT reader_parse_pi(xmlreader *reader) { if (ptr[1] == '>') { + strval value = { start, ptr-start }; + TRACE("%s\n", debugstr_wn(start, ptr-start)); /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &value); return S_OK; } else diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index cd22f49..140c99e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -799,6 +799,8 @@ static void test_read_comment(void) static struct test_entry pi_tests[] = { { "<?pi?>", "pi", "", S_OK }, { "<?pi ?>", "pi", "", S_OK }, + { "<?pi pi data?>", "pi", "pi data", S_OK }, + { "<?pi pi data ?>", "pi", "pi data ", S_OK }, { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER }, { "<?:pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, { "<?-pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, @@ -832,29 +834,39 @@ static void test_read_pi(void) ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); if (hr == S_OK) { - const WCHAR *name; - WCHAR *name_exp; + const WCHAR *str; + WCHAR *str_exp; UINT len; ok(type == XmlNodeType_ProcessingInstruction, "got %d for %s\n", type, test->xml); len = 0; - name = NULL; - hr = IXmlReader_GetLocalName(reader, &name, &len); + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); - name_exp = a2w(test->name); - ok(!lstrcmpW(name, name_exp), "got %s\n", wine_dbgstr_w(name)); - free_str(name_exp); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); len = 0; - name = NULL; - hr = IXmlReader_GetQualifiedName(reader, &name, &len); + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); - name_exp = a2w(test->name); - ok(!lstrcmpW(name, name_exp), "got %s\n", wine_dbgstr_w(name)); - free_str(name_exp); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = !strlen(test->value); + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); } IStream_Release(stream);

1 0

Nikolay Sivov : xmllite: Explicitly set value and names to empty for xml decl node.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 430bde34f3cee625678e00565ecf23eb81acce57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=430bde34f3cee625678e00565… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 8 15:44:27 2013 +0400 xmllite: Explicitly set value and names to empty for xml decl node. --- dlls/xmllite/reader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index fec4234..9c14899 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -883,6 +883,9 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader_skipn(reader, 2); reader->nodetype = XmlNodeType_XmlDeclaration; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; }

1 0

Aric Stewart : usp10: Correct issues if a feature tag is duplicated between GSUB and GPOS.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 9dd91d31984170c378f33e96341a16d2906f4cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd91d31984170c378f33e963… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 8 10:00:06 2013 -0600 usp10: Correct issues if a feature tag is duplicated between GSUB and GPOS. Identified by Huw Davies. --- dlls/usp10/opentype.c | 23 +++++++++++++++++++---- dlls/usp10/shape.c | 38 +++++++++++++++++++------------------- dlls/usp10/usp10_internal.h | 7 ++++++- 3 files changed, 44 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dd91d31984170c378f33…

1 0

Aric Stewart : usp10: Add GSUB ccmp feature to Hebrew.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: a1648ac5e735df5b1395fb75a0b25060031236b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1648ac5e735df5b1395fb75a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 8 10:01:24 2013 -0600 usp10: Add GSUB ccmp feature to Hebrew. --- dlls/usp10/shape.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d446db1..b7a8baf 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -182,6 +182,7 @@ static OPENTYPE_FEATURE_RECORD arabic_gpos_features[] = static OPENTYPE_FEATURE_RECORD hebrew_features[] = { + { MS_MAKE_TAG('c','c','m','p'), 1}, { MS_MAKE_TAG('d','l','i','g'), 0}, }; @@ -457,7 +458,7 @@ static const ScriptShapeData ShapingData[] = {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, - {{ hebrew_features, 1}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, + {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, {{ syriac_features, 4}, {syriac_gpos_features, 3}, required_syriac_features, 0, ContextualShape_Syriac, ShapeCharGlyphProp_None}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ NULL, 0}, {NULL, 0}, NULL, 0, ContextualShape_Thaana, ShapeCharGlyphProp_None}, @@ -528,7 +529,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ hebrew_features, 1}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, + {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ thai_features, 1}, {thai_gpos_features, 3}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, };

1 0

Huw Davies : usp10: Simplify the offset calculation by always using ETO_PDY .
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 082f98957587aa442b3ae1ffeb5d414bfff41425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082f98957587aa442b3ae1ffe… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 8 16:05:31 2013 +0000 usp10: Simplify the offset calculation by always using ETO_PDY. --- dlls/usp10/usp10.c | 40 +++++++++------------------------------- 1 files changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6ff640e..75fe597 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3253,41 +3253,19 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); + fuOptions |= ETO_PDY; - if (pGoffset) - { - for (i = 0; i < cGlyphs; i++) - if (!(fuOptions&ETO_PDY) && pGoffset[i].dv) - fuOptions |= ETO_PDY; - } for (i = 0; i < cGlyphs; i++) { - int idx = i; - if (fuOptions&ETO_PDY) - { - idx *=2; - lpDx[idx+1] = 0; - } - lpDx[idx] = piAdvance[i]; - } - if (pGoffset) - { - for (i = 1; i < cGlyphs; i++) + lpDx[i * 2] = piAdvance[i]; + lpDx[i * 2 + 1] = 0; + + if (pGoffset && i > 0) { - int idx = i; - int prev_idx = i-1; - if (fuOptions&ETO_PDY) - { - idx*=2; - prev_idx = idx-2; - } - lpDx[prev_idx] += pGoffset[i].du; - lpDx[idx] -= pGoffset[i].du; - if (fuOptions&ETO_PDY) - { - lpDx[prev_idx+1] += pGoffset[i].dv; - lpDx[idx+1] -= pGoffset[i].dv; - } + lpDx[(i - 1) * 2] += pGoffset[i].du; + lpDx[(i - 1) * 2 + 1] += pGoffset[i].dv; + lpDx[i * 2] -= pGoffset[i].du; + lpDx[i * 2 + 1] -= pGoffset[i].dv; } }

1 0

André Hentschel : netstat: Implement -e option.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 7b53eac79f2cb532494d1744e8803e2a6d7e10a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b53eac79f2cb532494d1744e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 7 23:30:37 2013 +0100 netstat: Implement -e option. --- po/ar.po | 36 ++++++++++++++++++++++++ po/bg.po | 40 +++++++++++++++++++++++++++ po/ca.po | 46 +++++++++++++++++++++++++++++++ po/cs.po | 41 ++++++++++++++++++++++++++++ po/da.po | 46 +++++++++++++++++++++++++++++++ po/de.po | 46 +++++++++++++++++++++++++++++++ po/el.po | 40 +++++++++++++++++++++++++++ po/en.po | 36 ++++++++++++++++++++++++ po/en_US.po | 36 ++++++++++++++++++++++++ po/eo.po | 44 ++++++++++++++++++++++++++++++ po/es.po | 46 +++++++++++++++++++++++++++++++ po/fa.po | 36 ++++++++++++++++++++++++ po/fi.po | 46 +++++++++++++++++++++++++++++++ po/fr.po | 46 +++++++++++++++++++++++++++++++ po/he.po | 43 +++++++++++++++++++++++++++++ po/hi.po | 36 ++++++++++++++++++++++++ po/hu.po | 46 +++++++++++++++++++++++++++++++ po/it.po | 46 +++++++++++++++++++++++++++++++ po/ja.po | 46 +++++++++++++++++++++++++++++++ po/ko.po | 46 +++++++++++++++++++++++++++++++ po/lt.po | 46 +++++++++++++++++++++++++++++++ po/ml.po | 36 ++++++++++++++++++++++++ po/nb_NO.po | 46 +++++++++++++++++++++++++++++++ po/nl.po | 46 +++++++++++++++++++++++++++++++ po/or.po | 36 ++++++++++++++++++++++++ po/pa.po | 36 ++++++++++++++++++++++++ po/pl.po | 46 +++++++++++++++++++++++++++++++ po/pt_BR.po | 46 +++++++++++++++++++++++++++++++ po/pt_PT.po | 46 +++++++++++++++++++++++++++++++ po/rm.po | 36 ++++++++++++++++++++++++ po/ro.po | 45 ++++++++++++++++++++++++++++++ po/ru.po | 46 +++++++++++++++++++++++++++++++ po/sk.po | 45 ++++++++++++++++++++++++++++++ po/sl.po | 46 +++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 42 ++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 42 ++++++++++++++++++++++++++++ po/sv.po | 46 +++++++++++++++++++++++++++++++ po/te.po | 36 ++++++++++++++++++++++++ po/th.po | 40 +++++++++++++++++++++++++++ po/tr.po | 44 ++++++++++++++++++++++++++++++ po/uk.po | 46 +++++++++++++++++++++++++++++++ po/wa.po | 36 ++++++++++++++++++++++++ po/wine.pot | 36 ++++++++++++++++++++++++ po/zh_CN.po | 44 ++++++++++++++++++++++++++++++ po/zh_TW.po | 46 +++++++++++++++++++++++++++++++ programs/netstat/netstat.c | 63 +++++++++++++++++++++++++++++++++++++++++++ programs/netstat/netstat.h | 9 ++++++ programs/netstat/netstat.rc | 9 ++++++ 48 files changed, 1989 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b53eac79f2cb532494d1…

1 0

Henri Verbeet : ddraw: Avoid LPD3DTRANSFORMDATA.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 553745e3f2902af171fc8e4e0de78abc1a1d50a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553745e3f2902af171fc8e4e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 8 09:53:15 2013 +0100 ddraw: Avoid LPD3DTRANSFORMDATA. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 322384a..8678560 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -655,7 +655,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; - STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; + STDMETHOD(TransformVertices)(THIS_ DWORD vertex_count, D3DTRANSFORMDATA *data, DWORD flags, DWORD *offscreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; @@ -723,7 +723,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; - STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; + STDMETHOD(TransformVertices)(THIS_ DWORD vertex_count, D3DTRANSFORMDATA *data, DWORD flags, DWORD *offscreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; @@ -799,7 +799,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; - STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; + STDMETHOD(TransformVertices)(THIS_ DWORD vertex_count, D3DTRANSFORMDATA *data, DWORD flags, DWORD *offscreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE;

1 0