wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Huw Davies : ole32: Add a stub for OleCreateFromFileEx.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 94ee4096ec4459105e8f22d39be843ae65980420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ee4096ec4459105e8f22d39… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:24 2015 +0100 ole32: Add a stub for OleCreateFromFileEx. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 2 ++ dlls/ole32/datacache.c | 2 +- dlls/ole32/ole2impl.c | 31 +++++++++++++++++++++++++++++++ dlls/ole32/ole2stubs.c | 11 ----------- dlls/ole32/ole32.spec | 4 ++-- include/ole2.h | 3 +++ 6 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index c63d645..857943a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -315,6 +315,8 @@ extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HI extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; +extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 1076a37..2e2478a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -216,7 +216,7 @@ static inline DataCache *impl_from_IAdviseSink( IAdviseSink *iface ) return CONTAINING_RECORD(iface, DataCache, IAdviseSink_iface); } -static const char * debugstr_formatetc(const FORMATETC *formatetc) +const char *debugstr_formatetc(const FORMATETC *formatetc) { return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %d, lindex = %d, tymed = %d }", formatetc->cfFormat, formatetc->ptd, formatetc->dwAspect, diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 4be79a7..71b0145 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -233,6 +233,37 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, } /****************************************************************************** + * OleCreateFromFileEx [OLE32.@] + */ +HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, IAdviseSink *sink, + DWORD *conns, IOleClientSite *client_site, IStorage *stg, void **obj) +{ + ULONG i; + + FIXME("%s: stub!\n", debugstr_w(filename)); + TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid), + debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts); + TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj); + for (i = 0; i < num_fmts; i++) + TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); + + return E_NOTIMPL; +} + +/****************************************************************************** + * OleCreateFromFile [OLE32.@] + */ +HRESULT WINAPI OleCreateFromFile(REFCLSID clsid, const OLECHAR *filename, REFIID iid, DWORD renderopt, + FORMATETC *fmt, IOleClientSite *client_site, IStorage *storage, void **obj) +{ + DWORD advf = ADVF_PRIMEFIRST; + + return OleCreateFromFileEx(clsid, filename, iid, 0, renderopt, fmt ? 1 : 0, fmt ? &advf : NULL, fmt, + NULL, NULL, client_site, storage, obj); +} + +/****************************************************************************** * OleDuplicateData [OLE32.@] * * Duplicates clipboard data. diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index ba32165..de35747 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -52,17 +52,6 @@ HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, } /****************************************************************************** - * OleCreateFromFile [OLE32.@] - */ -HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid, - DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj) -{ - FIXME("(not shown), stub!\n"); - return E_NOTIMPL; -} - - -/****************************************************************************** * OleGetIconOfClass [OLE32.@] */ HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseTypeAsLabel) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 8c4e8e3..04c9f1e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -188,8 +188,8 @@ @ stub OleCreateEx @ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr) @ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr) -@ stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr) -@ stub OleCreateFromFileEx +@ stdcall OleCreateFromFile(ptr wstr ptr long ptr ptr ptr ptr) +@ stdcall OleCreateFromFileEx(ptr wstr ptr long long long ptr ptr ptr ptr ptr ptr ptr) @ stdcall OleCreateLink(ptr ptr long ptr ptr ptr ptr) @ stub OleCreateLinkEx @ stdcall OleCreateLinkFromData(ptr ptr long ptr ptr ptr ptr) diff --git a/include/ole2.h b/include/ole2.h index a555c70..05c1b55 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -107,6 +107,9 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLab HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses); HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); +HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, LPCOLESTR filename, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, LPFORMATETC fmts, IAdviseSink *sink, + DWORD *conns, LPOLECLIENTSITE client_site, LPSTORAGE storage, LPVOID* obj); HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,

1 0

