December 2012 - Wine-commits

Michael Stefaniuc : qmgr: Parameter cleanup for a helper function.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 022e3f5333e690945be70cc306e3baa22aa417bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=022e3f5333e690945be70cc30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 00:59:02 2012 +0100 qmgr: Parameter cleanup for a helper function. --- dlls/qmgr/enum_jobs.c | 8 +++----- dlls/qmgr/qmgr.c | 2 +- dlls/qmgr/qmgr.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 85aca47..1805a6a 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -163,15 +163,13 @@ static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl = BITS_IEnumBackgroundCopyJobs_GetCount }; -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager) +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCopyJobs **enumjob) { - BackgroundCopyManagerImpl *qmgr = (BackgroundCopyManagerImpl *) copyManager; EnumBackgroundCopyJobsImpl *This; BackgroundCopyJobImpl *job; ULONG i; - TRACE("%p, %p)\n", ppObj, copyManager); + TRACE("%p, %p)\n", qmgr, enumjob); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) @@ -208,6 +206,6 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, } LeaveCriticalSection(&qmgr->cs); - *ppObj = &This->lpVtbl; + *enumjob = (IEnumBackgroundCopyJobs *)&This->lpVtbl; return S_OK; } diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 55a01e6..7b11b66 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -85,7 +85,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManage DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { TRACE("\n"); - return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); + return enum_copy_job_create(&globalMgr, ppEnum); } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 1057880..d591d20 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -100,8 +100,8 @@ extern BackgroundCopyManagerImpl globalMgr DECLSPEC_HIDDEN; HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *pJobId, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager) DECLSPEC_HIDDEN; +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, + IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN; HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, LPVOID *ppObj) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : winex11.drv: Remove superfluous function pointer casts.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 563ed3abde5f74a9af79c905ffe1fe0b869e96e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563ed3abde5f74a9af79c905f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 09:44:06 2012 +0100 winex11.drv: Remove superfluous function pointer casts. --- dlls/winex11.drv/xim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index a39779f..e0548b8 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -478,7 +478,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XVaNestedList preedit = NULL; XVaNestedList status = NULL; XIC xic; - XICCallback destroy = {(XPointer)data, (XICProc)X11DRV_DestroyIC}; + XICCallback destroy = {(XPointer)data, X11DRV_DestroyIC}; XICCallback P_StateNotifyCB, P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); Window win = data->whole_window; @@ -507,8 +507,8 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) P_DoneCB.client_data = NULL; P_DrawCB.client_data = NULL; P_CaretCB.client_data = NULL; - P_StateNotifyCB.callback = (XICProc)XIMPreEditStateNotifyCallback; - P_StartCB.callback = (XICProc)XIMPreEditStartCallback; + P_StateNotifyCB.callback = XIMPreEditStateNotifyCallback; + P_StartCB.callback = XIMPreEditStartCallback; P_DoneCB.callback = (XICProc)XIMPreEditDoneCallback; P_DrawCB.callback = (XICProc)XIMPreEditDrawCallback; P_CaretCB.callback = (XICProc)XIMPreEditCaretCallback;

1 0

Michael Stefaniuc : msxml3: Remove superfluous function pointer casts.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 0432f6f86eda1c9adaf6c7f24f814385959fa7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0432f6f86eda1c9adaf6c7f24… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 09:40:51 2012 +0100 msxml3: Remove superfluous function pointer casts. --- dlls/msxml3/schema.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 5626464..1c11349 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -838,7 +838,7 @@ static BOOL link_datatypes(xmlDocPtr schema) xmlNodePtr root, next, child; xmlNsPtr ns; - assert((void*)xmlGetExternalEntityLoader() == (void*)external_entity_loader); + assert(xmlGetExternalEntityLoader() == external_entity_loader); root = xmlDocGetRootElement(schema); if (!root) return FALSE;

1 0

