November 2018 - Wine-Commits

Alistair Leslie-Hughes : comsvcs: Add initial tests.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 00b08fad99745db326ef060627c3e9dc668a734a URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b08fad99745db326ef0606… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 27 03:58:14 2018 +0000 comsvcs: Add initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/comsvcs/tests/Makefile.in | 5 + dlls/comsvcs/tests/dispenser.c | 256 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 263 insertions(+) diff --git a/configure b/configure index d405d67..f2be330 100755 --- a/configure +++ b/configure @@ -19248,6 +19248,7 @@ wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 wine_fn_config_makefile dlls/compstui enable_compstui wine_fn_config_makefile dlls/comsvcs enable_comsvcs +wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 wine_fn_config_makefile dlls/connect enable_connect wine_fn_config_makefile dlls/credui enable_credui diff --git a/configure.ac b/configure.ac index cd1bf44..328b572 100644 --- a/configure.ac +++ b/configure.ac @@ -3111,6 +3111,7 @@ WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compstui) WINE_CONFIG_MAKEFILE(dlls/comsvcs) +WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) WINE_CONFIG_MAKEFILE(dlls/connect) WINE_CONFIG_MAKEFILE(dlls/credui) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in new file mode 100644 index 0000000..9a7047e --- /dev/null +++ b/dlls/comsvcs/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = comsvcs.dll +IMPORTS = uuid oleaut32 ole32 + +C_SRCS = \ + dispenser.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c new file mode 100644 index 0000000..187800e --- /dev/null +++ b/dlls/comsvcs/tests/dispenser.c @@ -0,0 +1,256 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "comsvcs.h" + +#include "wine/test.h" + +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + trace(#func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(driver_CreateResource); +DEFINE_EXPECT(driver_DestroyResource); +DEFINE_EXPECT(driver_ResetResource); +DEFINE_EXPECT(driver_Release); + +HRESULT driver_DestroyResource_ret = S_OK; + +static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserDriver)) + { + *object = iface; + + return S_OK; + } + + ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI driver_AddRef(IDispenserDriver *iface) +{ + trace("AddRef\n"); + return 2; +} + +static ULONG WINAPI driver_Release(IDispenserDriver *iface) +{ + CHECK_EXPECT2(driver_Release); + return 1; +} + +static HRESULT WINAPI driver_CreateResource(IDispenserDriver *iface, const RESTYPID restypid, RESID *resid, TIMEINSECS *destroy) +{ + CHECK_EXPECT2(driver_CreateResource); + + *resid = 10; + return S_OK; +} + +static HRESULT WINAPI driver_RateResource(IDispenserDriver *iface, const RESTYPID restypid, const RESID resid, + const BOOL requires, RESOURCERATING *rating) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_EnlistResource(IDispenserDriver *iface, const RESID resid, const TRANSID transid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_ResetResource(IDispenserDriver *iface, const RESID resid) +{ + CHECK_EXPECT2(driver_ResetResource); + ok((int)resid == 10, "RESID %d\n", (int)resid); + return S_OK; +} + +static HRESULT WINAPI driver_DestroyResource(IDispenserDriver *iface, const RESID resid) +{ + todo_wine CHECK_EXPECT2(driver_DestroyResource); + return driver_DestroyResource_ret; +} + +static HRESULT WINAPI driver_DestroyResourceS(IDispenserDriver *iface, const SRESID resid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + + +static const struct IDispenserDriverVtbl driver_vtbl = +{ + driver_QueryInterface, + driver_AddRef, + driver_Release, + driver_CreateResource, + driver_RateResource, + driver_EnlistResource, + driver_ResetResource, + driver_DestroyResource, + driver_DestroyResourceS +}; + +static IDispenserDriver DispenserDriver = { &driver_vtbl }; + +static void create_dispenser(void) +{ + static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; + static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; + static const WCHAR data[] = {'d','a','t','a','1',0}; + HRESULT hr; + IDispenserManager *dispenser = NULL; + IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + RESID resid; + BSTR str; + + hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("DispenserManager not available\n"); + return; + } + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(holder1 != holder2, "same holder object returned\n"); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool1, &holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if(holder1) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED_BROKEN(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder1, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + + IHolder_Release(holder1); + } + if(holder2) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED_BROKEN(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder2, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + /* DestroyResource return doesn't directly affect the Holder Close return value */ + driver_DestroyResource_ret = E_FAIL; + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + driver_DestroyResource_ret = S_OK; + IHolder_Release(holder2); + } + if(holder3) + { + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + IHolder_Release(holder3); + } + + IDispenserManager_Release(dispenser); +} + + +START_TEST(dispenser) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok( hr == S_OK, "failed to init com\n"); + if (hr != S_OK) + return; + + create_dispenser(); + + CoUninitialize(); +}

