August 2020 - Wine-Commits - list.winehq.org

Huw Davies : ole32: Allow Clone to access the original memory block.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 63dd8743352bdf7f1ae4f6244770a45581806126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63dd8743352bdf7f1ae4f624… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 11 12:49:52 2020 +0100 ole32: Allow Clone to access the original memory block. Based on a patch by Dmitry Timoshkov. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/hglobalstream.c | 21 ++++++++++++++++----- dlls/ole32/tests/hglobalstream.c | 12 ------------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index e715cd8950..ee345f6293 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -51,6 +51,11 @@ struct handle_wrapper BOOL delete_on_release; }; +static void handle_addref(struct handle_wrapper *handle) +{ + InterlockedIncrement(&handle->ref); +} + static void handle_release(struct handle_wrapper *handle) { ULONG ref = InterlockedDecrement(&handle->ref); @@ -586,15 +591,21 @@ static HRESULT WINAPI HGLOBALStreamImpl_Clone( IStream* iface, IStream** ppstm) /* [out] */ { - HGLOBALStreamImpl* This = impl_from_IStream(iface); + HGLOBALStreamImpl* This = impl_from_IStream(iface), *clone; ULARGE_INTEGER dummy; LARGE_INTEGER offset; - HRESULT hr; TRACE(" Cloning %p (deleteOnRelease=%d seek position=%ld)\n",iface,This->handle->delete_on_release,(long)This->currentPosition.QuadPart); - hr = CreateStreamOnHGlobal(This->handle->hglobal, FALSE, ppstm); - if(FAILED(hr)) - return hr; + + *ppstm = NULL; + + clone = hglobalstream_construct(); + if (!clone) return E_OUTOFMEMORY; + + *ppstm = &clone->IStream_iface; + handle_addref(This->handle); + clone->handle = This->handle; + offset.QuadPart = (LONGLONG)This->currentPosition.QuadPart; IStream_Seek(*ppstm, offset, STREAM_SEEK_SET, &dummy); return S_OK; diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 1825fa9c1e..87c502dc2f 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -579,14 +579,12 @@ static void test_IStream_Clone(void) stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 13, "unexpected %d\n", size); ok(pos == 0, "unexpected %d\n", pos); buf[0] = 0; hr = IStream_Read(clone, buf, sizeof(buf), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); -todo_wine ok(!strcmp(buf, hello), "wrong stream contents\n"); newsize.QuadPart = 0x8000; @@ -600,9 +598,7 @@ todo_wine stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); -todo_wine ok(pos == 13, "unexpected %d\n", pos); IStream_Release(clone); @@ -671,24 +667,19 @@ todo_wine newsize.QuadPart = 0x8000; hr = IStream_SetSize(clone, newsize); -todo_wine ok(hr == S_OK, "unexpected %#x\n", hr); stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); ok(pos == 0, "unexpected %d\n", pos); hr = IStream_Write(clone, hello, sizeof(hello), NULL); -todo_wine ok(hr == S_OK, "unexpected %#x\n", hr); stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); -todo_wine ok(pos == 13, "unexpected %d\n", pos); offset.QuadPart = 0; @@ -698,14 +689,11 @@ todo_wine buf[0] = 0; hr = IStream_Read(clone, buf, sizeof(buf), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); -todo_wine ok(!strcmp(buf, hello), "wrong stream contents\n"); stream_info(clone, &hmem_clone, &size, &pos); ok(hmem_clone == hmem, "handles should match\n"); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); -todo_wine ok(pos == 32, "unexpected %d\n", pos); ret = IStream_Release(clone);

1 0