Stefan Dösinger : ddraw: Create a dynamic buffer if DDLOCK_DISCARDCONTENTS is used.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 67230fc013da08965df156216b8d4553f289b088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67230fc013da08965df156216… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 4 09:36:16 2012 +0100 ddraw: Create a dynamic buffer if DDLOCK_DISCARDCONTENTS is used. --- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/vertexbuffer.c | 51 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 3a35c47..85f6ca3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -527,6 +527,8 @@ struct d3d_vertex_buffer /*** Storage for D3D7 specific things ***/ DWORD Caps; DWORD fvf; + DWORD size; + BOOL dynamic; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 39a977f..1b5d7af 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -185,6 +185,27 @@ static ULONG WINAPI d3d_vertex_buffer1_Release(IDirect3DVertexBuffer *iface) * IDirect3DVertexBuffer Methods *****************************************************************************/ +static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer *buffer, BOOL dynamic, + struct wined3d_buffer **wined3d_buffer) +{ + DWORD usage = WINED3DUSAGE_STATICDECL; + enum wined3d_pool pool; + + if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + pool = WINED3D_POOL_SYSTEM_MEM; + else + pool = WINED3D_POOL_DEFAULT; + + if (buffer->Caps & D3DVBCAPS_WRITEONLY) + usage |= WINED3DUSAGE_WRITEONLY; + if (dynamic) + usage |= WINED3DUSAGE_DYNAMIC; + + return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device, + buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops, + wined3d_buffer); +} + /***************************************************************************** * IDirect3DVertexBuffer7::Lock * @@ -225,8 +246,28 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (flags & DDLOCK_NOOVERWRITE) wined3d_flags |= WINED3D_MAP_NOOVERWRITE; if (flags & DDLOCK_DISCARDCONTENTS) + { wined3d_flags |= WINED3D_MAP_DISCARD; + if (!buffer->dynamic) + { + struct wined3d_buffer *new_buffer; + wined3d_mutex_lock(); + hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, TRUE, &new_buffer); + if (SUCCEEDED(hr)) + { + buffer->dynamic = TRUE; + wined3d_buffer_decref(buffer->wineD3DVertexBuffer); + buffer->wineD3DVertexBuffer = new_buffer; + } + else + { + WARN("Failed to create a dynamic buffer\n"); + } + wined3d_mutex_unlock(); + } + } + wined3d_mutex_lock(); if (data_size) { @@ -534,7 +575,6 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, struct ddraw *ddraw, D3DVERTEXBUFFERDESC *desc) { struct d3d_vertex_buffer *buffer; - DWORD usage; HRESULT hr = D3D_OK; TRACE("Vertex buffer description:\n"); @@ -554,16 +594,11 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, buffer->ddraw = ddraw; buffer->Caps = desc->dwCaps; buffer->fvf = desc->dwFVF; - - usage = desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0; - usage |= WINED3DUSAGE_STATICDECL; + buffer->size = get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices; wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(ddraw->wined3d_device, - get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices, - usage, desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3D_POOL_SYSTEM_MEM : WINED3D_POOL_DEFAULT, - buffer, &ddraw_null_wined3d_parent_ops, &buffer->wineD3DVertexBuffer); + hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wineD3DVertexBuffer); if (FAILED(hr)) { WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr);

1 0

Hans Leidekker : kernel32: Implement SetFileValidData.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: c019083240e70b52fb119dad469bb8c6cfda4ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=c019083240e70b52fb119dad4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 10:40:16 2012 +0100 kernel32: Implement SetFileValidData. --- configure | 1 + configure.ac | 1 + dlls/kernel32/file.c | 12 +++- dlls/kernel32/tests/file.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 31 ++++++++++ include/config.h.in | 3 + include/ddk/ntddk.h | 5 ++ include/winbase.h | 1 + 8 files changed, 188 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c019083240e70b52fb119…

1 0

Alexandre Julliard : configure: Building the tools requires include/config. h.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: bd1e261b063fe1624fe94cb56a5e17f2679c6793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1e261b063fe1624fe94cb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 4 15:58:47 2012 +0100 configure: Building the tools requires include/config.h. --- aclocal.m4 | 2 ++ configure | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 0062982..14cf916 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -179,6 +179,8 @@ wine_fn_all_dir_rules () then dnl makedep is in tools so tools makefile cannot depend on it ac_alldeps="$[2] $ac_makedep" + else + ac_alldeps="$[2] include/config.h" fi case $[2] in *.in) ac_input=$ac_input:$[2] ;; diff --git a/configure b/configure index 99efc84..2da5477 100755 --- a/configure +++ b/configure @@ -14842,6 +14842,8 @@ wine_fn_all_dir_rules () if test $ac_dir != tools then ac_alldeps="$2 $ac_makedep" + else + ac_alldeps="$2 include/config.h" fi case $2 in *.in) ac_input=$ac_input:$2 ;;

1 0

Nikolay Sivov : xmllite: Initial support for attribute list.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 0dce2e6d9a8d15c0059bd0e774347eb80ca852f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dce2e6d9a8d15c0059bd0e77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 13:31:25 2012 +0400 xmllite: Initial support for attribute list. --- dlls/xmllite/reader.c | 88 ++++++++++++++++++++++++++++++++++++++----- dlls/xmllite/tests/reader.c | 12 ++++- 2 files changed, 87 insertions(+), 13 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 11b5eb8..0d33296 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -29,6 +29,7 @@ #include "xmllite_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); @@ -88,6 +89,19 @@ typedef struct _xmlreaderinput input_buffer *buffer; } xmlreaderinput; +typedef struct +{ + const WCHAR *str; + UINT len; +} strval; + +struct attribute +{ + struct list entry; + strval localname; + strval value; +}; + typedef struct _xmlreader { IXmlReader IXmlReader_iface; @@ -98,6 +112,8 @@ typedef struct _xmlreader XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ + struct list attrs; /* attributes list for current node */ + UINT attr_count; } xmlreader; struct input_buffer @@ -184,6 +200,34 @@ static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str return ret; } +static void reader_clear_attrs(xmlreader *reader) +{ + struct attribute *attr, *attr2; + LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry) + { + reader_free(reader, attr); + } + list_init(&reader->attrs); + reader->attr_count = 0; +} + +/* attribute data holds pointers to buffer data, so buffer shrink is not possible + while we are on a node with attributes */ +static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +{ + struct attribute *attr; + + attr = reader_alloc(reader, sizeof(*attr)); + if (!attr) return E_OUTOFMEMORY; + + attr->localname = *localname; + attr->value = *value; + list_add_tail(&reader->attrs, &attr->entry); + reader->attr_count++; + + return S_OK; +} + static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) { const int initial_len = 0x2000; @@ -495,7 +539,7 @@ static int reader_skipspaces(xmlreader *reader) } /* [26] VersionNum ::= '1.' [0-9]+ */ -static HRESULT reader_parse_versionnum(xmlreader *reader) +static HRESULT reader_parse_versionnum(xmlreader *reader, strval *val) { const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); static const WCHAR onedotW[] = {'1','.',0}; @@ -510,6 +554,8 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) if (ptr2 == ptr) return WC_E_DIGIT; TRACE("version=%s\n", debugstr_wn(start, ptr-start)); + val->str = start; + val->len = ptr-start; reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -530,11 +576,14 @@ static HRESULT reader_parse_eq(xmlreader *reader) static HRESULT reader_parse_versioninfo(xmlreader *reader) { static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + strval val, name; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; + name.str = reader_get_cur(reader); + name.len = 7; /* skip 'version' */ reader_skipn(reader, 7); @@ -546,7 +595,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - hr = reader_parse_versionnum(reader); + hr = reader_parse_versionnum(reader, &val); if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) @@ -555,7 +604,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return S_OK; + return reader_add_attr(reader, &name, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -569,7 +618,7 @@ static inline int is_wchar_encname(WCHAR ch) } /* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ -static HRESULT reader_parse_encname(xmlreader *reader) +static HRESULT reader_parse_encname(xmlreader *reader, strval *val) { const WCHAR *start = reader_get_cur(reader), *ptr; xml_encoding enc; @@ -585,6 +634,8 @@ static HRESULT reader_parse_encname(xmlreader *reader) len = ptr - start; enc = parse_encoding_name(start, len); TRACE("encoding name %s\n", debugstr_wn(start, len)); + val->str = start; + val->len = len; if (enc == XmlEncoding_Unknown) return WC_E_ENCNAME; @@ -598,11 +649,14 @@ static HRESULT reader_parse_encname(xmlreader *reader) static HRESULT reader_parse_encdecl(xmlreader *reader) { static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + strval name, val; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, encodingW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 8; /* skip 'encoding' */ reader_skipn(reader, 8); @@ -614,7 +668,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - hr = reader_parse_encname(reader); + hr = reader_parse_encname(reader, &val); if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) @@ -623,7 +677,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return S_OK; + return reader_add_attr(reader, &name, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -633,11 +687,14 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; const WCHAR *start, *ptr; + strval name, val; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, standaloneW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 10; /* skip 'standalone' */ reader_skipn(reader, 10); @@ -657,13 +714,15 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); ptr = reader_get_cur(reader); TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); + val.str = start; + val.len = ptr-start; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; /* skip "'"|'"' */ reader_skipn(reader, 1); - return S_OK; + return reader_add_attr(reader, &name, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -737,6 +796,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); + reader_clear_attrs(This); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -1000,10 +1060,16 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *linePos return S_OK; } -static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *attributeCount) +static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count) { - FIXME("(%p %p): stub\n", iface, attributeCount); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_INVALIDARG; + + *count = This->attr_count; + return S_OK; } static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) @@ -1134,6 +1200,8 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); reader->nodetype = XmlNodeType_None; + list_init(&reader->attrs); + reader->attr_count = 0; *obj = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index af0ea62..c44816c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -607,6 +607,10 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 0, "got %d\n", count); + ok_pos(reader, 0, 0, -1, -1, FALSE); type = -1; @@ -627,11 +631,13 @@ static void test_read_xmldeclaration(void) todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); + hr = IXmlReader_GetAttributeCount(reader, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + hr = IXmlReader_GetAttributeCount(reader, &count); -todo_wine { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok(count == 3, "Expected 3, got %d\n", count); -} + hr = IXmlReader_GetDepth(reader, &count); todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Jacek Caban : mshtml: Added support for converting (some) argument types in builtin function calls using script engine.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 61ec3ae27b85d15cc433790fc858718df0549520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ec3ae27b85d15cc433790fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 15:06:37 2012 +0100 mshtml: Added support for converting (some) argument types in builtin function calls using script engine. --- dlls/mshtml/dispex.c | 346 ++++++++++++++++++++++++++++------------- dlls/mshtml/tests/jstest.html | 8 + 2 files changed, 248 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61ec3ae27b85d15cc4337…

1 0

Jacek Caban : msxml3: Moved XMLHTTPRequest tests to separated file.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: d6d0a27fe84bb0abdd6411f1b50c38a1f67f6713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d0a27fe84bb0abdd6411f1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 16:05:22 2012 +0100 msxml3: Moved XMLHTTPRequest tests to separated file. --- dlls/msxml3/tests/Makefile.in | 1 + dlls/msxml3/tests/domdoc.c | 1636 ++------------------------------------- dlls/msxml3/tests/httpreq.c | 1701 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1772 insertions(+), 1566 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6d0a27fe84bb0abdd641…

1 0

Jacek Caban : winedump: Added MSFT support.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 0dfa1ae223b73a155bede7e836b83c6fad66837d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dfa1ae223b73a155bede7e83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 4 13:08:53 2012 +0100 winedump: Added MSFT support. --- tools/winedump/Makefile.in | 3 +- tools/winedump/dump.c | 1 + tools/winedump/tlb.c | 735 ++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 6 +- 4 files changed, 743 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dfa1ae223b73a155bede…

1 0