July 2016 - Wine-Commits - list.winehq.org

David Lawrie : dinput: Sort virtual joysticks by name on the Mac.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 49bf4f7eb689ba5ddc11d1e53249c2c1a66daedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49bf4f7eb689ba5ddc11d1e53… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Sun Jul 24 21:38:31 2016 -0500 dinput: Sort virtual joysticks by name on the Mac. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 637692b..24f60d7 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -193,6 +193,38 @@ static long get_device_property_long(IOHIDDeviceRef device, CFStringRef key) return result; } +static CFStringRef copy_device_name(IOHIDDeviceRef device) +{ + CFStringRef name; + + if (device) + { + CFTypeRef ref_name; + + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); + + ref_name = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); + + if (ref_name && CFStringGetTypeID() == CFGetTypeID(ref_name)) + name = CFStringCreateCopy(kCFAllocatorDefault, ref_name); + else + { + long vendID, prodID; + + vendID = get_device_property_long(device, CFSTR(kIOHIDVendorIDKey)); + prodID = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); + name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("0x%04lx 0x%04lx"), vendID, prodID); + } + } + else + { + ERR("NULL device\n"); + name = CFStringCreateCopy(kCFAllocatorDefault, CFSTR("")); + } + + return name; +} + static long get_device_location_ID(IOHIDDeviceRef device) { return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); @@ -203,7 +235,16 @@ static void copy_set_to_array(const void *value, void *context) CFArrayAppendValue(context, value); } -static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) +static CFComparisonResult device_name_comparator(IOHIDDeviceRef device1, IOHIDDeviceRef device2) +{ + CFStringRef name1 = copy_device_name(device1), name2 = copy_device_name(device2); + CFComparisonResult result = CFStringCompare(name1, name2, (kCFCompareForcedOrdering | kCFCompareNumerically)); + CFRelease(name1); + CFRelease(name2); + return result; +} + +static CFComparisonResult device_location_name_comparator(const void *val1, const void *val2, void *context) { IOHIDDeviceRef device1 = (IOHIDDeviceRef)val1, device2 = (IOHIDDeviceRef)val2; long loc1 = get_device_location_ID(device1), loc2 = get_device_location_ID(device2); @@ -212,7 +253,8 @@ static CFComparisonResult device_location_comparator(const void *val1, const voi return kCFCompareLessThan; else if (loc1 > loc2) return kCFCompareGreaterThan; - return kCFCompareEqualTo; + /* virtual joysticks may not have a kIOHIDLocationIDKey and will default to location ID of 0, this orders virtual joysticks by their name */ + return device_name_comparator(device1, device2); } static const char* debugstr_cf(CFTypeRef t) @@ -491,7 +533,7 @@ static int find_osx_devices(void) devices = CFArrayCreateMutable(kCFAllocatorDefault, num_devices, &kCFTypeArrayCallBacks); CFSetApplyFunction(devset, copy_set_to_array, devices); CFRelease(devset); - CFArraySortValues(devices, CFRangeMake(0, num_devices), device_location_comparator, NULL); + CFArraySortValues(devices, CFRangeMake(0, num_devices), device_location_name_comparator, NULL); device_main_elements = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); if (!device_main_elements)

1 0

Nikolay Sivov : msscript: Implement AddObject().
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 82c5d08acc3e1b07ab0d0f7ea425bf14e28c70da URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c5d08acc3e1b07ab0d0f7ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 21 20:34:11 2016 +0300 msscript: Implement AddObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 97 ++++++++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 150 ++++++++++++++++++++++++++++++++++++- 2 files changed, 236 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82c5d08acc3e1b07ab0d0…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.15
by Jeremy Newman July 25, 2016

July 25, 2016

