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

Zhiyi Zhang : user32: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 04d1a184e5db3320243afefb0de1f80fbe8436ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d1a184e5db3320243afefb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:15:55 2020 +0800 user32: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 79f938a3c2..0c0f8fac5d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3369,6 +3369,7 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND if (def_mode) { + memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); if (!EnumDisplaySettingsExW(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) { @@ -3428,6 +3429,8 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, if (lpszDeviceName) RtlCreateUnicodeStringFromAsciiz(&nameW, lpszDeviceName); else nameW.Buffer = NULL; + memset(&devmodeW, 0, sizeof(devmodeW)); + devmodeW.dmSize = sizeof(devmodeW); ret = EnumDisplaySettingsExW(nameW.Buffer,iModeNum,&devmodeW,dwFlags); if (ret) { @@ -4808,6 +4811,7 @@ LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCON &type, (BYTE *)device_name, sizeof(device_name), NULL, 0)) goto done; + memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); if (!EnumDisplaySettingsW(device_name, ENUM_CURRENT_SETTINGS, &devmode)) goto done;

1 0

Zhiyi Zhang : winex11.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 440fab3870b3c9ea778031ec51db69f8c3a687f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=440fab3870b3c9ea778031ec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:16:06 2020 +0800 winex11.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a64d1de650..2d1fc7220d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -501,6 +501,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, if (!dev_mode) { + memset(&registry_mode, 0, sizeof(registry_mode)); registry_mode.dmSize = sizeof(registry_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_REGISTRY_SETTINGS, &registry_mode, 0)) goto done; @@ -512,6 +513,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, displays[display_idx].desired_mode = *dev_mode; if (!(dev_mode->dmFields & DM_POSITION)) { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done; @@ -522,6 +524,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, } else { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done;

1 0

Zhiyi Zhang : winemac.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 6185252bbcd0d871c906d78299a4603f623ba4f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6185252bbcd0d871c906d782… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:16:21 2020 +0800 winemac.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 522ff57d7a..9a80308e89 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -847,6 +847,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (!devname && !devmode) { + memset(&default_mode, 0, sizeof(default_mode)); default_mode.dmSize = sizeof(default_mode); if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) {

1 0

Zhiyi Zhang : explorer: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: c9d2b62926883e7952a4585d09c6aa73335e9ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9d2b62926883e7952a4585d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:16:33 2020 +0800 explorer: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 691db5c8bd..6f1ff54c14 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -889,6 +889,7 @@ static void initialize_display_settings(void) /* Store current display mode in the registry */ ddW.cb = sizeof(ddW); + memset(&dmW, 0, sizeof(dmW)); dmW.dmSize = sizeof(dmW); while (EnumDisplayDevicesW( NULL, i++, &ddW, 0 )) {

1 0

Dmitry Timoshkov : ole32/tests: Add tests for HGLOBAL based IStream::Clone.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 3f4f6fca3ce6484c4918be9db57047176a8388e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4f6fca3ce6484c4918be9d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 11 12:49:48 2020 +0100 ole32/tests: Add tests for HGLOBAL based IStream::Clone. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/hglobalstream.c | 199 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 6a0498aa60..1825fa9c1e 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -2,6 +2,7 @@ * Stream on HGLOBAL Tests * * Copyright 2006 Robert Shearman (for CodeWeavers) + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -514,9 +515,207 @@ static void test_freed_hglobal(void) IStream_Release(pStream); } +static void stream_info(IStream *stream, HGLOBAL *hmem, int *size, int *pos) +{ + HRESULT hr; + STATSTG stat; + LARGE_INTEGER offset; + ULARGE_INTEGER newpos; + + *hmem = 0; + *size = *pos = -1; + + hr = GetHGlobalFromStream(stream, hmem); + ok(hr == S_OK, "unexpected %#x\n", hr); + + memset(&stat, 0x55, sizeof(stat)); + hr = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); + ok(hr == S_OK, "unexpected %#x\n", hr); + ok(stat.type == STGTY_STREAM, "unexpected %#x\n", stat.type); + ok(!stat.pwcsName, "unexpected %p\n", stat.pwcsName); + ok(IsEqualIID(&stat.clsid, &GUID_NULL), "unexpected %s\n", wine_dbgstr_guid(&stat.clsid)); + ok(!stat.cbSize.HighPart, "unexpected %#x\n", stat.cbSize.HighPart); + *size = stat.cbSize.LowPart; + + offset.QuadPart = 0; + hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &newpos); + ok(hr == S_OK, "unexpected %#x\n", hr); + ok(!newpos.HighPart, "unexpected %#x\n", newpos.HighPart); + *pos = newpos.LowPart; +} + +static void test_IStream_Clone(void) +{ + static const char hello[] = "Hello World!"; + char buf[32]; + HRESULT hr; + IStream *stream, *clone; + HGLOBAL orig_hmem, hmem, hmem_clone; + ULARGE_INTEGER newsize; + LARGE_INTEGER offset; + int size, pos, ret; + + /* test simple case for Clone */ + orig_hmem = GlobalAlloc(GMEM_MOVEABLE, 0); + ok(orig_hmem != 0, "unexpected %p\n", orig_hmem); + hr = CreateStreamOnHGlobal(orig_hmem, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 0, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Write(stream, hello, sizeof(hello), NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 13, "unexpected %d\n", size); + ok(pos == 13, "unexpected %d\n", pos); + + 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; + hr = IStream_SetSize(stream, newsize); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 13, "unexpected %d\n", pos); + + 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); + IStream_Release(stream); + + /* exploit GMEM_FIXED forced move for the same base streams */ + orig_hmem = GlobalAlloc(GMEM_FIXED, 1); + ok(orig_hmem != 0, "unexpected %p\n", orig_hmem); + hr = CreateStreamOnHGlobal(orig_hmem, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 1, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); + ok(size == 1, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + newsize.QuadPart = 0x8000; + hr = IStream_SetSize(stream, newsize); +todo_wine + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem != 0, "unexpected %p\n", hmem); +todo_wine + ok(hmem != orig_hmem, "unexpected %p\n", hmem); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + 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); + + IStream_Release(stream); + IStream_Release(clone); + + /* test Release of cloned stream */ + hr = CreateStreamOnHGlobal(0, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem != 0, "unexpected %p\n", hmem); + ok(size == 0, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); + ok(size == 0, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + ret = IStream_Release(stream); + ok(ret == 0, "unexpected %d\n", ret); + + 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; + hr = IStream_Seek(clone, offset, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); + + 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); + ok(ret == 0, "unexpected %d\n", ret); +} + START_TEST(hglobalstream) { test_streamonhglobal(); test_copyto(); test_freed_hglobal(); + test_IStream_Clone(); }