1 0

Hans Leidekker : webservices: Add support for stream input.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 68504ab00c718d532eb3e82fd243e60c679718d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68504ab00c718d532eb3e82f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:11 2018 +0100 webservices: Add support for stream input. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 202 ++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 106 +++++++++++++++++++++ 2 files changed, 249 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68504ab00c718d532eb3…

1 0

Zebediah Figura : ntdll: Avoid inline assembly in have_cpuid().
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: e6f00d69439b205bed8cfc3861497de8c197d2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6f00d69439b205bed8cfc38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 10:00:06 2018 -0600 ntdll: Avoid inline assembly in have_cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a0ea037..aa6f846 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -973,30 +973,26 @@ __ASM_GLOBAL_FUNC( do_cpuid, "ret" ) #endif -/* From xf86info havecpuid.c 1.11 */ -static inline BOOL have_cpuid(void) -{ #ifdef __i386__ - unsigned int f1, f2; - __asm__("pushfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "movl %0,%1\n\t" - "xorl %2,%0\n\t" - "pushl %0\n\t" - "popfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "popfl" - : "=&r" (f1), "=&r" (f2) - : "ir" (0x00200000)); - return ((f1^f2) & 0x00200000) != 0; -#elif defined(__x86_64__) - return TRUE; +extern int have_cpuid(void); +__ASM_GLOBAL_FUNC( have_cpuid, + "pushfl\n\t" + "pushfl\n\t" + "movl (%esp),%ecx\n\t" + "xorl $0x00200000,(%esp)\n\t" + "popfl\n\t" + "pushfl\n\t" + "popl %eax\n\t" + "popfl\n\t" + "xorl %ecx,%eax\n\t" + "andl $0x00200000,%eax\n\t" + "ret" ) #else - return FALSE; -#endif +static int have_cpuid(void) +{ + return 1; } +#endif /* Detect if a SSE2 processor is capable of Denormals Are Zero (DAZ) mode. *

1 0

Alistair Leslie-Hughes : comsvcs: Implement IHolder Alloc/Free Resource.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 7a23361acca207ac226676d45828de896da1f574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a23361acca207ac226676d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 27 03:58:13 2018 +0000 comsvcs: Implement IHolder Alloc/Free Resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 21bdd67..d7831cf 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -107,19 +107,29 @@ static ULONG WINAPI holder_Release(IHolder *iface) static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; + TIMEINSECS secs; - FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid); - return E_NOTIMPL; + hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs); + + TRACE("<- 0x%08x\n", hr); + return hr; } static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; - FIXME("(%p)->(%08lx) stub\n", This, resid); + TRACE("(%p)->(%08lx) stub\n", This, resid); - return E_NOTIMPL; + hr = IDispenserDriver_DestroyResource(This->driver, resid); + + TRACE("<- 0x%08x\n", hr); + + return hr; } static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid)

1 0