Module: website Branch: master Commit: cc99c98f438f2d1f744f90568fee257206652b1e URL: http://source.winehq.org/git/website.git/?a=commit;h=cc99c98f438f2d1f744f90… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jul 23 07:19:30 2016 +0200 Polish translation for release 1.9.15 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016072201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2016072201.xml b/news/pl/2016072201.xml new file mode 100644 index 0000000..b5f89e6 --- /dev/null +++ b/news/pl/2016072201.xml @@ -0,0 +1,17 @@ +<news> +<date>Lipiec 22, 2016</date> +<title>Wydano Wine 1.9.15</title> +<body> + Wydanie rozwojowe Wine 1.9.15 jest już dostępne. + <a href="{$root}/announce/1.9.15">Co nowego</a> w tym wydaniu: +<ul> + <li>Więcej instrukcji cieniowania w Direct3D.</li> + <li>Poprawa wydajności w GDI.</li> + <li>Lepsza obsługa multi-joystick na macOS.</li> + <li>Ulepszenia w aktywnych skryptach.</li> + <li>Obsługa dodatkowego strumienia w bibliotece uruchomieniowej C++.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.15.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.9.15
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: website Branch: master Commit: b46062c82b18e2d0177a98d726987d4288f995a0 URL: http://source.winehq.org/git/website.git/?a=commit;h=b46062c82b18e2d0177a98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 23:18:07 2016 +0900 Wine release 1.9.15 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016072201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016072201.xml b/news/en/2016072201.xml new file mode 100644 index 0000000..03accb3 --- /dev/null +++ b/news/en/2016072201.xml @@ -0,0 +1,17 @@ +<news> +<date>July 22, 2016</date> +<title>Wine 1.9.15 Released</title> +<body> + The Wine development release 1.9.15 is now available. + <a href="{$root}/announce/1.9.15">What's new</a> in this release: +<ul> + <li>More shader instructions in Direct3D.</li> + <li>Performance improvements in GDI.</li> + <li>Better multi-joystick support on macOS.</li> + <li>Active Scripting improvements.</li> + <li>Additional stream support in the C++ runtime.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.15.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : comctl32/tooltips: Fix TTM_GETMARGIN/ TTM_SETMARGIN handling.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 9618aae324032337098b259ddba939490c9de25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9618aae324032337098b259dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 22 12:51:12 2016 +0300 comctl32/tooltips: Fix TTM_GETMARGIN/TTM_SETMARGIN handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 16 ++++++---------- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 422dd43..feb74ad 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -1010,6 +1010,43 @@ static void test_setinfo(void) DestroyWindow(parent2); } +static void test_margin(void) +{ + RECT r, r1; + HWND hwnd; + DWORD ret; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + ok(hwnd != NULL, "failed to create tooltip wnd\n"); + + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + SetRect(&r, -1, -1, 1, 1); + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, (LPARAM)&r); + ok(!ret, "got %d\n", ret); + + SetRect(&r1, 0, 0, 0, 0); + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); + ok(!ret, "got %d\n", ret); + ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r)); + + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + SetRect(&r1, 0, 0, 0, 0); + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); + ok(!ret, "got %d\n", ret); + ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r)); + + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -1022,4 +1059,5 @@ START_TEST(tooltips) test_longtextW(); test_track(); test_setinfo(); + test_margin(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index eed113e..4944e3b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1323,12 +1323,10 @@ TOOLTIPS_GetDelayTime (const TOOLTIPS_INFO *infoPtr, DWORD duration) static LRESULT -TOOLTIPS_GetMargin (const TOOLTIPS_INFO *infoPtr, LPRECT lpRect) +TOOLTIPS_GetMargin (const TOOLTIPS_INFO *infoPtr, RECT *rect) { - lpRect->left = infoPtr->rcMargin.left; - lpRect->right = infoPtr->rcMargin.right; - lpRect->bottom = infoPtr->rcMargin.bottom; - lpRect->top = infoPtr->rcMargin.top; + if (rect) + *rect = infoPtr->rcMargin; return 0; } @@ -1600,12 +1598,10 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime) static LRESULT -TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *lpRect) +TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *rect) { - infoPtr->rcMargin.left = lpRect->left; - infoPtr->rcMargin.right = lpRect->right; - infoPtr->rcMargin.bottom = lpRect->bottom; - infoPtr->rcMargin.top = lpRect->top; + if (rect) + infoPtr->rcMargin = *rect; return 0; }

1 0

Ken Thomases : winemac: Call -removeFromSuperview on a view before adding it to a superview, on 10.9 and earlier.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 887db3403e53a422ff6c0817b3aa6466ec3ab604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887db3403e53a422ff6c0817b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 22 01:25:06 2016 -0500 winemac: Call -removeFromSuperview on a view before adding it to a superview, on 10.9 and earlier. This works around a Cocoa bug that causes an exception and hang if the view is being re-ordered within its current superview (as opposed to being moved to a new superview). This reverts commit 9fbc364ea103239553701aa9a9932e3fdabcfff6 but adds some conditions around the call to avoid the flicker on platforms where it's unnecessary. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 808a7e7..c6e0709 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3357,6 +3357,10 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma WineWindow* oldWindow = (WineWindow*)[view window]; WineWindow* newWindow = (WineWindow*)[superview window]; +#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 + if (floor(NSAppKitVersionNumber) <= 1265 /*NSAppKitVersionNumber10_9*/) + [view removeFromSuperview]; +#endif if (prev) [superview addSubview:view positioned:NSWindowBelow relativeTo:prev]; else