1 0

Huw Davies : ole32: Add a structure to hold memory block information.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 54b6cbc287025a6c7745830b983eb067f4a64427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b6cbc287025a6c7745830b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 11 12:49:49 2020 +0100 ole32: Add a structure to hold memory block information. Based on a patch by Dmitry Timoshkov which was based on a suggestion by Sebastian Lackner. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/hglobalstream.c | 102 ++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 6133690d9d..300119dcc7 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -5,6 +5,7 @@ * for streams contained supported by an HGLOBAL pointer. * * Copyright 1999 Francis Beaudet + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,6 +43,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); +struct handle_wrapper +{ + HGLOBAL hglobal; + ULONG size; + BOOL delete_on_release; +}; + +static void handle_release(struct handle_wrapper *handle) +{ + if (handle->delete_on_release) GlobalFree(handle->hglobal); + HeapFree(GetProcessHeap(), 0, handle); +} + +static struct handle_wrapper *handle_create(HGLOBAL hglobal, BOOL delete_on_release) +{ + struct handle_wrapper *handle; + + handle = HeapAlloc(GetProcessHeap(), 0, sizeof(*handle)); + if (!handle) return NULL; + + /* allocate a handle if one is not supplied */ + if (!hglobal) hglobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | GMEM_SHARE, 0); + if (!hglobal) + { + HeapFree(GetProcessHeap(), 0, handle); + return NULL; + } + handle->hglobal = hglobal; + handle->size = GlobalSize(hglobal); + handle->delete_on_release = delete_on_release; + + return handle; +} + /**************************************************************************** * HGLOBALStreamImpl definition. * @@ -53,14 +88,7 @@ typedef struct IStream IStream_iface; LONG ref; - /* support for the stream */ - HGLOBAL supportHandle; - - /* if TRUE the HGLOBAL is destroyed when the stream is finally released */ - BOOL deleteOnRelease; - - /* size of the stream */ - ULARGE_INTEGER streamSize; + struct handle_wrapper *handle; /* current position of the cursor */ ULARGE_INTEGER currentPosition; @@ -112,12 +140,7 @@ static ULONG WINAPI HGLOBALStreamImpl_Release( if (!ref) { - if (This->deleteOnRelease) - { - GlobalFree(This->supportHandle); - This->supportHandle = NULL; - } - + handle_release(This->handle); HeapFree(GetProcessHeap(), 0, This); } @@ -159,15 +182,15 @@ static HRESULT WINAPI HGLOBALStreamImpl_Read( * Using the known size of the stream, calculate the number of bytes * to read from the block chain */ - bytesToReadFromBuffer = min( This->streamSize.u.LowPart - This->currentPosition.u.LowPart, cb); + bytesToReadFromBuffer = min( This->handle->size - This->currentPosition.u.LowPart, cb); /* * Lock the buffer in position and copy the data. */ - supportBuffer = GlobalLock(This->supportHandle); + supportBuffer = GlobalLock(This->handle->hglobal); if (!supportBuffer) { - WARN("read from invalid hglobal %p\n", This->supportHandle); + WARN("read from invalid hglobal %p\n", This->handle->hglobal); *pcbRead = 0; return S_OK; } @@ -187,7 +210,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Read( /* * Cleanup */ - GlobalUnlock(This->supportHandle); + GlobalUnlock(This->handle->hglobal); /* * Always returns S_OK even if the end of the stream is reached before the @@ -239,7 +262,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( /* * Verify if we need to grow the stream */ - if (newSize.u.LowPart > This->streamSize.u.LowPart) + if (newSize.u.LowPart > This->handle->size) { /* grow stream */ HRESULT hr = IStream_SetSize(iface, newSize); @@ -253,10 +276,10 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( /* * Lock the buffer in position and copy the data. */ - supportBuffer = GlobalLock(This->supportHandle); + supportBuffer = GlobalLock(This->handle->hglobal); if (!supportBuffer) { - WARN("write to invalid hglobal %p\n", This->supportHandle); + WARN("write to invalid hglobal %p\n", This->handle->hglobal); return S_OK; } @@ -270,7 +293,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( /* * Cleanup */ - GlobalUnlock(This->supportHandle); + GlobalUnlock(This->handle->hglobal); out: /* @@ -316,7 +339,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( case STREAM_SEEK_CUR: break; case STREAM_SEEK_END: - newPosition = This->streamSize; + newPosition.QuadPart = This->handle->size; break; default: hr = STG_E_SEEKERROR; @@ -369,19 +392,19 @@ static HRESULT WINAPI HGLOBALStreamImpl_SetSize( * HighPart is ignored as shown in tests */ - if (This->streamSize.u.LowPart == libNewSize.u.LowPart) + if (This->handle->size == libNewSize.u.LowPart) return S_OK; /* * Re allocate the HGlobal to fit the new size of the stream. */ - supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0); + supportHandle = GlobalReAlloc(This->handle->hglobal, libNewSize.u.LowPart, 0); if (supportHandle == 0) return E_OUTOFMEMORY; - This->supportHandle = supportHandle; - This->streamSize.u.LowPart = libNewSize.u.LowPart; + This->handle->hglobal = supportHandle; + This->handle->size = libNewSize.u.LowPart; return S_OK; } @@ -531,7 +554,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_Stat( pstatstg->pwcsName = NULL; pstatstg->type = STGTY_STREAM; - pstatstg->cbSize = This->streamSize; + pstatstg->cbSize.QuadPart = This->handle->size; return S_OK; } @@ -545,8 +568,8 @@ static HRESULT WINAPI HGLOBALStreamImpl_Clone( LARGE_INTEGER offset; HRESULT hr; - TRACE(" Cloning %p (deleteOnRelease=%d seek position=%ld)\n",iface,This->deleteOnRelease,(long)This->currentPosition.QuadPart); - hr = CreateStreamOnHGlobal(This->supportHandle, FALSE, ppstm); + 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; offset.QuadPart = (LONGLONG)This->currentPosition.QuadPart; @@ -591,22 +614,17 @@ HRESULT WINAPI CreateStreamOnHGlobal( This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; This->ref = 1; - /* initialize the support */ - This->supportHandle = hGlobal; - This->deleteOnRelease = fDeleteOnRelease; - - /* allocate a handle if one is not supplied */ - if (!This->supportHandle) - This->supportHandle = GlobalAlloc(GMEM_MOVEABLE|GMEM_NODISCARD|GMEM_SHARE, 0); + This->handle = handle_create(hGlobal, fDeleteOnRelease); + if (!This->handle) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } /* start at the beginning */ This->currentPosition.u.HighPart = 0; This->currentPosition.u.LowPart = 0; - /* initialize the size of the stream to the size of the handle */ - This->streamSize.u.HighPart = 0; - This->streamSize.u.LowPart = GlobalSize(This->supportHandle); - *ppstm = &This->IStream_iface; return S_OK; @@ -628,7 +646,7 @@ HRESULT WINAPI GetHGlobalFromStream(IStream* pstm, HGLOBAL* phglobal) * Verify that the stream object was created with CreateStreamOnHGlobal. */ if (pStream->IStream_iface.lpVtbl == &HGLOBALStreamImplVtbl) - *phglobal = pStream->supportHandle; + *phglobal = pStream->handle->hglobal; else { *phglobal = 0;

1 0

Huw Davies : ole32: Add a ref-count to the handle structure.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: fe3421ba2c863993bb411b0bd4d5b6b2ed4b956e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe3421ba2c863993bb411b0b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 11 12:49:50 2020 +0100 ole32: Add a ref-count to the handle structure. 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 300119dcc7..8fd1e03913 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); struct handle_wrapper { + LONG ref; HGLOBAL hglobal; ULONG size; BOOL delete_on_release; @@ -52,8 +53,13 @@ struct handle_wrapper static void handle_release(struct handle_wrapper *handle) { + ULONG ref = InterlockedDecrement(&handle->ref); + + if (!ref) + { if (handle->delete_on_release) GlobalFree(handle->hglobal); HeapFree(GetProcessHeap(), 0, handle); + } } static struct handle_wrapper *handle_create(HGLOBAL hglobal, BOOL delete_on_release) @@ -70,6 +76,7 @@ static struct handle_wrapper *handle_create(HGLOBAL hglobal, BOOL delete_on_rele HeapFree(GetProcessHeap(), 0, handle); return NULL; } + handle->ref = 1; handle->hglobal = hglobal; handle->size = GlobalSize(hglobal); handle->delete_on_release = delete_on_release;

1 0

Huw Davies : ole32: Add a constructor helper.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: f946aa5b7f185faaff163dd9ceddd0e97fbf5070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f946aa5b7f185faaff163dd9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 11 12:49:51 2020 +0100 ole32: Add a constructor helper. 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 | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 8fd1e03913..e715cd8950 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -106,6 +106,22 @@ static inline HGLOBALStreamImpl *impl_from_IStream(IStream *iface) return CONTAINING_RECORD(iface, HGLOBALStreamImpl, IStream_iface); } +static const IStreamVtbl HGLOBALStreamImplVtbl; + +static HGLOBALStreamImpl *hglobalstream_construct(void) +{ + HGLOBALStreamImpl *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + + if (This) + { + This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; + This->ref = 1; + This->handle = NULL; + This->currentPosition.QuadPart = 0; + } + return This; +} + static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( IStream* iface, REFIID riid, /* [in] */ @@ -615,12 +631,9 @@ HRESULT WINAPI CreateStreamOnHGlobal( if (!ppstm) return E_INVALIDARG; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALStreamImpl)); + This = hglobalstream_construct(); if (!This) return E_OUTOFMEMORY; - This->IStream_iface.lpVtbl = &HGLOBALStreamImplVtbl; - This->ref = 1; - This->handle = handle_create(hGlobal, fDeleteOnRelease); if (!This->handle) { @@ -628,10 +641,6 @@ HRESULT WINAPI CreateStreamOnHGlobal( return E_OUTOFMEMORY; } - /* start at the beginning */ - This->currentPosition.u.HighPart = 0; - This->currentPosition.u.LowPart = 0; - *ppstm = &This->IStream_iface; return S_OK;

1 0

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

11 Aug '20

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

Dmitry Timoshkov : ole32: Allow SetSize to move a fixed memory block.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 6faa530e1286e40b0749adbae9ab538020bc9d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6faa530e1286e40b0749adba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 11 12:49:53 2020 +0100 ole32: Allow SetSize to move a fixed memory block. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/tests/hglobalstream.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ee345f6293..4590bb9c43 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -426,7 +426,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_SetSize( /* * Re allocate the HGlobal to fit the new size of the stream. */ - supportHandle = GlobalReAlloc(This->handle->hglobal, libNewSize.u.LowPart, 0); + supportHandle = GlobalReAlloc(This->handle->hglobal, libNewSize.u.LowPart, GMEM_MOVEABLE); if (supportHandle == 0) return E_OUTOFMEMORY; diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 87c502dc2f..2f386914af 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -625,20 +625,16 @@ static void test_IStream_Clone(void) newsize.QuadPart = 0x8000; hr = IStream_SetSize(stream, newsize); -todo_wine ok(hr == S_OK, "unexpected %#x\n", hr); stream_info(stream, &hmem, &size, &pos); ok(hmem != 0, "unexpected %p\n", hmem); -todo_wine ok(hmem != orig_hmem, "unexpected %p\n", hmem); -todo_wine ok(size == 0x8000, "unexpected %#x\n", size); ok(pos == 0, "unexpected %d\n", pos); 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);

1 0