April 2016 - Wine-commits - list.winehq.org

Francois Gouget : msi/tests: Spelling fixes for some action and package ok () messages.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 50ab36ac9725920bb7d767ff7048d17e9349bfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ab36ac9725920bb7d767ff7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:55:43 2016 +0200 msi/tests: Spelling fixes for some action and package ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 4 ++-- dlls/msi/tests/package.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 662ed4b..243e61b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5886,7 +5886,7 @@ static void test_publish_components(void) size = 0; r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", "english.txt", INSTALLMODE_DEFAULT, NULL, &size); - ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); ok(res == ERROR_SUCCESS, "components key not created %d\n", res); @@ -5912,7 +5912,7 @@ static void test_publish_components(void) size = 0; r = MsiProvideQualifiedComponentA("{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}", "english.txt", INSTALLMODE_DEFAULT, NULL, &size); - ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); + ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r); if (pRegDeleteKeyExA) res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 60a08ac..6bdacd7 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2482,7 +2482,7 @@ static void test_msipackage(void) r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* database exists, but is emtpy */ + /* database exists, but is empty */ sprintf(name, "#%d", hdb); r = MsiOpenPackageA(name, &hpack); ok(r == ERROR_INSTALL_PACKAGE_INVALID,

1 0

Sebastian Lackner : services: Track services and processes separately.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 37097ce95c449d90f2fc6cce7cbc4f0d0e65ead9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37097ce95c449d90f2fc6cce7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 20 14:51:30 2016 +0200 services: Track services and processes separately. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 37 ++++---- programs/services/services.c | 207 ++++++++++++++++++++++++++----------------- programs/services/services.h | 4 + 3 files changed, 151 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37097ce95c449d90f2fc6…

1 0

Alex Henrie : ole32/tests: Add tests for StgCreatePropStg and StgOpenPropStg.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 6e012b52cd210f16df87961ec58c57179be7046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e012b52cd210f16df87961ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:24 2016 -0600 ole32/tests: Add tests for StgCreatePropStg and StgOpenPropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/stg_prop.c | 166 ++++++++++++++++++++++++++++++++------------ 1 file changed, 123 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e012b52cd210f16df879…

1 0

Alex Henrie : ole32: Implement StgCreatePropStg.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 004e9f94e15020be35763324a8a311dfc3361cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=004e9f94e15020be35763324a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:25 2016 -0600 ole32: Implement StgCreatePropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c836176..7120daf 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -263,6 +263,7 @@ @ stdcall StgCreateDocfile(wstr long long ptr) @ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr) @ stdcall StgCreatePropSetStg(ptr long ptr) +@ stdcall StgCreatePropStg(ptr ptr ptr long long ptr) @ stdcall StgCreateStorageEx(wstr long long long ptr ptr ptr ptr) @ stub StgGetIFillLockBytesOnFile @ stub StgGetIFillLockBytesOnILockBytes diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index da361ce..c3db945 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2767,3 +2767,46 @@ SERIALIZEDPROPERTYVALUE* WINAPI StgConvertVariantToProperty(const PROPVARIANT *p return NULL; } + +HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, + DWORD flags, DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %s %08x %d %p\n", unk, debugstr_guid(fmt), debugstr_guid(clsid), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to create a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructEmpty(stm, fmt, flags, + STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +}

1 0

Alex Henrie : ole32: Implement StgOpenPropStg.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: b045d726314aff340384798463db36044cbaa897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b045d726314aff34038479846… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:26 2016 -0600 ole32: Implement StgOpenPropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7120daf..eab8664 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -270,6 +270,7 @@ @ stdcall StgIsStorageFile(wstr) @ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenAsyncDocfileOnIFillLockBytes +@ stdcall StgOpenPropStg(ptr ptr long long ptr) @ stdcall StgOpenStorage(wstr ptr long ptr long ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) @ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c3db945..04e0244 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2810,3 +2810,46 @@ end: TRACE("returning 0x%08x\n", r); return r; } + +HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, + DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %08x %d %p\n", unk, debugstr_guid(fmt), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to open a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructFromStream(stm, fmt, + STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +}

