wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Zebediah Figura : quartz/filesource: Clean up FileAsyncReader_RequestAllocator().
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 58b60edf53cc442528f7ad7e97ee7a7aab666b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b60edf53cc442528f7ad7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:00 2020 -0600 quartz/filesource: Clean up FileAsyncReader_RequestAllocator(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 102 ++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 7ea67ccc12..ea0ae8361e 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -353,7 +353,7 @@ static void async_reader_destroy(struct strmbase_filter *iface) { for (i = 0; i < filter->max_requests; ++i) CloseHandle(filter->requests[i].ovl.hEvent); - CoTaskMemFree(filter->requests); + free(filter->requests); } CloseHandle(filter->file); filter->sample_cs.DebugInfo->Spare[0] = 0; @@ -702,88 +702,54 @@ static ULONG WINAPI FileAsyncReader_Release(IAsyncReader * iface) return IPin_Release(&filter->source.pin.IPin_iface); } -#define DEF_ALIGNMENT 1 - -static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMemAllocator * pPreferred, ALLOCATOR_PROPERTIES * pProps, IMemAllocator ** ppActual) +static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader *iface, + IMemAllocator *preferred, ALLOCATOR_PROPERTIES *props, IMemAllocator **ret_allocator) { - AsyncReader *This = impl_from_IAsyncReader(iface); - HRESULT hr = S_OK; - - TRACE("%p->(%p, %p, %p)\n", This, pPreferred, pProps, ppActual); + AsyncReader *filter = impl_from_IAsyncReader(iface); + IMemAllocator *allocator; + unsigned int i; + HRESULT hr; - if (!pProps->cbAlign || (pProps->cbAlign % DEF_ALIGNMENT) != 0) - pProps->cbAlign = DEF_ALIGNMENT; + TRACE("filter %p, preferred %p, props %p, ret_allocator %p.\n", filter, preferred, props, ret_allocator); - if (pPreferred) - { - hr = IMemAllocator_SetProperties(pPreferred, pProps, pProps); - /* FIXME: check we are still aligned */ - if (SUCCEEDED(hr)) - { - IMemAllocator_AddRef(pPreferred); - *ppActual = pPreferred; - TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr); - goto done; - } - } + if (!props->cbAlign) + props->cbAlign = 1; - pPreferred = NULL; + *ret_allocator = NULL; - hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, &IID_IMemAllocator, (LPVOID *)&pPreferred); + if (preferred) + IMemAllocator_AddRef(allocator = preferred); + else if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC, &IID_IMemAllocator, (void **)&allocator))) + return hr; - if (SUCCEEDED(hr)) + if (FAILED(hr = IMemAllocator_SetProperties(allocator, props, props))) { - hr = IMemAllocator_SetProperties(pPreferred, pProps, pProps); - /* FIXME: check we are still aligned */ - if (SUCCEEDED(hr)) - { - *ppActual = pPreferred; - TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr); - } + IMemAllocator_Release(allocator); + return hr; } -done: - if (SUCCEEDED(hr)) + if (filter->requests) { - if (This->requests) - { - unsigned int i; - - for (i = 0; i < This->max_requests; ++i) - CloseHandle(This->requests[i].ovl.hEvent); - CoTaskMemFree(This->requests); - } - - This->max_requests = pProps->cBuffers; - TRACE("Maximum request count: %u.\n", This->max_requests); - This->requests = CoTaskMemAlloc(sizeof(This->requests[0]) * pProps->cBuffers); - - if (This->requests) - { - int x; - ZeroMemory(This->requests, sizeof(This->requests[0]) * pProps->cBuffers); - for (x = 0; x < This->max_requests; ++x) - This->requests[x].ovl.hEvent = CreateEventW(NULL, 0, 0, NULL); - This->allocProps = *pProps; - } - else - { - hr = E_OUTOFMEMORY; - CoTaskMemFree(This->requests); - This->max_requests = 0; - This->requests = NULL; - } + for (i = 0; i < filter->max_requests; ++i) + CloseHandle(filter->requests[i].ovl.hEvent); + free(filter->requests); } - if (FAILED(hr)) + filter->max_requests = props->cBuffers; + TRACE("Maximum request count: %u.\n", filter->max_requests); + if (!(filter->requests = calloc(filter->max_requests, sizeof(filter->requests[0])))) { - *ppActual = NULL; - if (pPreferred) - IMemAllocator_Release(pPreferred); + IMemAllocator_Release(allocator); + return E_OUTOFMEMORY; } - TRACE("-- %x\n", hr); - return hr; + for (i = 0; i < filter->max_requests; ++i) + filter->requests[i].ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + filter->allocProps = *props; + + *ret_allocator = allocator; + return S_OK; } static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample *sample, DWORD_PTR cookie)