Stefan Dösinger : ddraw: Thunk to surface1, not surface7 in surface_unlock.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 6b5ea56905991a37789f1607263e92a23c141d1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5ea56905991a37789f1607… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 11 14:50:43 2020 +0300 ddraw: Thunk to surface1, not surface7 in surface_unlock. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 51 +++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 22bebffce6..83b2114176 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1198,24 +1198,14 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, return ddraw_surface_lock_ddsd(surface, rect, surface_desc, flags, h); } -/***************************************************************************** - * IDirectDrawSurface7::Unlock - * - * Unlocks an locked surface - * - * Params: - * Rect: Not used by this implementation - * - * Returns: - * D3D_OK on success, error code otherwise. - * - *****************************************************************************/ -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) +/* FRAPS hooks IDirectDrawSurface::Unlock and expects the version 1 method to be called when the + * game uses later interfaces. */ +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); HRESULT hr; - TRACE("iface %p, rect %s.\n", iface, wine_dbgstr_rect(pRect)); + TRACE("iface %p, data %p.\n", iface, data); wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); @@ -1226,43 +1216,40 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface return hr; } -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pRect) +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *rect) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, rect %p.\n", iface, pRect); + TRACE("iface %p, rect %s.\n", iface, wine_dbgstr_rect(rect)); - return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, pRect); + return ddraw_surface1_Unlock(&surface->IDirectDrawSurface_iface, NULL); } -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data) +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *rect) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, data %p.\n", iface, data); + TRACE("iface %p, rect %s.\n", iface, wine_dbgstr_rect(rect)); - /* data might not be the LPRECT of later versions, so drop it. */ - return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); + return ddraw_surface1_Unlock(&surface->IDirectDrawSurface_iface, NULL); } -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data) +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); TRACE("iface %p, data %p.\n", iface, data); - /* data might not be the LPRECT of later versions, so drop it. */ - return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); + return ddraw_surface1_Unlock(&surface->IDirectDrawSurface_iface, data); } -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data) +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data) { - struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); TRACE("iface %p, data %p.\n", iface, data); - /* data might not be the LPRECT of later versions, so drop it. */ - return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); + return ddraw_surface1_Unlock(&surface->IDirectDrawSurface_iface, data); } static unsigned int ddraw_swap_interval_from_flags(DWORD flags)

1 0

Nikolay Sivov : combase: Move CoUnmarshalHresult().
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 50d71bb7d2629173bb4597febbd6c3a9f70a101a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d71bb7d2629173bb4597fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 11 08:43:15 2020 +0300 combase: Move CoUnmarshalHresult(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 8 ++++++++ dlls/ole32/marshal.c | 21 --------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f67d6f25e6..56dc63c4f7 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -164,7 +164,7 @@ @ stub CoTestCancel @ stdcall CoUninitialize() ole32.CoUninitialize @ stub CoUnloadingWOW -@ stdcall CoUnmarshalHresult(ptr ptr) ole32.CoUnmarshalHresult +@ stdcall CoUnmarshalHresult(ptr ptr) @ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface @ stub CoVrfCheckThreadState @ stub CoVrfGetThreadState diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index b68efe8c95..dfe6426db9 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -28,3 +28,11 @@ HRESULT WINAPI CoMarshalHresult(IStream *stream, HRESULT hresult) { return IStream_Write(stream, &hresult, sizeof(hresult), NULL); } + +/*********************************************************************** + * CoUnmarshalHresult (combase.@) + */ +HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult) +{ + return IStream_Read(stream, phresult, sizeof(*phresult), NULL); +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d79e86dec2..90d2480595 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2207,24 +2207,3 @@ HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) *ppv = &StdMarshalCF; return S_OK; } - -/*********************************************************************** - * CoUnmarshalHresult [OLE32.@] - * - * Unmarshals an HRESULT value from a stream. - * - * PARAMS - * pStm [I] Stream that hresult will be unmarshalled from. - * phresult [I] Pointer to HRESULT where the value will be unmarshalled to. - * - * RETURNS - * Success: S_OK - * Failure: A COM error code - * - * SEE ALSO - * CoMarshalHresult(). - */ -HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pStm, HRESULT * phresult) -{ - return IStream_Read(pStm, phresult, sizeof(*phresult), NULL); -} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 85ea6dcc8c..001e7b7ad2 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -89,7 +89,7 @@ @ stdcall CoTreatAsClass(ptr ptr) @ stdcall CoUninitialize() @ stub CoUnloadingWOW -@ stdcall CoUnmarshalHresult(ptr ptr) +@ stdcall CoUnmarshalHresult(ptr ptr) combase.CoUnmarshalHresult @ stdcall CoUnmarshalInterface(ptr ptr ptr) @ stdcall CoWaitForMultipleHandles(long long long ptr ptr) @ stdcall CreateAntiMoniker(ptr)

1 0