1 0

Alexandre Julliard : ole32: Fix a couple of reference leaks.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 4f2db2ae0c155600f468f44732179065bf0ef883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2db2ae0c155600f468f4473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 21 17:00:24 2016 +0900 ole32: Fix a couple of reference leaks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 04e0244..8e1aaef 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2063,12 +2063,12 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, hr = PropertyStorage_CreateDictionaries(*pps); if (FAILED(hr)) { - IStream_Release(stm); (*pps)->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&(*pps)->cs); HeapFree(GetProcessHeap(), 0, *pps); *pps = NULL; } + else IStream_AddRef( stm ); return hr; } @@ -2090,11 +2090,7 @@ static HRESULT PropertyStorage_ConstructFromStream(IStream *stm, TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; } - else - { - PropertyStorage_DestroyDictionaries(ps); - HeapFree(GetProcessHeap(), 0, ps); - } + else IPropertyStorage_Release( &ps->IPropertyStorage_iface ); } return hr; } @@ -2222,6 +2218,8 @@ static HRESULT WINAPI IPropertySetStorage_fnCreate( r = PropertyStorage_ConstructEmpty(stm, rfmtid, grfFlags, grfMode, ppprstg); + IStream_Release( stm ); + end: TRACE("returning 0x%08x\n", r); return r; @@ -2267,6 +2265,8 @@ static HRESULT WINAPI IPropertySetStorage_fnOpen( r = PropertyStorage_ConstructFromStream(stm, rfmtid, grfMode, ppprstg); + IStream_Release( stm ); + end: TRACE("returning 0x%08x\n", r); return r; @@ -2804,6 +2804,8 @@ HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, r = PropertyStorage_ConstructEmpty(stm, fmt, flags, STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + + IStream_Release( stm ); } end: @@ -2847,6 +2849,8 @@ HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, r = PropertyStorage_ConstructFromStream(stm, fmt, STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + + IStream_Release( stm ); } end:

1 0

Piotr Caban : gdi32: Use advanced graphics mode when setting world transform in PlayEnhMetaFileRecord.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 69e37ff05e99873d0d55e0b64e66c524a5d23f57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e37ff05e99873d0d55e0b64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 18:35:10 2016 +0200 gdi32: Use advanced graphics mode when setting world transform in PlayEnhMetaFileRecord. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 995997c..32d5e10 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1820,6 +1820,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pBitBlt->offBmiSrc); + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pBitBlt->xformSrc); hBrush = CreateSolidBrush(pBitBlt->crBkColorSrc); @@ -1862,6 +1863,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pStretchBlt->offBmiSrc); + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pStretchBlt->xformSrc); hBrush = CreateSolidBrush(pStretchBlt->crBkColorSrc); @@ -1904,6 +1906,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pAlphaBlend->offBmiSrc); void *bits; + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pAlphaBlend->xformSrc); hBmp = CreateDIBSection(hdc, pbi, pAlphaBlend->iUsageSrc, &bits, NULL, 0); @@ -1929,6 +1932,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pMaskBlt->xformSrc); hBrush = CreateSolidBrush(pMaskBlt->crBkColorSrc); @@ -1977,6 +1981,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( const BITMAPINFO *pbi; POINT pts[3]; + SetGraphicsMode(hdcSrc, GM_ADVANCED); SetWorldTransform(hdcSrc, &pPlgBlt->xformSrc); pts[0].x = pPlgBlt->aptlDest[0].x; pts[0].y = pPlgBlt->aptlDest[0].y;

1 0

Michael Stefaniuc : riched20: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 9b4b75312aaa323e22d2f054388591907c42245a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4b75312aaa323e22d2f0543… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:54:11 2016 +0200 riched20: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f893061..8580539 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -956,7 +956,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.right = rc.left + run->nWidth; rc.top = c->pt.y + para->pt.y + run->pt.y; rc.bottom = rc.top + height; - TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom); + TRACE("rc = %s\n", wine_dbgstr_rect(&rc)); FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible)

1 0