1 0

Zebediah Figura : quartz/filesource: Use a completion port to handle asynchronous requests.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: abac070387f908f853f38eddc67206ff7c657ae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abac070387f908f853f38edd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:56:59 2020 -0600 quartz/filesource: Use a completion port to handle asynchronous requests. Thus simplifying the code and allowing us to handle more than 63 at once. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 376 ++++++++++++++++------------------------- dlls/quartz/tests/filesource.c | 26 ++- 2 files changed, 173 insertions(+), 229 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=abac070387f908f853f3…

1 0

Alistair Leslie-Hughes : include: Add xact3wb.h.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 1bb953c6766c9cc4372ca23a7c5b7de101324218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb953c6766c9cc4372ca23a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 29 04:24:58 2020 +0000 include: Add xact3wb.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/xact3wb.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 8284d6fdf3..b1e7d0084f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -772,6 +772,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..b4c5a53d40 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2020 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 + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } DUMMYSTRUCTNAME; + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } DUMMYSTRUCTNAME; + DWORD dwFlagsAndDuration; + } DUMMYUNIONNAME; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */

1 0

Henri Verbeet : d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse().
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 763da3f7cc782eced124e981acbdb680012ea760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763da3f7cc782eced124e981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 14:15:32 2020 +0330 d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a61ce692b9..2a1fbf5f7c 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3707,7 +3707,7 @@ static HRESULT STDMETHODCALLTYPE d2d_ellipse_geometry_Widen(ID2D1EllipseGeometry return E_NOTIMPL; } -static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetRoundedRect(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) +static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetEllipse(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) { struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface); @@ -3735,7 +3735,7 @@ static const struct ID2D1EllipseGeometryVtbl d2d_ellipse_geometry_vtbl = d2d_ellipse_geometry_ComputeLength, d2d_ellipse_geometry_ComputePointAtLength, d2d_ellipse_geometry_Widen, - d2d_ellipse_geometry_GetRoundedRect, + d2d_ellipse_geometry_GetEllipse, }; HRESULT d2d_ellipse_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_ELLIPSE *ellipse)

1 0