Huw Davies : ole32: Don' t try to load a handler - the real server is needed.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: d340f09a336b28534bacd717e21b021d9e05fff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d340f09a336b28534bacd717e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:23 2015 +0100 ole32: Don't try to load a handler - the real server is needed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 6474d9a..9586be9 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -505,7 +505,7 @@ FileMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft res=GetClassFile(This->filePathName,&clsID); if (SUCCEEDED(res)){ - res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IPersistFile,(void**)&ppf); + res=CoCreateInstance(&clsID,NULL,CLSCTX_SERVER,&IID_IPersistFile,(void**)&ppf); if (SUCCEEDED(res)){ res=IPersistFile_Load(ppf,This->filePathName,STGM_READ);

1 0

Huw Davies : ole32: Test the result of IRunningObjectTable_GetObject against S_OK.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 577644f3c1db5ddd74a22282698286b33a6b6fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=577644f3c1db5ddd74a222826… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:22 2015 +0100 ole32: Test the result of IRunningObjectTable_GetObject against S_OK. Typically it would return MK_E_UNAVAILABLE and not S_FALSE if the moniker is not registered. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index c9b4e50..6474d9a 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -500,7 +500,7 @@ FileMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft /* if the requested class was loaded before ! we don't need to reload it */ res = IRunningObjectTable_GetObject(prot,iface,&pObj); - if (res==S_FALSE){ + if (res != S_OK){ /* first activation of this class */ res=GetClassFile(This->filePathName,&clsID); if (SUCCEEDED(res)){

1 0

Sebastian Lackner : maintainers: Add section for OpenMP and threadpool implementation.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: d343371cbc5f09962ffddedaea222519e167df33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d343371cbc5f09962ffddedae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 08:44:35 2015 +0200 maintainers: Add section for OpenMP and threadpool implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 50999e7..20e6e1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -115,12 +115,21 @@ OLE Typelibs P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/oleaut32/typelib.c +OpenMP +M: Sebastian Lackner <sebastian(a)fds-team.de> +F: dlls/vcomp*/ + +Threadpool +M: Sebastian Lackner <sebastian(a)fds-team.de> +F: dlls/ntdll/threadpool.c + Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> +P: Sebastian Lackner <sebastian(a)fds-team.de> F: server/ Winemaker

1 0

Michael Müller : advpack: Translate flags in LaunchINFSection.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 10ff131325dec995d20085322ee22b9c5b219358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ff131325dec995d20085322… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 9 08:07:14 2015 +0200 advpack: Translate flags in LaunchINFSection. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/install.c | 6 +++++- dlls/advpack/tests/install.c | 4 ++++ include/advpub.h | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index f75eb01..dcd1dd7 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -776,7 +776,11 @@ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT sho str_flags = get_parameter(&cmdline_ptr, ',', TRUE); if (str_flags) - flags = atolW(str_flags); + { + DWORD inf_flags = atolW(str_flags); + if (inf_flags & LIS_QUIET) flags |= RSC_FLAG_QUIET; + if (inf_flags & LIS_NOGRPCONV) flags |= RSC_FLAG_NGCONV; + } ZeroMemory(&info, sizeof(ADVInfo)); diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 875e7d4..16593d1 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -190,6 +190,7 @@ static void test_LaunchINFSection(void) HRESULT hr; char cmdline[MAX_PATH]; static char file[] = "test.inf,DefaultInstall,4,0"; + static char file2[] = "test.inf,,1,0"; /* The 'No UI' flag seems to have no effect whatsoever on Windows. * So only do this test in interactive mode. @@ -220,6 +221,9 @@ static void test_LaunchINFSection(void) hr = pLaunchINFSection(NULL, NULL, file, 0); ok(hr == 0, "Expected 0, got %d\n", hr); + hr = pLaunchINFSection(NULL, NULL, file2, 0); + ok(hr == 0, "Expected 0, got %d\n", hr); + DeleteFileA("test.inf"); } diff --git a/include/advpub.h b/include/advpub.h index b213b1f..7823e0a 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -135,6 +135,10 @@ DECL_WINELIB_TYPE_AW(LPCSTRTABLE) #define RSC_FLAG_DELAYREGISTEROCX 0x00000200 #define RSC_FLAG_SETUPAPI 0x00000400 +/* Flags for LaunchINFSection */ +#define LIS_QUIET 0x00000001 +#define LIS_NOGRPCONV 0x00000002 + /* Flags for DelNode */ #define ADN_DEL_IF_EMPTY 0x00000001 #define ADN_DONT_DEL_SUBDIRS 0x00000002

1 0

Hans Leidekker : webservices: Implement WsReadType for a number of basic types.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 8c9600b9fadbff02bf67ce5a5ff3ffd1640dc02a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9600b9fadbff02bf67ce5a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:32 2015 +0200 webservices: Implement WsReadType for a number of basic types. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 277 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 265 ++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 543 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c9600b9fadbff02bf67c…

1 0

Hans Leidekker : webservices: Implement WsReadNode.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: ef3e05ee5b6bcfa71eee53e1a9cc15f0666c2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3e05ee5b6bcfa71eee53e1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:31 2015 +0200 webservices: Implement WsReadNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 143 +++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 207 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 348 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef3e05ee5b6bcfa71eee5…

1 0

Hans Leidekker : webservices: Implement WsReadEndElement.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 45ded33bc96d5981c182ea7bf01652e3b79b0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ded33bc96d5981c182ea7bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:30 2015 +0200 webservices: Implement WsReadEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 43 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index e4a377b..e48a8f2 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -833,6 +833,49 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } +static HRESULT read_endelement( struct reader *reader ) +{ + struct node *node; + unsigned int ch, skip; + + if (reader->state != READER_STATE_TEXT) return WS_E_INVALID_FORMAT; + + if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; + read_skip( reader, 2 ); + + for (;;) + { + if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if (ch == '>') + { + read_skip( reader, 1 ); + break; + } + if (!read_isnamechar( ch )) return WS_E_INVALID_FORMAT; + read_skip( reader, skip ); + } + + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + list_add_after( &reader->current->entry, &node->entry ); + reader->current = node; + reader->state = READER_STATE_ENDELEMENT; + return S_OK; +} + +/************************************************************************** + * WsReadEndElement [webservices.@] + */ +HRESULT WINAPI WsReadEndElement( WS_XML_READER *handle, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + return read_endelement( reader ); +} + /************************************************************************** * WsReadStartElement [webservices.@] */ diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 4dce639..4a587e7 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -109,7 +109,7 @@ @ stub WsReadCharsUtf8 @ stub WsReadElement @ stub WsReadEndAttribute -@ stub WsReadEndElement +@ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension @ stub WsReadEnvelopeEnd @ stub WsReadEnvelopeStart

1 0

Hans Leidekker : webservices: Implement WsReadStartElement.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: bac2d5c37f05bcbd28edfc21e9d4e14f2e92e314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac2d5c37f05bcbd28edfc21e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:29 2015 +0200 webservices: Implement WsReadStartElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 67 +++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 97 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 165 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0f2bc00..e4a377b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -557,6 +557,20 @@ static WS_XML_STRING *alloc_xml_string( const char *data, ULONG len ) return ret; } +static WS_XML_UTF8_TEXT *alloc_utf8_text( const char *data, ULONG len ) +{ + WS_XML_UTF8_TEXT *ret; + + if (!(ret = heap_alloc( sizeof(*ret) + len ))) return NULL; + ret->text.textType = WS_XML_TEXT_TYPE_UTF8; + ret->value.length = len; + ret->value.bytes = (BYTE *)(ret + 1); + ret->value.dictionary = NULL; + ret->value.id = 0; + if (data) memcpy( ret->value.bytes, data, len ); + return ret; +} + static inline BOOL read_end_of_data( struct reader *reader ) { return reader->read_pos >= reader->read_size; @@ -749,6 +763,45 @@ error: return hr; } +static HRESULT read_text( struct reader *reader ) +{ + unsigned int len = 0, ch, skip; + const char *start; + struct node *node; + WS_XML_TEXT_NODE *text; + WS_XML_UTF8_TEXT *utf8; + + start = read_current_ptr( reader ); + for (;;) + { + if (read_end_of_data( reader )) break; + if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if (ch == '<') break; + read_skip( reader, skip ); + len += skip; + } + + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; + text = (WS_XML_TEXT_NODE *)node; + if (!(utf8 = alloc_utf8_text( start, len ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + text->text = (WS_XML_TEXT *)utf8; + + list_add_after( &reader->current->entry, &node->entry ); + reader->current = node; + reader->state = READER_STATE_TEXT; + return S_OK; +} + +static HRESULT read_startelement( struct reader *reader ) +{ + if (!read_cmp( reader, "<", 1 )) return read_element( reader ); + return read_text( reader ); +} + static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) { HRESULT hr; @@ -781,6 +834,20 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) } /************************************************************************** + * WsReadStartElement [webservices.@] + */ +HRESULT WINAPI WsReadStartElement( WS_XML_READER *handle, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + return read_startelement( reader ); +} + +/************************************************************************** * WsReadToStartElement [webservices.@] */ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING *localname, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index d31a182..6baee49 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -45,6 +45,9 @@ static const char data4[] = "</o:services>\r\n" "</o:OfficeConfig>\r\n"; +static const char data8[] = + "<node1><node2>test</node2></node1>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -598,6 +601,99 @@ static void test_WsReadToStartElement(void) WsFreeReader( reader ); } +static void test_WsReadStartElement(void) +{ + HRESULT hr; + WS_XML_READER *reader; + const WS_XML_NODE *node, *node2; + int found; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data2, sizeof(data2) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsReadStartElement( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; + ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); + ok( text->text != NULL, "text not set\n" ); + if (text->text) + { + WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong data\n" ); + } + } + + hr = WsReadStartElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + node2 = NULL; + hr = WsGetReaderNode( reader, &node2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node2 == node, "different node\n" ); + + hr = set_input( reader, data8, sizeof(data8) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data8) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + ok( !memcmp( elem->localName->bytes, "node1", 5), "wrong name\n" ); + } + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + ok( !memcmp( elem->localName->bytes, "node2", 5), "wrong name\n" ); + } + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -606,4 +702,5 @@ START_TEST(reader) test_WsSetInput(); test_WsFillReader(); test_WsReadToStartElement(); + test_WsReadStartElement(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 791d4be..4dce639 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -119,7 +119,7 @@ @ stub WsReadNode @ stub WsReadQualifiedName @ stub WsReadStartAttribute -@ stub WsReadStartElement +@ stdcall WsReadStartElement(ptr ptr) @ stdcall WsReadToStartElement(ptr ptr ptr ptr ptr) @ stub WsReadType @ stub WsReadValue

1 0

Hans Leidekker : webservices: Implement WsReadToStartElement.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 3ec48f1d9da7409101f9bfe392a03367552ce01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec48f1d9da7409101f9bfe39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:28 2015 +0200 webservices: Implement WsReadToStartElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 274 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 149 +++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 424 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ec48f1d9da7409101f9b…

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
75
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 October 2015