Michael Stefaniuc : gdi32: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 4b7adc087adc95ab11d6f1aded70e111d5af7f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7adc087adc95ab11d6f1ade… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:30:41 2016 +0200 gdi32: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 11 +++++------ dlls/gdi32/region.c | 10 +++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 32d5e10..17ccd1f 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1138,9 +1138,9 @@ BOOL WINAPI PlayEnhMetaFileRecord( rc.top = pExtTextOutA->emrtext.rcl.top; rc.right = pExtTextOutA->emrtext.rcl.right; rc.bottom = pExtTextOutA->emrtext.rcl.bottom; - TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %d, %d - %d, %d. flags %08x\n", + TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %s. flags %08x\n", pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y, - rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions); + wine_dbgstr_rect(&rc), pExtTextOutA->emrtext.fOptions); old_mode = SetGraphicsMode(hdc, pExtTextOutA->iGraphicsMode); /* Reselect the font back into the dc so that the transformation @@ -1174,9 +1174,9 @@ BOOL WINAPI PlayEnhMetaFileRecord( rc.top = pExtTextOutW->emrtext.rcl.top; rc.right = pExtTextOutW->emrtext.rcl.right; rc.bottom = pExtTextOutW->emrtext.rcl.bottom; - TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d. rect = %d, %d - %d, %d. flags %08x\n", + TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d. rect = %s. flags %08x\n", pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y, - rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions); + wine_dbgstr_rect(&rc), pExtTextOutW->emrtext.fOptions); old_mode = SetGraphicsMode(hdc, pExtTextOutW->iGraphicsMode); /* Reselect the font back into the dc so that the transformation @@ -2214,8 +2214,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( tmprc.left = tmprc.top = 0; tmprc.right = tmprc.bottom = 1000; LPtoDP(hdc, (POINT*)&tmprc, 2); - TRACE("L:0,0 - 1000,1000 -> D:%d,%d - %d,%d\n", tmprc.left, - tmprc.top, tmprc.right, tmprc.bottom); + TRACE("L:0,0 - 1000,1000 -> D:%s\n", wine_dbgstr_rect(&tmprc)); return TRUE; } diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index a5df6f1..47daab9 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -422,12 +422,9 @@ static void REGION_DumpRegion(WINEREGION *pReg) { RECT *pRect, *pRectEnd = pReg->rects + pReg->numRects; - TRACE("Region %p: %d,%d - %d,%d %d rects\n", pReg, - pReg->extents.left, pReg->extents.top, - pReg->extents.right, pReg->extents.bottom, pReg->numRects); + TRACE("Region %p: %s %d rects\n", pReg, wine_dbgstr_rect(&pReg->extents), pReg->numRects); for(pRect = pReg->rects; pRect < pRectEnd; pRect++) - TRACE("\t%d,%d - %d,%d\n", pRect->left, pRect->top, - pRect->right, pRect->bottom); + TRACE("\t%s\n", wine_dbgstr_rect(pRect)); return; } @@ -569,8 +566,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect ) rect->top = obj->extents.top; rect->right = obj->extents.right; rect->bottom = obj->extents.bottom; - TRACE("%p (%d,%d-%d,%d)\n", hrgn, - rect->left, rect->top, rect->right, rect->bottom); + TRACE("%p %s\n", hrgn, wine_dbgstr_rect(rect)); ret = get_region_type( obj ); GDI_ReleaseObj(hrgn); return ret;

1 0

Michael Stefaniuc : uxtheme: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 3c3fccacf021a036713619786b5cc7355bbceedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3fccacf021a036713619786… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:46:02 2016 +0200 uxtheme: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index e3d3679..730a26c 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1747,7 +1747,7 @@ HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME hTheme, HDC hdc, int iPartId /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pContentRect)); return S_OK; } @@ -1795,7 +1795,7 @@ HRESULT WINAPI GetThemeBackgroundExtent(HTHEME hTheme, HDC hdc, int iPartId, /* If nothing was found, leave unchanged */ } - TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); + TRACE("%s\n", wine_dbgstr_rect(pExtentRect)); return S_OK; }

1 0