Nikolay Sivov : ole32: Implement custom marshalling for pointer monikers.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: a3909647b23ad8227b71e30cff18dc43a048528b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3909647b23ad8227b71e30c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:00 2020 +0300 ole32: Implement custom marshalling for pointer monikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 129 ++++++++++++++++++++++++++++++++++++++++++-- dlls/ole32/tests/moniker.c | 38 +++++++++++-- 2 files changed, 160 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index c1a0e2ae1c..2cb0600336 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -37,13 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* PointerMoniker data structure */ -typedef struct PointerMonikerImpl{ - +typedef struct PointerMonikerImpl +{ IMoniker IMoniker_iface; + IMarshal IMarshal_iface; LONG ref; /* reference counter for this object */ - IUnknown *pObject; /* custom marshaler */ + IUnknown *pObject; } PointerMonikerImpl; static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) @@ -51,6 +52,11 @@ static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static PointerMonikerImpl *impl_from_IMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMarshal_iface); +} + static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) @@ -70,7 +76,11 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || IsEqualIID(&IID_IMoniker, riid)) + { *ppvObject = iface; + } + else if (IsEqualIID(&IID_IMarshal, riid)) + *ppvObject = &This->IMarshal_iface; /* Check that we obtained an interface.*/ if ((*ppvObject)==0) @@ -542,6 +552,117 @@ static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static HRESULT WINAPI pointer_moniker_marshal_QueryInterface(IMarshal *iface, REFIID riid, LPVOID *ppv) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static ULONG WINAPI pointer_moniker_marshal_AddRef(IMarshal *iface) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI pointer_moniker_marshal_Release(IMarshal *iface) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI pointer_moniker_marshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, clsid); + + return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid); +} + +static HRESULT WINAPI pointer_moniker_marshal_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *size) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %d, %p, %#x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, size); + + return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags); +} + +static HRESULT WINAPI pointer_moniker_marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, + void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x.\n", stream, debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags); + + return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext, + pvDestContext, mshlflags); +} + +static HRESULT WINAPI pointer_moniker_marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, + REFIID riid, void **ppv) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", iface, stream, debugstr_guid(riid), ppv); + + hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object); + if (FAILED(hr)) + { + ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr); + return hr; + } + + if (moniker->pObject) + IUnknown_Release(moniker->pObject); + moniker->pObject = object; + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static HRESULT WINAPI pointer_moniker_marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + TRACE("%p, %p.\n", iface, stream); + + return S_OK; +} + +static HRESULT WINAPI pointer_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved) +{ + TRACE("%p, %#x.\n", iface, reserved); + + return S_OK; +} + +static const IMarshalVtbl pointer_moniker_marshal_vtbl = +{ + pointer_moniker_marshal_QueryInterface, + pointer_moniker_marshal_AddRef, + pointer_moniker_marshal_Release, + pointer_moniker_marshal_GetUnmarshalClass, + pointer_moniker_marshal_GetMarshalSizeMax, + pointer_moniker_marshal_MarshalInterface, + pointer_moniker_marshal_UnmarshalInterface, + pointer_moniker_marshal_ReleaseMarshalData, + pointer_moniker_marshal_DisconnectObject +}; + /****************************************************************************** * PointerMoniker_Construct (local function) *******************************************************************************/ @@ -549,8 +670,8 @@ static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *pun { TRACE("(%p)\n",This); - /* Initialize the virtual function table. */ This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl; + This->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl; This->ref = 1; if (punk) IUnknown_AddRef(punk); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 231551b244..0e6f2677c5 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2722,16 +2722,18 @@ todo_wine static void test_pointer_moniker(void) { IMoniker *moniker, *moniker2, *prefix, *inverse; + DWORD moniker_type, hash, size; IEnumMoniker *enummoniker; HRESULT hr; - DWORD moniker_type; - DWORD hash; IBindCtx *bindctx; FILETIME filetime; IUnknown *unknown; IStream *stream; IROTData *rotdata; LPOLESTR display_name; + IMarshal *marshal; + LARGE_INTEGER pos; + CLSID clsid; cLocks = 0; @@ -2750,6 +2752,35 @@ todo_wine IUnknown_Release(unknown); } + hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); + ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class.\n"); + + hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); + ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); + ok(size > 0, "Unexpected size %d.\n", size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "Failed to marshal moniker, hr %#x.\n", hr); + + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2); + ok(hr == S_OK, "Failed to unmarshal, hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Expected equal moniker, hr %#x.\n", hr); + IMoniker_Release(moniker2); + + IStream_Release(stream); + + IMarshal_Release(marshal); + ok_more_than_one_lock(); /* Display Name */ @@ -2821,7 +2852,8 @@ todo_wine IMoniker_Release(moniker); - ok_no_locks(); +todo_wine + ok(cLocks == 0, "Number of locks should be 0, but actually is %d.\n", cLocks); hr = CreatePointerMoniker(NULL, &moniker); ok_ole_success(hr, CreatePointerMoniker);

1 0