Nikolay Sivov : combase: Move CoMarshalHresult().
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 654be8258f83ba06a91eef7f35f636934ec00892 URL: https://source.winehq.org/git/wine.git/?a=commit;h=654be8258f83ba06a91eef7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 11 08:43:14 2020 +0300 combase: Move CoMarshalHresult(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 1 + dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 30 ++++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 21 --------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 71537f699b..09e76e48bb 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ combase.c \ errorinfo.c \ malloc.c \ + marshal.c \ roapi.c \ string.c \ usrmarshal.c diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 735c710d7c..f67d6f25e6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -128,7 +128,7 @@ @ stub CoInvalidateRemoteMachineBindings @ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected @ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal -@ stdcall CoMarshalHresult(ptr long) ole32.CoMarshalHresult +@ stdcall CoMarshalHresult(ptr long) @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface @ stub CoPopServiceDomain diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c new file mode 100644 index 0000000000..b68efe8c95 --- /dev/null +++ b/dlls/combase/marshal.c @@ -0,0 +1,30 @@ +/* + * Copyright 2002 Marcus Meissner + * Copyright 2004 Mike Hearn, for CodeWeavers + * Copyright 2004 Rob Shearman, for CodeWeavers + * + * 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 "objbase.h" + +/*********************************************************************** + * CoMarshalHresult (combase.@) + */ +HRESULT WINAPI CoMarshalHresult(IStream *stream, HRESULT hresult) +{ + return IStream_Write(stream, &hresult, sizeof(hresult), NULL); +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index a7401e9095..d79e86dec2 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2208,27 +2208,6 @@ HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) return S_OK; } -/*********************************************************************** - * CoMarshalHresult [OLE32.@] - * - * Marshals an HRESULT value into a stream. - * - * PARAMS - * pStm [I] Stream that hresult will be marshalled into. - * hresult [I] HRESULT to be marshalled. - * - * RETURNS - * Success: S_OK - * Failure: A COM error code - * - * SEE ALSO - * CoUnmarshalHresult(). - */ -HRESULT WINAPI CoMarshalHresult(LPSTREAM pStm, HRESULT hresult) -{ - return IStream_Write(pStm, &hresult, sizeof(hresult), NULL); -} - /*********************************************************************** * CoUnmarshalHresult [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index dfab64a53b..85ea6dcc8c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -57,7 +57,7 @@ @ stdcall CoIsOle1Class (ptr) @ stdcall CoLoadLibrary(wstr long) @ stdcall CoLockObjectExternal(ptr long long) -@ stdcall CoMarshalHresult(ptr long) +@ stdcall CoMarshalHresult(ptr long) combase.CoMarshalHresult @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @ stub CoQueryAuthenticationServices

1 0