1 0

Tag wine-1.9.15 : Alexandre Julliard : Release 1.9.15
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: refs/tags/wine-1.9.15 Tag: ae8cea329186309d2201173748c0740ff9e90820 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ae8cea329186309d2201173748c0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 23:16:00 2016 +0900 Release 1.9.15

1 0

Alexandre Julliard : Release 1.9.15.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 267e8e3eeb6d0b6e8ccab809fddd27bae05cbfc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267e8e3eeb6d0b6e8ccab809f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 23:16:00 2016 +0900 Release 1.9.15. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 693 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 344 insertions(+), 372 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=267e8e3eeb6d0b6e8ccab…

1 0

Andrey Gusev : shell32: Use debugstr_guid() and debugstr_w() in TRACE() messages.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 954560f8479fc0c7f7357e4d105d29431d0447d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954560f8479fc0c7f7357e4d1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:11:09 2016 +0300 shell32: Use debugstr_guid() and debugstr_w() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 3 ++- dlls/shell32/shellitem.c | 2 +- dlls/shell32/shfldr_unixfs.c | 10 +++++----- dlls/shell32/shlview.c | 9 +++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 34e5142..cf26caf 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -198,7 +198,8 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN GUID const * riid; LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); + TRACE("(%p) (flags=%u, %s, %u, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), + cchMax, piIndex, pwFlags); if (pwFlags) *pwFlags = 0; diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d688f17..b0af6d6 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -61,7 +61,7 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem2 *iface, REFIID riid, { ShellItem *This = impl_from_IShellItem2(iface); - TRACE("(%p,%p,%p)\n", iface, riid, ppv); + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 884fc0a..9df761f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -2338,22 +2338,22 @@ static HRESULT CreateUnixFolder(IUnknown *outer, REFIID riid, void **ppv, const } HRESULT WINAPI UnixFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixFolder); } HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixDosFolder); } HRESULT WINAPI FolderShortcut_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_FolderShortcut); } HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_MyDocuments); } @@ -2390,7 +2390,7 @@ static void UnixSubFolderIterator_Destroy(UnixSubFolderIterator *iterator) { static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_QueryInterface(IEnumIDList* iface, REFIID riid, void** ppv) { - TRACE("(iface=%p, riid=%p, ppv=%p)\n", iface, riid, ppv); + TRACE("(iface=%p, riid=%s, ppv=%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index b763468..5990982 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3502,8 +3502,8 @@ static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames( ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p, %s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); if (SUCCEEDED(hr)) @@ -3520,8 +3520,9 @@ static HRESULT WINAPI shellfolderviewdual_Invoke(IShellFolderViewDual3 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p, %d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); if (SUCCEEDED(hr))

1 0

Andrey Gusev : ole32: Use debugstr_guid() in TRACE() messages.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 3db78a2bb726492fda9f84b77771724106780e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db78a2bb726492fda9f84b77… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:01:59 2016 +0300 ole32: Use debugstr_guid() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 1bcf58f..877c3ec 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -231,7 +231,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, IClassActivator *pActivator; HRESULT hr; - TRACE("(%p,%p,%p,%p)\n", pbc, pmkToLeft, riid, ppvResult); + TRACE("(%p, %p, %s, %p)\n", pbc, pmkToLeft, debugstr_guid(riid), ppvResult); bindopts.cbStruct = sizeof(bindopts); IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts); @@ -264,7 +264,7 @@ static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface, REFIID riid, VOID** ppvResult) { - TRACE("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); + TRACE("(%p, %p, %s, %p)\n", pbc, pmkToLeft, debugstr_guid(riid), ppvResult); return IMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); } @@ -586,7 +586,7 @@ static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID ClassMoniker *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppvObject); return IMoniker_QueryInterface(&This->IMoniker_iface, riid, ppvObject); }

1 0