Francois Gouget : advapi32/tests: Avoid failure when GetServiceKeyName() gets a smart quote.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 82aa066fccc63c8edcb6d9832f4fb48eb0483f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82aa066fccc63c8edcb6d983… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 27 14:22:51 2020 +0100 advapi32/tests: Avoid failure when GetServiceKeyName() gets a smart quote. For non-English languages the Spooler display name may contain non-ASCII characters, typically a smart quote. On Windows 7 GetServiceKeyName() fails when it gets such characters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 3872666085..484167656f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -720,6 +720,17 @@ static void test_get_displayname(void) CloseServiceHandle(scm_handle); } +static int is_printable_ascii_str(const char *s) +{ + while (*s) + { + if (*s < 32 || *s >= 127) + return 0; + s++; + } + return 1; +} + static void test_get_servicekeyname(void) { SC_HANDLE scm_handle, svc_handle; @@ -861,6 +872,14 @@ static void test_get_servicekeyname(void) servicesize = 0; ret = GetServiceKeyNameA(scm_handle, displayname, NULL, &servicesize); ok(!ret, "Expected failure\n"); + if (!is_printable_ascii_str(displayname) && + GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) + { + win_skip("GetServiceKeyName() does not support non-ASCII display names: %s\n", displayname); /* Windows 7 */ + CloseServiceHandle(scm_handle); + return; /* All the tests that follow will fail too */ + } + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());

1 0

Rémi Bernon : include: Add DBG_REPLY_LATER NTSTATUS code.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: e9ec889dbfe3f8398ef5955766b72c16d9681d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ec889dbfe3f8398ef59557… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 29 19:39:31 2020 +0100 include: Add DBG_REPLY_LATER NTSTATUS code. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntstatus.h | 1 + include/winnt.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index 682db7a566..1e46529262 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1408,6 +1408,7 @@ #define DBG_EXCEPTION_HANDLED ((NTSTATUS) 0x00010001) #define DBG_CONTINUE ((NTSTATUS) 0x00010002) +#define DBG_REPLY_LATER ((NTSTATUS) 0x40010001) #define DBG_TERMINATE_THREAD ((NTSTATUS) 0x40010003) #define DBG_TERMINATE_PROCESS ((NTSTATUS) 0x40010004) #define DBG_CONTROL_C ((NTSTATUS) 0x40010005) diff --git a/include/winnt.h b/include/winnt.h index 41fb6a8289..adc5d3d686 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -651,6 +651,7 @@ typedef DWORD FLONG; /* status values for ContinueDebugEvent */ #define DBG_EXCEPTION_HANDLED ((DWORD) 0x00010001) #define DBG_CONTINUE ((DWORD) 0x00010002) +#define DBG_REPLY_LATER ((DWORD) 0x40010001) #define DBG_TERMINATE_THREAD ((DWORD) 0x40010003) #define DBG_TERMINATE_PROCESS ((DWORD) 0x40010004) #define DBG_CONTROL_C ((DWORD) 0x40010005)

1 0

Rémi Bernon : ntdll: Don't change RtlWaitOnAddress size after user invoke_apc.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: d03420da127569f331347d8ea0b1fb8d691df740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03420da127569f331347d8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 29 10:27:27 2020 +0100 ntdll: Don't change RtlWaitOnAddress size after user invoke_apc. This makes the next iteration to immediately return STATUS_SUCCESS because of compare_addr returning FALSE with size == 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0dc6fc3390..c4885973b6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2504,7 +2504,6 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size * but we don't want to wait */ abs_timeout = 0; user_apc = TRUE; - size = 0; } }

1 0