Nikolay Sivov : combase: Move StringFromCLSID().
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: f3e949c30b9e282eb0d15f96e850e973699a5d73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3e949c30b9e282eb0d15f96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 11 08:43:11 2020 +0300 combase: Move StringFromCLSID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 10 ++++++++++ dlls/combase/combase.spec | 4 ++-- dlls/ole32/compobj.c | 25 ------------------------- dlls/ole32/ole32.spec | 4 ++-- 4 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 205a27b811..7c6eaec7fa 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1098,6 +1098,16 @@ HRESULT WINAPI IIDFromString(LPCOLESTR str, IID *iid) return guid_from_string(str, iid) ? S_OK : CO_E_IIDSTRING; } +/****************************************************************************** + * StringFromCLSID (combase.@) + */ +HRESULT WINAPI StringFromCLSID(REFCLSID clsid, LPOLESTR *str) +{ + if (!(*str = CoTaskMemAlloc(CHARS_IN_GUID * sizeof(WCHAR)))) return E_OUTOFMEMORY; + StringFromGUID2(clsid, *str, CHARS_IN_GUID); + return S_OK; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c0c1f2ada6..d56294af4d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -318,9 +318,9 @@ @ stub SetCleanupFlag @ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo @ stub SetRestrictedErrorInfo -@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID +@ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 -@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID +@ stdcall StringFromIID(ptr ptr) StringFromCLSID @ stub UpdateDCOMSettings @ stdcall WdtpInterfacePointer_UserFree(ptr) @ stub -arch=win64 WdtpInterfacePointer_UserFree64 diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9715868584..ebcce6d390 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,31 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; } -/****************************************************************************** - * StringFromCLSID [OLE32.@] - * StringFromIID [OLE32.@] - * - * Converts a GUID into the respective string representation. - * The target string is allocated using the OLE IMalloc. - * - * PARAMS - * id [I] the GUID to be converted. - * idstr [O] A pointer to a to-be-allocated pointer pointing to the resulting string. - * - * RETURNS - * S_OK - * E_FAIL - * - * SEE ALSO - * StringFromGUID2, CLSIDFromString - */ -HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) -{ - if (!(*idstr = CoTaskMemAlloc(CHARS_IN_GUID * sizeof(WCHAR)))) return E_OUTOFMEMORY; - StringFromGUID2( id, *idstr, CHARS_IN_GUID ); - return S_OK; -} - /****************************************************************************** * StringFromGUID2 [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index cd530763c2..232ec8d87e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -279,9 +279,9 @@ @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) @ stdcall StgOpenStorageOnILockBytes(ptr ptr long ptr long ptr) @ stdcall StgSetTimes(wstr ptr ptr ptr ) -@ stdcall StringFromCLSID(ptr ptr) +@ stdcall StringFromCLSID(ptr ptr) combase.StringFromCLSID @ stdcall StringFromGUID2(ptr ptr long) -@ stdcall StringFromIID(ptr ptr) StringFromCLSID +@ stdcall StringFromIID(ptr ptr) combase.StringFromIID @ stub UpdateDCOMSettings @ stub UtConvertDvtd16toDvtd32 @ stub UtConvertDvtd32toDvtd16

1 0

Nikolay Sivov : combase: Move IIDFromString().
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: e64908b9a8213aaf1cd28be8f376ef850ec76f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e64908b9a8213aaf1cd28be8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 11 08:43:10 2020 +0300 combase: Move IIDFromString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 23 ++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 108 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 25 insertions(+), 110 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 2bfd1d79a7..205a27b811 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1075,6 +1075,29 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR str, LPCLSID clsid) return hr; } +/****************************************************************************** + * IIDFromString (combase.@) + */ +HRESULT WINAPI IIDFromString(LPCOLESTR str, IID *iid) +{ + TRACE("%s, %p\n", debugstr_w(str), iid); + + if (!str) + { + memset(iid, 0, sizeof(*iid)); + return S_OK; + } + + /* length mismatch is a special case */ + if (lstrlenW(str) + 1 != CHARS_IN_GUID) + return E_INVALIDARG; + + if (str[0] != '{') + return CO_E_IIDSTRING; + + return guid_from_string(str, iid) ? S_OK : CO_E_IIDSTRING; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 97e8f254dc..c0c1f2ada6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -231,7 +231,7 @@ @ stdcall HWND_UserSize(ptr long ptr) @ stdcall HWND_UserUnmarshal(ptr ptr ptr) @ stub HkOleRegisterObject -@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString +@ stdcall IIDFromString(wstr ptr) @ stub InternalAppInvokeExceptionFilter @ stub InternalCCFreeUnused @ stub InternalCCGetClassInformationForDde diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ff0c352c64..9715868584 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,114 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; } -static inline BOOL is_valid_hex(WCHAR c) -{ - if (!(((c >= '0') && (c <= '9')) || - ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) - return FALSE; - return TRUE; -} - -static const BYTE guid_conv_table[256] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ -}; - -/* conversion helper for CLSIDFromString/IIDFromString */ -static BOOL guid_from_string(LPCWSTR s, GUID *id) -{ - int i; - - if (!s || s[0]!='{') { - memset( id, 0, sizeof (CLSID) ); - if(!s) return TRUE; - return FALSE; - } - - TRACE("%s -> %p\n", debugstr_w(s), id); - - /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ - - id->Data1 = 0; - for (i = 1; i < 9; i++) { - if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; - } - if (s[9]!='-') return FALSE; - - id->Data2 = 0; - for (i = 10; i < 14; i++) { - if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; - } - if (s[14]!='-') return FALSE; - - id->Data3 = 0; - for (i = 15; i < 19; i++) { - if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; - } - if (s[19]!='-') return FALSE; - - for (i = 20; i < 37; i+=2) { - if (i == 24) { - if (s[i]!='-') return FALSE; - i++; - } - if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; - } - - if (s[37] == '}' && s[38] == '\0') - return TRUE; - - return FALSE; -} - -/****************************************************************************** - * IIDFromString [OLE32.@] - * - * Converts an interface identifier from its string representation to - * the IID struct. - * - * PARAMS - * idstr [I] The string representation of the GUID. - * id [O] IID converted from the string. - * - * RETURNS - * S_OK on success - * CO_E_IIDSTRING if idstr is not a valid IID - * - * SEE ALSO - * StringFromIID - */ -HRESULT WINAPI IIDFromString(LPCOLESTR s, IID *iid) -{ - TRACE("%s -> %p\n", debugstr_w(s), iid); - - if (!s) - { - memset(iid, 0, sizeof(*iid)); - return S_OK; - } - - /* length mismatch is a special case */ - if (lstrlenW(s) + 1 != CHARS_IN_GUID) - return E_INVALIDARG; - - if (s[0] != '{') - return CO_E_IIDSTRING; - - return guid_from_string(s, iid) ? S_OK : CO_E_IIDSTRING; -} - /****************************************************************************** * StringFromCLSID [OLE32.@] * StringFromIID [OLE32.@] diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index f71fd52032..cd530763c2 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -171,7 +171,7 @@ @ stdcall HWND_UserMarshal(ptr ptr ptr) combase.HWND_UserMarshal @ stdcall HWND_UserSize(ptr long ptr) combase.HWND_UserSize @ stdcall HWND_UserUnmarshal(ptr ptr ptr) combase.HWND_UserUnmarshal -@ stdcall IIDFromString(wstr ptr) +@ stdcall IIDFromString(wstr ptr) combase.IIDFromString @ stub I_RemoteMain @ stdcall IsAccelerator(long long ptr ptr) @ stdcall IsEqualGUID(ptr ptr)

1 0

Nikolay Sivov : combase: Move StringFromGUID2().
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 532df76a0ea1071f268534a46683ef7f1c49a6e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=532df76a0ea1071f268534a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 11 08:43:12 2020 +0300 combase: Move StringFromGUID2(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 12 ++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 28 ---------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7c6eaec7fa..d5f4fad75c 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1108,6 +1108,18 @@ HRESULT WINAPI StringFromCLSID(REFCLSID clsid, LPOLESTR *str) return S_OK; } +/****************************************************************************** + * StringFromGUID2 (combase.@) + */ +INT WINAPI StringFromGUID2(REFGUID guid, LPOLESTR str, INT cmax) +{ + if (!guid || cmax < CHARS_IN_GUID) return 0; + swprintf(str, CHARS_IN_GUID, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, + guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return CHARS_IN_GUID; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index d56294af4d..0b3b32206a 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -319,7 +319,7 @@ @ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo @ stub SetRestrictedErrorInfo @ stdcall StringFromCLSID(ptr ptr) -@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 +@ stdcall StringFromGUID2(ptr ptr long) @ stdcall StringFromIID(ptr ptr) StringFromCLSID @ stub UpdateDCOMSettings @ stdcall WdtpInterfacePointer_UserFree(ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ebcce6d390..e820e82c8a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,34 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; } -/****************************************************************************** - * StringFromGUID2 [OLE32.@] - * - * Modified version of StringFromCLSID that allows you to specify max - * buffer size. - * - * PARAMS - * id [I] GUID to convert to string. - * str [O] Buffer where the result will be stored. - * cmax [I] Size of the buffer in characters. - * - * RETURNS - * Success: The length of the resulting string in characters. - * Failure: 0. - */ -INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) -{ - static const WCHAR formatW[] = { '{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','}',0 }; - if (!id || cmax < CHARS_IN_GUID) return 0; - swprintf( str, CHARS_IN_GUID, formatW, id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return CHARS_IN_GUID; -} - /* open HKCR\\CLSID\\{string form of clsid}\\{keyname} key */ HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 232ec8d87e..b25d710a55 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -280,7 +280,7 @@ @ stdcall StgOpenStorageOnILockBytes(ptr ptr long ptr long ptr) @ stdcall StgSetTimes(wstr ptr ptr ptr ) @ stdcall StringFromCLSID(ptr ptr) combase.StringFromCLSID -@ stdcall StringFromGUID2(ptr ptr long) +@ stdcall StringFromGUID2(ptr ptr long) combase.StringFromGUID2 @ stdcall StringFromIID(ptr ptr) combase.StringFromIID @ stub UpdateDCOMSettings @ stub UtConvertDvtd16toDvtd32

1 0

Nikolay Sivov : combase: Move CoGetDefaultContext().
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: wine Branch: master Commit: 9d0eeff2ca63e9603de44b88e8e8ac520cc45705 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d0eeff2ca63e9603de44b88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 11 08:43:13 2020 +0300 combase: Move CoGetDefaultContext(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 10 ++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 9 --------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index d5f4fad75c..f7c70e1232 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -803,6 +803,16 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) return IObjContext_QueryInterface(context, riid, ppv); } +/*********************************************************************** + * CoGetDefaultContext (combase.@) + */ +HRESULT WINAPI CoGetDefaultContext(APTTYPE type, REFIID riid, void **obj) +{ + FIXME("%d, %s, %p stub\n", type, debugstr_guid(riid), obj); + + return E_NOINTERFACE; +} + /*********************************************************************** * CoGetCallState (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 0b3b32206a..735c710d7c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -105,7 +105,7 @@ @ stdcall CoGetContextToken(ptr) ole32.CoGetContextToken @ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId @ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess -@ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext +@ stdcall CoGetDefaultContext(long ptr ptr) @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index e820e82c8a..33e617cca0 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4262,15 +4262,6 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) return S_OK; } -/*********************************************************************** - * CoGetDefaultContext [OLE32.@] - */ -HRESULT WINAPI CoGetDefaultContext(APTTYPE type, REFIID riid, LPVOID *ppv) -{ - FIXME("%d %s %p stub\n", type, debugstr_guid(riid), ppv); - return E_NOINTERFACE; -} - HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { static const WCHAR wszInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0}; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b25d710a55..dfab64a53b 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -34,7 +34,7 @@ @ stdcall CoGetContextToken(ptr) @ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() -@ stdcall CoGetDefaultContext(long ptr ptr) +@ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr)