Nikolay Sivov : shcore: Implement SHCreateMemStream().
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: b54d72ef0b5254dc290792faaaf3c97e20a56dd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b54d72ef0b5254dc290792fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 27 11:55:44 2018 +0300 shcore: Implement SHCreateMemStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 308 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 309 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 8f674a2..792f7c8 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -28,7 +28,9 @@ #include "initguid.h" #include "ocidl.h" #include "shellscalingapi.h" + #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shcore); @@ -492,3 +494,309 @@ WCHAR** WINAPI CommandLineToArgvW(const WCHAR *cmdline, int *numargs) return argv; } + +struct shstream +{ + IStream IStream_iface; + LONG refcount; + + union + { + struct + { + BYTE *buffer; + DWORD length; + DWORD position; + } mem; + } u; +}; + +static inline struct shstream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct shstream, IStream_iface); +} + +static HRESULT WINAPI shstream_QueryInterface(IStream *iface, REFIID riid, void **out) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)->(%s, %p)\n", stream, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + { + *out = iface; + IStream_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI shstream_AddRef(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedIncrement(&stream->refcount); + + TRACE("(%p)->(%u)\n", stream, refcount); + + return refcount; +} + +static ULONG WINAPI memstream_Release(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedDecrement(&stream->refcount); + + TRACE("(%p)->(%u)\n", stream, refcount); + + if (!refcount) + { + heap_free(stream->u.mem.buffer); + heap_free(stream); + } + + return refcount; +} + +static HRESULT WINAPI memstream_Read(IStream *iface, void *buff, ULONG buff_size, ULONG *read_len) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length; + + TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, read_len); + + if (stream->u.mem.position >= stream->u.mem.length) + length = 0; + else + length = stream->u.mem.length - stream->u.mem.position; + + length = buff_size > length ? length : buff_size; + if (length != 0) /* not at end of buffer and we want to read something */ + { + memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); + stream->u.mem.position += length; /* adjust pointer */ + } + + if (read_len) + *read_len = length; + + return S_OK; +} + +static HRESULT WINAPI memstream_Write(IStream *iface, const void *buff, ULONG buff_size, ULONG *written) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length = stream->u.mem.position + buff_size; + + TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, written); + + if (length < stream->u.mem.position) /* overflow */ + return STG_E_INSUFFICIENTMEMORY; + + if (length > stream->u.mem.length) + { + BYTE *buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + if (!buffer) + return STG_E_INSUFFICIENTMEMORY; + + stream->u.mem.length = length; + stream->u.mem.buffer = buffer; + } + memmove(stream->u.mem.buffer + stream->u.mem.position, buff, buff_size); + stream->u.mem.position += buff_size; /* adjust pointer */ + + if (written) + *written = buff_size; + + return S_OK; +} + +static HRESULT WINAPI memstream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER*new_pos) +{ + struct shstream *stream = impl_from_IStream(iface); + LARGE_INTEGER tmp; + + TRACE("(%p)->(%s, %d, %p)\n", stream, wine_dbgstr_longlong(move.QuadPart), origin, new_pos); + + if (origin == STREAM_SEEK_SET) + tmp = move; + else if (origin == STREAM_SEEK_CUR) + tmp.QuadPart = stream->u.mem.position + move.QuadPart; + else if (origin == STREAM_SEEK_END) + tmp.QuadPart = stream->u.mem.length + move.QuadPart; + else + return STG_E_INVALIDPARAMETER; + + if (tmp.QuadPart < 0) + return STG_E_INVALIDFUNCTION; + + /* we cut off the high part here */ + stream->u.mem.position = tmp.u.LowPart; + + if (new_pos) + new_pos->QuadPart = stream->u.mem.position; + return S_OK; +} + +static HRESULT WINAPI memstream_SetSize(IStream *iface, ULARGE_INTEGER new_size) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length; + BYTE *buffer; + + TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(new_size.QuadPart)); + + /* we cut off the high part here */ + length = new_size.u.LowPart; + buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + if (!buffer) + return STG_E_INSUFFICIENTMEMORY; + + stream->u.mem.buffer = buffer; + stream->u.mem.length = length; + + return S_OK; +} + +static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER size, ULARGE_INTEGER *read_len, ULARGE_INTEGER *written) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + if (read_len) + read_len->QuadPart = 0; + + if (written) + written->QuadPart = 0; + + /* TODO implement */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_Commit(IStream *iface, DWORD flags) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %#x)\n", stream, flags); + + /* Commit is not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_Revert(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* revert not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* lock/unlock not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* lock/unlock not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI memstream_Stat(IStream *iface, STATSTG *statstg, DWORD flags) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %p, %#x)\n", stream, statstg, flags); + + memset(statstg, 0, sizeof(*statstg)); + statstg->type = STGTY_STREAM; + statstg->cbSize.QuadPart = stream->u.mem.length; + statstg->grfMode = STGM_READWRITE; + + return S_OK; +} + +static HRESULT WINAPI shstream_Clone(IStream *iface, IStream **dest) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %p)\n", stream, dest); + + *dest = NULL; + + /* clone not supported by this stream */ + return E_NOTIMPL; +} + +static const IStreamVtbl shstreamvtbl = +{ + shstream_QueryInterface, + shstream_AddRef, + memstream_Release, + memstream_Read, + memstream_Write, + memstream_Seek, + memstream_SetSize, + shstream_CopyTo, + shstream_Commit, + shstream_Revert, + shstream_LockRegion, + shstream_UnlockRegion, + memstream_Stat, + shstream_Clone, +}; + +/************************************************************************* + * SHCreateMemStream [SHCORE.@] + * + * Create an IStream object on a block of memory. + * + * PARAMS + * data [I] Memory block to create the IStream object on + * data_len [I] Length of data block + * + * RETURNS + * Success: A pointer to the IStream object. + * Failure: NULL, if any parameters are invalid or an error occurs. + * + * NOTES + * A copy of the memory block is made, it's freed when the stream is released. + */ +IStream * WINAPI SHCreateMemStream(const BYTE *data, UINT data_len) +{ + struct shstream *stream; + + TRACE("(%p, %u)\n", data, data_len); + + if (!data) + data_len = 0; + + stream = heap_alloc(sizeof(*stream)); + stream->IStream_iface.lpVtbl = &shstreamvtbl; + stream->refcount = 1; + stream->u.mem.buffer = heap_alloc(data_len); + if (!stream->u.mem.buffer) + { + heap_free(stream); + return NULL; + } + memcpy(stream->u.mem.buffer, data, data_len); + stream->u.mem.length = data_len; + stream->u.mem.position = 0; + + return &stream->IStream_iface; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 1266a02..e8643d8 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -33,7 +33,7 @@ @ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode @ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA @ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW -@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream +@ stdcall SHCreateMemStream(ptr long) @ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx @ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW

1 0

Alexandre Julliard : makefiles: Support specifying installed files in the top-level makefile.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: d84de4ca001fa361652c7fdef00f624b03649eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d84de4ca001fa361652c7fde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 13:16:52 2018 +0100 makefiles: Support specifying installed files in the top-level makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 6 ++--- configure | 53 ++++++++++++++++++++++---------------- configure.ac | 38 +++++++++++++++++++-------- libs/wine/Makefile.in | 2 -- loader/Makefile.in | 2 +- programs/msiexec/Makefile.in | 2 -- programs/notepad/Makefile.in | 2 -- programs/regedit/Makefile.in | 2 -- programs/regsvr32/Makefile.in | 2 -- programs/wineboot/Makefile.in | 2 -- programs/winecfg/Makefile.in | 2 -- programs/wineconsole/Makefile.in | 2 -- programs/winedbg/Makefile.in | 2 -- programs/winefile/Makefile.in | 2 -- programs/winemine/Makefile.in | 2 -- programs/winepath/Makefile.in | 2 -- server/Makefile.in | 2 -- tools/makedep.c | 55 ++++++++++++++++++---------------------- 18 files changed, 87 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d84de4ca001fa361652c…

1 0

Dmitry Timoshkov : user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: d57fcb41135f8686f343c3b02da81cb9e44fd670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d57fcb41135f8686f343c3b0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 27 09:11:04 2018 +0300 user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 78 ++++++++++++++++++++++++++----------------- dlls/user32/tests/resource.rc | 11 ++++++ 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b39d0b2..baa8fe5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -123,6 +123,8 @@ static DWORD cbt_hook_thread_id; static const WCHAR testWindowClassW[] = { 'T','e','s','t','W','i','n','d','o','w','C','l','a','s','s','W',0 }; +static LRESULT WINAPI ParentMsgCheckProcA(HWND, UINT, WPARAM, LPARAM); + /* FIXME: add tests for these Window Edge Styles (Win31/Win95/98 look), in order of precedence: @@ -6188,7 +6190,24 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, case BM_SETSTATE: if (GetCapture()) ok(GetCapture() == hwnd, "GetCapture() = %p\n", GetCapture()); + + lParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case WM_GETDLGCODE: + if (lParam) + { + MSG *msg = (MSG *)lParam; + lParam = MAKELPARAM(msg->message, msg->wParam); + } + wParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case BM_SETCHECK: + case BM_GETCHECK: + lParam = (ULONG_PTR)GetMenu(hwnd); /* fall through */ +log_it: default: msg.hwnd = hwnd; msg.message = message; @@ -6670,32 +6689,34 @@ static void test_button_bm_get_set_image(void) ReleaseDC(0, hdc); } -#define ID_RADIO1 0x00e1 -#define ID_RADIO2 0x00e2 +#define ID_RADIO1 501 +#define ID_RADIO2 502 +#define ID_RADIO3 503 +#define ID_TEXT 504 -static const struct message auto_radio_button_WM_CLICK[] = +static const struct message auto_radio_button_BM_CLICK[] = { { BM_CLICK, sent|wparam|lparam, 0, 0 }, { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, - { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO3 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO2, BN_CLICKED) }, @@ -6705,30 +6726,27 @@ static const struct message auto_radio_button_WM_CLICK[] = { 0 } }; -static void test_autoradio_messages(void) +static INT_PTR WINAPI radio_test_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - HWND parent, radio1, radio2, radio3, child; + ParentMsgCheckProcA(hwnd, msg, wp, lp); + return 1; +} + +static void test_autoradio_BM_CLICK(void) +{ + HWND parent, radio1, radio2, radio3; RECT rc; MSG msg; DWORD ret; subclass_button(); - parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 100, 100, 200, 200, 0, 0, 0, NULL); + parent = CreateDialogParamA(0, "AUTORADIO_TEST_DIALOG_1", 0, radio_test_dlg_proc, 0); ok(parent != 0, "failed to create parent window\n"); - radio1 = CreateWindowExA(0, "my_button_class", "radio1", WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY, - 0, 0, 70, 18, parent, (HMENU)ID_RADIO1, 0, NULL); - ok(radio1 != 0, "failed to create child window\n"); - radio3 = CreateWindowExA(0, "my_button_class", "radio3", WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY, - 0, 25, 70, 18, parent, (HMENU)-1, 0, NULL); - ok(radio3 != 0, "failed to create child window\n"); - child = CreateWindowExA(0, "my_button_class", "text", WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY, - 0, 50, 70, 18, parent, (HMENU)-1, 0, NULL); - ok(child != 0, "failed to create child window\n"); - radio2 = CreateWindowExA(0, "my_button_class", "radio2", WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY, - 0, 75, 70, 18, parent, (HMENU)ID_RADIO2, 0, NULL); - ok(radio2 != 0, "failed to create child window\n"); + + radio1 = GetDlgItem(parent, ID_RADIO1); + radio2 = GetDlgItem(parent, ID_RADIO2); + radio3 = GetDlgItem(parent, ID_RADIO3); /* this avoids focus messages in the generated sequence */ SetFocus(radio2); @@ -6780,7 +6798,7 @@ static void test_autoradio_messages(void) SendMessageA(radio2, BM_CLICK, 0, 0); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(auto_radio_button_WM_CLICK, "BM_CLICK on auto-radio button", FALSE); + ok_sequence(auto_radio_button_BM_CLICK, "BM_CLICK on auto-radio button", FALSE); log_all_parent_messages--; @@ -17254,7 +17272,7 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); - test_autoradio_messages(); + test_autoradio_BM_CLICK(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index a9e45e9..1557291 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -75,6 +75,17 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL,109,20,50,14, WS_TABSTOP | WS_GROUP } +AUTORADIO_TEST_DIALOG_1 DIALOGEX 0, 0, 200, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Radio Button Test Dialog" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Radio1",501,"my_button_class",WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,10,70,18 + CONTROL "Radio3",503,"my_button_class",WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,35,70,18 + CONTROL "Text",504,"my_button_class",WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP,10,60,70,18 + CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,85,70,18 +} + CLASS_TEST_DIALOG DIALOG 0, 0, 91, 28 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test"