Nikolay Sivov : ole32: Fix (item moniker + antimoniker) composing.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: 3f10a59ff145967429c4384e0313213296ef6523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f10a59ff145967429c4384e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:04 2020 +0300 ole32: Fix (item moniker + antimoniker) composing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 14 ++++++-------- dlls/ole32/tests/moniker.c | 6 +----- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 19876aa363..78b23ae633 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -518,7 +518,7 @@ static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface, IMoniker** ppmkComposite) { HRESULT res=S_OK; - DWORD mkSys,mkSys2; + DWORD mkSys,mkSys2, order; IEnumMoniker* penumMk=0; IMoniker *pmostLeftMk=0; IMoniker* tempMkComposite=0; @@ -530,16 +530,14 @@ static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface, *ppmkComposite=0; - IMoniker_IsSystemMoniker(pmkRight,&mkSys); - - /* If pmkRight is an anti-moniker, the returned moniker is NULL */ - if(mkSys==MKSYS_ANTIMONIKER) - return res; - + if (is_anti_moniker(pmkRight, &order)) + { + return order > 1 ? create_anti_moniker(order - 1, ppmkComposite) : S_OK; + } else /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ - + IMoniker_IsSystemMoniker(pmkRight,&mkSys); if(mkSys==MKSYS_GENERICCOMPOSITE){ res=IMoniker_Enum(pmkRight,TRUE,&penumMk); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 61aa0b4a96..ea1e5b1933 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2414,16 +2414,12 @@ todo_wine anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); -todo_wine - ok(!!moniker2, "Unexpected pointer.\n"); -if (moniker2) -{ TEST_MONIKER_TYPE(moniker2, MKSYS_ANTIMONIKER); hr = IMoniker_Hash(moniker2, &hash); ok(hr == S_OK, "Failed to get hash, hr %#x.\n", hr); ok(hash == 0x80000001, "Unexpected hash.\n"); IMoniker_Release(moniker2); -} + IMoniker_Release(anti); IMoniker_Release(moniker);

1 0

Nikolay Sivov : ole32: Fix (pointer moniker + antimoniker) composing.
by Alexandre Julliard 29 Jan '20

29 Jan '20

Module: wine Branch: master Commit: c94b31ee91804c90eba3fc83194a42265b24e695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94b31ee91804c90eba3fc83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:03 2020 +0300 ole32: Fix (pointer moniker + antimoniker) composing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 17 ++++++++++++++++- dlls/ole32/moniker.h | 2 ++ dlls/ole32/pointermoniker.c | 15 ++++++++------- dlls/ole32/tests/moniker.c | 6 +----- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 93d6ab9d56..6efd4ae853 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -56,6 +56,21 @@ static inline AntiMonikerImpl *impl_from_IROTData(IROTData *iface) static AntiMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); +BOOL is_anti_moniker(IMoniker *iface, DWORD *order) +{ + AntiMonikerImpl *moniker = unsafe_impl_from_IMoniker(iface); + + if (!moniker) + { + *order = 0; + return FALSE; + } + + *order = moniker->count; + + return TRUE; +} + /******************************************************************************* * AntiMoniker_QueryInterface *******************************************************************************/ @@ -607,7 +622,7 @@ static const IROTDataVtbl VT_ROTDataImpl = AntiMonikerROTDataImpl_GetComparisonData }; -static HRESULT create_anti_moniker(DWORD order, IMoniker **ret) +HRESULT create_anti_moniker(DWORD order, IMoniker **ret) { AntiMonikerImpl *moniker; diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index eaeed54a4e..995e0459e5 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -48,5 +48,7 @@ HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) DECLSPEC_HIDDEN; +BOOL is_anti_moniker(IMoniker *iface, DWORD *order) DECLSPEC_HIDDEN; +HRESULT create_anti_moniker(DWORD order, IMoniker **ret) DECLSPEC_HIDDEN; #endif /* __WINE_MONIKER_H__ */ diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 2cb0600336..a16a56a098 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -262,7 +262,7 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, { HRESULT res=S_OK; - DWORD mkSys,mkSys2; + DWORD mkSys,mkSys2, order; IEnumMoniker* penumMk=0; IMoniker *pmostLeftMk=0; IMoniker* tempMkComposite=0; @@ -274,15 +274,15 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, *ppmkComposite=0; - IMoniker_IsSystemMoniker(pmkRight,&mkSys); - - /* If pmkRight is an anti-moniker, the returned moniker is NULL */ - if(mkSys==MKSYS_ANTIMONIKER) - return res; - + if (is_anti_moniker(pmkRight, &order)) + { + return order > 1 ? create_anti_moniker(order - 1, ppmkComposite) : S_OK; + } else + { /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ + IMoniker_IsSystemMoniker(pmkRight,&mkSys); if(mkSys==MKSYS_GENERICCOMPOSITE){ @@ -326,6 +326,7 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, else return MK_E_NEEDGENERIC; + } } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index f5f69870bf..61aa0b4a96 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3072,13 +3072,9 @@ todo_wine anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); -todo_wine - ok(!!moniker2, "Unexpected pointer.\n"); -if (moniker2) -{ TEST_MONIKER_TYPE(moniker2, MKSYS_ANTIMONIKER); IMoniker_Release(moniker2); -} + IMoniker_Release(anti); IMoniker_Release(moniker);

1 0

← Newer
1
2
3
4
5
6
7
8
...
54
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 January 2020