1 0

Henri Verbeet : vkd3d-compiler: Add an option to specify the target type.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: vkd3d Branch: master Commit: ea1cb2e699e446d0e97ad80ae3537b07daaf5c98 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea1cb2e699e446d0e97ad80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 15:54:38 2020 +0430 vkd3d-compiler: Add an option to specify the target type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5baaf8a..ed4b0ee 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -131,6 +131,8 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" + " -b <type> Specify the target type. Currently the only valid value\n" + " is 'spirv-binary'.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" @@ -153,6 +155,7 @@ struct options const char *filename; const char *output_filename; enum vkd3d_shader_source_type source_type; + enum vkd3d_shader_target_type target_type; bool print_version; bool print_source_types; bool print_target_types; @@ -222,6 +225,19 @@ static enum vkd3d_shader_source_type parse_source_type(const char *source) return VKD3D_SHADER_SOURCE_NONE; } +static enum vkd3d_shader_target_type parse_target_type(const char *target) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + { + if (!strcmp(target, target_type_info[i].name)) + return target_type_info[i].type; + } + + return VKD3D_SHADER_TARGET_NONE; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_buffer_uav buffer_uav; @@ -241,14 +257,23 @@ static bool parse_command_line(int argc, char **argv, struct options *options) memset(options, 0, sizeof(*options)); options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; for (;;) { - if ((option = getopt_long(argc, argv, "ho:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:ho:Vx:", long_options, NULL)) == -1) break; switch (option) { + case 'b': + if ((options->target_type = parse_target_type(optarg)) == VKD3D_SHADER_TARGET_NONE) + { + fprintf(stderr, "Invalid target type '%s' specified.\n", optarg); + return false; + } + break; + case OPTION_BUFFER_UAV: if (!parse_buffer_uav(&buffer_uav, optarg)) { @@ -391,7 +416,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; - info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + info.target_type = options.target_type; info.options = options.compile_options; info.option_count = options.compile_option_count; info.log_level = VKD3D_SHADER_LOG_INFO;

1 0

Henri Verbeet : vkd3d-shader: Support register spaces for combined samplers.
by Alexandre Julliard Aug. 11, 2020

Aug. 11, 2020

Module: vkd3d Branch: master Commit: 7bae1a606a301750283da957959598689388ee91 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7bae1a606a301750283da95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 11 15:54:39 2020 +0430 vkd3d-shader: Support register spaces for combined samplers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 + libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7bae1a606a301750283…

1 0