1 0

Zebediah Figura : setupapi: Store the class and reference string keys in the device_iface structure.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 72c5f3b57d1d71dae50a83182f767fe7586ee023 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c5f3b57d1d71dae50a8318… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 19:26:43 2018 -0600 setupapi: Store the class and reference string keys in the device_iface structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 62 ++++++++++++------------------------------------- 1 file changed, 15 insertions(+), 47 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1f020b9..64c0413 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -93,6 +93,7 @@ static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; +static const WCHAR emptyW[] = {0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -126,6 +127,8 @@ struct device_iface struct device *device; GUID class; DWORD flags; + HKEY class_key; + HKEY refstr_key; struct list entry; }; @@ -377,7 +380,7 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, { struct device_iface *iface = NULL; WCHAR *refstr2 = NULL, *symlink = NULL, *path = NULL; - HKEY key = NULL; + HKEY key; LONG ret; TRACE("%p %s %s\n", device, debugstr_guid(class), debugstr_w(refstr)); @@ -422,9 +425,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, } RegSetValueExW(key, DeviceInstance, 0, REG_SZ, (BYTE *)device->instanceId, lstrlenW(device->instanceId) * sizeof(WCHAR)); - RegCloseKey(key); heap_free(path); + iface->class_key = key; + if (!(path = get_refstr_key_path(iface))) { SetLastError(ERROR_OUTOFMEMORY); @@ -442,9 +446,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, if (is_linked(key)) iface->flags |= SPINT_ACTIVE; - RegCloseKey(key); heap_free(path); + iface->refstr_key = key; + list_add_tail(&device->interfaces, &iface->entry); return iface; @@ -554,7 +559,6 @@ static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, static void SETUPDI_RemoveDevice(struct device *device) { struct device_iface *iface, *next; - WCHAR *path; if (device->key != INVALID_HANDLE_VALUE) RegCloseKey(device->key); @@ -576,11 +580,10 @@ static void SETUPDI_RemoveDevice(struct device *device) struct device_iface, entry) { list_remove(&iface->entry); - if (device->phantom && (path = get_refstr_key_path(iface))) - { - RegDeleteKeyW(HKEY_LOCAL_MACHINE, path); - heap_free(path); - } + if (device->phantom) + RegDeleteKeyW(iface->refstr_key, emptyW); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); heap_free(iface->refstr); heap_free(iface->symlink); heap_free(iface); @@ -2486,8 +2489,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, HINF hinf, const WCHAR *section) { struct device_iface *iface; - HKEY refstr_key, params_key; - WCHAR *path; + HKEY params_key; LONG ret; TRACE("devinfo %p, iface_data %p, reserved %d, access %#x, hinf %p, section %s.\n", @@ -2501,24 +2503,8 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, return INVALID_HANDLE_VALUE; } - if (!(path = get_refstr_key_path(iface))) - { - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } - - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, - &refstr_key, NULL); - heap_free(path); - if (ret) - { - SetLastError(ret); - return INVALID_HANDLE_VALUE; - } - - ret = RegCreateKeyExW(refstr_key, DeviceParameters, 0, NULL, 0, access, + ret = RegCreateKeyExW(iface->refstr_key, DeviceParameters, 0, NULL, 0, access, NULL, &params_key, NULL); - RegCloseKey(refstr_key); if (ret) { SetLastError(ret); @@ -2535,8 +2521,6 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, DWORD reserved) { struct device_iface *iface; - HKEY refstr_key; - WCHAR *path; LONG ret; TRACE("devinfo %p, iface_data %p, reserved %d.\n", devinfo, iface_data, reserved); @@ -2544,23 +2528,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; - if (!(path = get_refstr_key_path(iface))) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, - &refstr_key, NULL); - heap_free(path); - if (ret) - { - SetLastError(ret); - return FALSE; - } - - ret = RegDeleteKeyW(refstr_key, DeviceParameters); - RegCloseKey(refstr_key); + ret = RegDeleteKeyW(iface->refstr_key, DeviceParameters); if (ret) { SetLastError(ret);

1 0

Hans Leidekker : webservices: Return HRESULT from read_utf8_char.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 44cea08ac26ca7697786e38efc962381b009ce00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cea08ac26ca7697786e38e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:10 2018 +0100 webservices: Return HRESULT from read_utf8_char. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 57 +++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ff19254..cbce1f6 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -982,41 +982,42 @@ static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; -static inline unsigned int read_utf8_char( struct reader *reader, unsigned int *skip ) +static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { - unsigned int len, res; + unsigned int len; unsigned char ch = reader->read_bufptr[reader->read_pos]; const unsigned char *end; - if (reader->read_pos >= reader->read_size) return 0; + if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; if (ch < 0x80) { + *ret = ch; *skip = 1; - return ch; + return S_OK; } len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return 0; + if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; end = reader->read_bufptr + reader->read_pos + len + 1; - res = ch & utf8_mask[len]; + *ret = ch & utf8_mask[len]; switch (len) { case 3: if ((ch = end[-3] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 2: if ((ch = end[-2] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 1: if ((ch = end[-1] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; - if (res < utf8_minval[len]) break; + *ret = (*ret << 6) | ch; + if (*ret < utf8_minval[len]) break; *skip = len + 1; - return res; + return S_OK; } - return 0; + return WS_E_INVALID_FORMAT; } static inline void read_skip( struct reader *reader, unsigned int count ) @@ -1303,14 +1304,14 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT read_skip_whitespace( reader ); if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; - quote = read_utf8_char( reader, &skip ); + if ((hr = read_utf8_char( reader, &quote, &skip )) != S_OK) return hr; read_skip( reader, 1 ); len = 0; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == quote) break; read_skip( reader, skip ); len += skip; @@ -1651,19 +1652,23 @@ static HRESULT read_attribute_text( struct reader *reader, WS_XML_ATTRIBUTE **re unsigned int len = 0, ch, skip; const unsigned char *start; WS_XML_STRING *prefix, *localname; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if ((hr = parse_qname( start, len, &prefix, &localname )) != S_OK) goto error; if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) @@ -1953,16 +1958,19 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; - hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if (!(parent = find_parent( reader ))) goto error; if ((hr = parse_qname( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; @@ -2107,7 +2115,7 @@ static HRESULT read_text_text( struct reader *reader ) for (;;) { if (read_end_of_data( reader )) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '<') break; read_skip( reader, skip ); len += skip; @@ -2741,7 +2749,7 @@ static HRESULT read_endelement_text( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '>') { read_skip( reader, 1 ); @@ -2821,7 +2829,7 @@ static HRESULT read_comment_text( struct reader *reader ) read_skip( reader, 3 ); break; } - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } @@ -2907,12 +2915,13 @@ static HRESULT read_cdata( struct reader *reader ) struct node *node; WS_XML_TEXT_NODE *text; WS_XML_UTF8_TEXT *utf8; + HRESULT hr; start = read_current_ptr( reader ); for (;;) { if (read_cmp( reader, "]]>", 3 ) == S_OK) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; }

1 0

Hans Leidekker : webservices: Return HRESULT from read_cmp.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: wine Branch: master Commit: 985b59e95a8f17f368837fd8bcc60228a0aca3e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=985b59e95a8f17f368837fd8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:08 2018 +0100 webservices: Return HRESULT from read_cmp. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 87 +++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8cf3f24..b573153 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1050,37 +1050,39 @@ static inline void read_skip_whitespace( struct reader *reader ) reader->read_pos++; } -static inline int read_cmp( struct reader *reader, const char *str, int len ) +static inline HRESULT read_cmp( struct reader *reader, const char *str, int len ) { const unsigned char *ptr = read_current_ptr( reader ); if (len < 0) len = strlen( str ); - if (reader->read_pos + len > reader->read_size) return -1; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; while (len--) { - if (*str != *ptr) return *ptr - *str; + if (*str != *ptr) return WS_E_INVALID_FORMAT; str++; ptr++; } - return 0; + return S_OK; } static HRESULT read_xmldecl( struct reader *reader ) { + HRESULT hr; + if (!reader->read_size) return WS_E_INVALID_FORMAT; - if (read_cmp( reader, "<", 1 ) || read_cmp( reader, "<?", 2 )) + if (read_cmp( reader, "<", 1 ) != S_OK || read_cmp( reader, "<?", 2 ) != S_OK) { reader->state = READER_STATE_BOF; return S_OK; } - if (read_cmp( reader, "<?xml ", 6 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<?xml ", 6 )) != S_OK) return hr; read_skip( reader, 6 ); /* FIXME: parse attributes */ while (reader->read_pos < reader->read_size && reader->read_bufptr[reader->read_pos] != '?') reader->read_pos++; - if (read_cmp( reader, "?>", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "?>", 2 )) != S_OK) return hr; read_skip( reader, 2 ); reader->state = READER_STATE_BOF; @@ -1295,17 +1297,17 @@ static HRESULT decode_text( const unsigned char *str, ULONG len, unsigned char * static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUTE *attr ) { - WS_XML_UTF8_TEXT *utf8 = NULL; + WS_XML_UTF8_TEXT *utf8; unsigned int len, ch, skip, quote; const unsigned char *start; - HRESULT hr = E_OUTOFMEMORY; + HRESULT hr; read_skip_whitespace( reader ); - if (read_cmp( reader, "=", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "=", 1 )) != S_OK) return hr; read_skip( reader, 1 ); read_skip_whitespace( reader ); - if (read_cmp( reader, "\"", 1 ) && read_cmp( reader, "'", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; quote = read_utf8_char( reader, &skip ); read_skip( reader, 1 ); @@ -1322,27 +1324,23 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT if (attr->isXmlNs) { - if (!(attr->ns = alloc_xml_string( start, len ))) goto error; - if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; - if (!(utf8 = alloc_utf8_text( NULL, 0 ))) - { - hr = E_OUTOFMEMORY; - goto error; - } + if (!(attr->ns = alloc_xml_string( start, len ))) return E_OUTOFMEMORY; + if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) return hr; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) return E_OUTOFMEMORY; } else { - if (!(utf8 = alloc_utf8_text( NULL, len ))) goto error; - if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) + { + heap_free( utf8 ); + return hr; + } } attr->value = &utf8->text; attr->singleQuote = (quote == '\''); return S_OK; - -error: - heap_free( utf8 ); - return hr; } static inline BOOL is_text_type( unsigned char type ) @@ -1924,7 +1922,7 @@ static HRESULT read_attributes_text( struct reader *reader, WS_XML_ELEMENT_NODE for (;;) { read_skip_whitespace( reader ); - if (!read_cmp( reader, ">", 1 ) || !read_cmp( reader, "/>", 2 )) break; + if (read_cmp( reader, ">", 1 ) == S_OK || read_cmp( reader, "/>", 2 ) == S_OK) break; if ((hr = read_attribute_text( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) { @@ -1942,7 +1940,7 @@ static HRESULT read_element_text( struct reader *reader ) const unsigned char *start; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (read_end_of_data( reader )) { @@ -1952,7 +1950,7 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if (read_cmp( reader, "<", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; read_skip( reader, 1 ); if (!read_isnamechar( read_utf8_char( reader, &skip ))) { @@ -1963,6 +1961,7 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; + hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { @@ -2609,7 +2608,7 @@ static HRESULT read_node_text( struct reader * ); static HRESULT read_startelement_text( struct reader *reader ) { read_skip_whitespace( reader ); - if (!read_cmp( reader, "/>", 2 )) + if (read_cmp( reader, "/>", 2 ) == S_OK) { read_skip( reader, 2 ); reader->current = LIST_ENTRY( list_tail( &reader->current->children ), struct node, entry ); @@ -2617,7 +2616,7 @@ static HRESULT read_startelement_text( struct reader *reader ) reader->state = READER_STATE_ENDELEMENT; return S_OK; } - else if (!read_cmp( reader, ">", 1 )) + else if (read_cmp( reader, ">", 1 ) == S_OK) { read_skip( reader, 1 ); return read_node_text( reader ); @@ -2744,7 +2743,7 @@ static HRESULT read_endelement_text( struct reader *reader ) WS_XML_STRING prefix, localname; HRESULT hr; - if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "</", 2 )) != S_OK) return hr; read_skip( reader, 2 ); start = read_current_ptr( reader ); @@ -2817,14 +2816,15 @@ static HRESULT read_comment_text( struct reader *reader ) const unsigned char *start; struct node *node, *parent; WS_XML_COMMENT_NODE *comment; + HRESULT hr; - if (read_cmp( reader, "", 3 )) + if (read_cmp( reader, "-->", 3 ) == S_OK) { read_skip( reader, 3 ); break; @@ -2887,8 +2887,9 @@ static HRESULT read_comment_bin( struct reader *reader ) static HRESULT read_startcdata( struct reader *reader ) { struct node *node, *endnode, *parent; + HRESULT hr; - if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<![CDATA[", 9 )) != S_OK) return hr; read_skip( reader, 9 ); if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2918,7 +2919,7 @@ static HRESULT read_cdata( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!read_cmp( reader, "]]>", 3 )) break; + if (read_cmp( reader, "]]>", 3 ) == S_OK) break; if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; read_skip( reader, skip ); len += skip; @@ -2941,8 +2942,9 @@ static HRESULT read_cdata( struct reader *reader ) static HRESULT read_endcdata( struct reader *reader ) { struct node *parent; + HRESULT hr; - if (read_cmp( reader, "]]>", 3 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "]]>", 3 )) != S_OK) return hr; read_skip( reader, 3 ); if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT) parent = reader->current->parent; @@ -2969,16 +2971,19 @@ static HRESULT read_node_text( struct reader *reader ) } if (reader->state == READER_STATE_STARTCDATA) return read_cdata( reader ); else if (reader->state == READER_STATE_CDATA) return read_endcdata( reader ); - else if (!read_cmp( reader, "<?", 2 )) + else if (read_cmp( reader, "<?", 2 ) == S_OK) { hr = read_xmldecl( reader ); if (FAILED( hr )) return hr; } - else if (!read_cmp( reader, "</", 2 )) return read_endelement_text( reader ); - else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); - else if (!read_cmp( reader, "<!--", 4 )) return read_comment_text( reader ); - else if (!read_cmp( reader, "<", 1 )) return read_element_text( reader ); - else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement_text( reader ); + else if (read_cmp( reader, "</", 2 ) == S_OK) return read_endelement_text( reader ); + else if (read_cmp( reader, "<![CDATA[", 9 ) == S_OK) return read_startcdata( reader ); + else if (read_cmp( reader, "<!--", 4 ) == S_OK) return read_comment_text( reader ); + else if (read_cmp( reader, "<", 1 ) == S_OK) return read_element_text( reader ); + else if (read_cmp( reader, "/>", 2 ) == S_OK || read_cmp( reader, ">", 1 ) == S_OK) + { + return read_startelement_text( reader ); + } else return read_text_text( reader ); } }

1 0