wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Dmitry Timoshkov : gdiplus: Create FontFamily objects only once for the FontCollection.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: b9307cfa61e9884b01d34c2310ec1ffbb1868728 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9307cfa61e9884b01d34c23… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 16:47:24 2020 +0800 gdiplus: Create FontFamily objects only once for the FontCollection. .Net 4.7+ depends on this behaviour and expects to be able to do pointer equality tests for FontFamily objects. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 208 ++++++++++++++++++++-------------------------- dlls/gdiplus/tests/font.c | 6 -- 2 files changed, 89 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9307cfa61e9884b01d3…

1 0

Dmitry Timoshkov : gdiplus/tests: Add tests for FontFamily object management.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 2884da7ef75ea151c2752b7b4210b32a4d3959b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2884da7ef75ea151c2752b7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 16:47:17 2020 +0800 gdiplus/tests: Add tests for FontFamily object management. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 33b75c5bc5..36079fa7ad 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1282,6 +1282,110 @@ static void test_GdipGetFontCollectionFamilyCount(void) ok(status == InvalidParameter, "Unexpected status %d.\n", status); } +static BOOL is_family_in_collection(GpFontCollection *collection, GpFontFamily *family) +{ + GpStatus status; + GpFontFamily **list; + int count, i; + BOOL found = FALSE; + + status = GdipGetFontCollectionFamilyCount(collection, &count); + expect(Ok, status); + + list = GdipAlloc(count * sizeof(GpFontFamily *)); + status = GdipGetFontCollectionFamilyList(collection, count, list, &count); + expect(Ok, status); + + for (i = 0; i < count; i++) + { + if (list[i] == family) + { + found = TRUE; + break; + } + } + + GdipFree(list); + + return found; +} + +static void test_CloneFont(void) +{ + GpStatus status; + GpFontCollection *collection, *collection2; + GpFont *font, *font2; + GpFontFamily *family, *family2; + REAL height; + Unit unit; + int style; + BOOL ret; + + status = GdipNewInstalledFontCollection(&collection); + expect(Ok, status); + + status = GdipNewInstalledFontCollection(&collection2); + expect(Ok, status); + ok(collection == collection2, "got %p\n", collection2); + + status = GdipCreateFontFamilyFromName(nonexistent, NULL, &family); + expect(FontFamilyNotFound, status); + + status = GdipCreateFontFamilyFromName(nonexistent, collection, &family); + expect(FontFamilyNotFound, status); + + status = GdipCreateFontFamilyFromName(Tahoma, NULL, &family); + expect(Ok, status); + + ret = is_family_in_collection(collection, family); +todo_wine + ok(ret, "family is not in collection\n"); + + status = GdipCreateFont(family, 30.0f, FontStyleRegular, UnitPixel, &font); + expect(Ok, status); + + status = GdipGetFontUnit(font, &unit); + expect(Ok, status); + ok(unit == UnitPixel, "got %u\n", unit); + + status = GdipGetFontSize(font, &height); + expect(Ok, status); + ok(height == 30.0f, "got %f\n", height); + + status = GdipGetFontStyle(font, &style); + expect(Ok, status); + ok(style == FontStyleRegular, "got %d\n", style); + + status = GdipGetFamily(font, &family2); + expect(Ok, status); +todo_wine + ok(family == family2, "got %p\n", family2); + + status = GdipCloneFont(font, &font2); + expect(Ok, status); + + status = GdipGetFontUnit(font2, &unit); + expect(Ok, status); + ok(unit == UnitPixel, "got %u\n", unit); + + status = GdipGetFontSize(font2, &height); + expect(Ok, status); + ok(height == 30.0f, "got %f\n", height); + + status = GdipGetFontStyle(font2, &style); + expect(Ok, status); + ok(style == FontStyleRegular, "got %d\n", style); + + status = GdipGetFamily(font2, &family2); + expect(Ok, status); +todo_wine + ok(family == family2, "got %p\n", family2); + + GdipDeleteFont(font2); + GdipDeleteFont(font); + GdipDeleteFontFamily(family); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1301,6 +1405,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_CloneFont(); test_long_name(); test_font_transform(); test_font_substitution();

1 0

Louis Lenders : ntoskrnl.exe: Add stub for RtlIsNtDdiVersionAvailable.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: ba8360be4e32357173b48822ad39da56a2bc6fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba8360be4e32357173b48822… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 30 12:52:57 2020 +0100 ntoskrnl.exe: Add stub for RtlIsNtDdiVersionAvailable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48122 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 36637331c1..c85dbb7a7d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3951,3 +3951,12 @@ PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) TRACE("irp %p.\n", irp); return irp->Tail.Overlay.Thread->kthread.process; } + +/*********************************************************************** + * RtlIsNtDdiVersionAvailable (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG version) +{ + FIXME("stub: %d\n", version); + return FALSE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a39247811e..6b5b127a62 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1117,6 +1117,7 @@ @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) +@ stdcall RtlIsNtDdiVersionAvailable(long) @ stub RtlIsRangeAvailable @ stub RtlIsValidOemCharacter @ stdcall -arch=win32 -ret64 RtlLargeIntegerAdd(int64 int64) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5152a89842..53ea9e17cf 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1694,6 +1694,8 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); + NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); NTSTATUS WINAPI ZwAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); NTSTATUS WINAPI ZwAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);

1 0

Brendan Shanks : user32: Support SetWindowPos() SWP_ASYNCWINDOWPOS flag.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 22e0f03e9290f289c317468533a4d5f86630d56b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e0f03e9290f289c3174685… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 28 14:56:12 2020 -0800 user32: Support SetWindowPos() SWP_ASYNCWINDOWPOS flag. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f759bd10f9..b92a20df18 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2387,7 +2387,10 @@ BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter, if (WIN_IsCurrentThread( hwnd )) return USER_SetWindowPos( &winpos, 0, 0 ); - return SendMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); + if (flags & SWP_ASYNCWINDOWPOS) + return SendNotifyMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); + else + return SendMessageW( winpos.hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)&winpos ); }

1 0

Brendan Shanks : user32: Pack messages sent with SendNotifyMessage().
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: b7121813bc215a92db71ea46b52e78149721c356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7121813bc215a92db71ea46… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 28 14:56:11 2020 -0800 user32: Pack messages sent with SendNotifyMessage(). Allows Wine internal messages with pointer arguments to be sent asynchronously. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1336865112..2717d91dbb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2829,6 +2829,9 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, break; case MSG_NOTIFY: info.flags = ISMEX_NOTIFY; + if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, + &info.msg.lParam, &buffer, size )) + continue; break; case MSG_CALLBACK: info.flags = ISMEX_CALLBACK; @@ -3128,7 +3131,7 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * } memset( &data, 0, sizeof(data) ); - if (info->type == MSG_OTHER_PROCESS) + if (info->type == MSG_OTHER_PROCESS || info->type == MSG_NOTIFY) { *reply_size = pack_message( info->hwnd, info->msg, info->wparam, info->lparam, &data ); if (data.count == -1)

1 0

Zebediah Figura : kernelbase: Use the %I length modifier to print pointer-size integers.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 69996b61307fe7e2764cf06abbdf85639b16f7a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69996b61307fe7e2764cf06a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:16 2020 -0600 kernelbase: Use the %I length modifier to print pointer-size integers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..b125f100f6 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -514,7 +514,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR } break; default: - FIXME("Unsupported attribute %#lx.\n", attrs->attrs[i].attr); + FIXME("Unsupported attribute %#Ix.\n", attrs->attrs[i].attr); break; } }

1 0

Zebediah Figura : ntdll: Support the %I format modifier.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: b41ab972ec7e3da950f0c9e514a5530f48ea931c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41ab972ec7e3da950f0c9e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:15 2020 -0600 ntdll: Support the %I format modifier. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 6 ++++++ dlls/ntdll/tests/string.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index f61441b36b..d5b197396a 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -561,6 +561,12 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis } else if( *(p+1) == '3' && *(p+2) == '2' ) p += 3; + else if( p[1] && strchr( "diouxX", p[1] ) ) + { + if( sizeof(void *) == 8 ) + flags.IntegerDouble = *p; + p++; + } else if( isDigit(*(p+1)) || *(p+1) == 0 ) break; else diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 72428fca91..dfdc4f3140 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1362,7 +1362,7 @@ static void test__snprintf(void) { res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x1234567890, 1); ok(res == strlen(buffer), "wrong size %d\n", res); - todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); } else {

1 0

Zebediah Figura : ntdll/tests: Add more tests for printf format specifiers.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 9c3dcdfb6c36e8301a09f5e13fbec8c37571899d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3dcdfb6c36e8301a09f5e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:14 2020 -0600 ntdll/tests: Add more tests for printf format specifiers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 12027e8899..72428fca91 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1349,7 +1349,28 @@ static void test__snprintf(void) memset(buffer, 0x7c, sizeof(buffer)); res = p__snprintf(buffer, 3, "test"); ok(res == -1, "res = %d\n", res); - } + + res = p__snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + + res = p__snprintf(buffer, sizeof(buffer), "%I32x %d", 0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + + if (sizeof(void *) == 8) + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + } + else + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + } +} static void test__snprintf_s(void) {

1 0

Zebediah Figura : strmbase: Trace the pin and filter names in IPin and IMemInputPin methods.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 6656933d783ed360237962cfe1179c8414df60a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6656933d783ed360237962cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:21 2020 -0600 strmbase: Trace the pin and filter names in IPin and IMemInputPin methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 118 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6656933d783ed3602379…

1 0

Zebediah Figura : strmbase: Trace the filter name in IBaseFilter methods.
by Alexandre Julliard 02 Feb '20

02 Feb '20

Module: wine Branch: master Commit: 1f04af881d34afcd64c32e8d907d48d14e3040bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f04af881d34afcd64c32e8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:20 2020 -0600 strmbase: Trace the filter name in IBaseFilter methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 98ec3c6f44..2809832ee8 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -208,7 +208,7 @@ static HRESULT WINAPI filter_inner_QueryInterface(IUnknown *iface, REFIID iid, v struct strmbase_filter *filter = impl_from_IUnknown(iface); HRESULT hr; - TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + TRACE("filter %p %s, iid %s, out %p.\n", filter, debugstr_w(filter->name), debugstr_guid(iid), out); *out = NULL; @@ -289,12 +289,13 @@ static ULONG WINAPI filter_Release(IBaseFilter *iface) return IUnknown_Release(filter->outer_unk); } -static HRESULT WINAPI filter_GetClassID(IBaseFilter * iface, CLSID * pClsid) +static HRESULT WINAPI filter_GetClassID(IBaseFilter *iface, CLSID *clsid) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, pClsid); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - *pClsid = This->clsid; + TRACE("filter %p %s, clsid %p.\n", filter, debugstr_w(filter->name), clsid); + + *clsid = filter->clsid; return S_OK; } @@ -304,7 +305,7 @@ static HRESULT WINAPI filter_Stop(IBaseFilter *iface) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p.\n", filter); + TRACE("filter %p %s.\n", filter, debugstr_w(filter->name)); EnterCriticalSection(&filter->csFilter); @@ -325,7 +326,7 @@ static HRESULT WINAPI filter_Pause(IBaseFilter *iface) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p.\n", filter); + TRACE("filter %p %s.\n", filter, debugstr_w(filter->name)); EnterCriticalSection(&filter->csFilter); @@ -346,7 +347,7 @@ static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start) struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p, start %s.\n", filter, debugstr_time(start)); + TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), debugstr_time(start)); EnterCriticalSection(&filter->csFilter); @@ -367,7 +368,7 @@ static HRESULT WINAPI filter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_ struct strmbase_filter *filter = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("filter %p, timeout %u, state %p.\n", filter, timeout, state); + TRACE("filter %p %s, timeout %u, state %p.\n", filter, debugstr_w(filter->name), timeout, state); EnterCriticalSection(&filter->csFilter); @@ -384,7 +385,7 @@ static HRESULT WINAPI filter_SetSyncSource(IBaseFilter *iface, IReferenceClock * { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, clock %p.\n", filter, clock); + TRACE("filter %p %s, clock %p.\n", filter, debugstr_w(filter->name), clock); EnterCriticalSection(&filter->csFilter); @@ -403,7 +404,7 @@ static HRESULT WINAPI filter_GetSyncSource(IBaseFilter *iface, IReferenceClock * { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, clock %p.\n", filter, clock); + TRACE("filter %p %s, clock %p.\n", filter, debugstr_w(filter->name), clock); EnterCriticalSection(&filter->csFilter); @@ -420,20 +421,20 @@ static HRESULT WINAPI filter_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); + TRACE("filter %p %s, enum_pins %p.\n", filter, debugstr_w(filter->name), enum_pins); return enum_pins_create(filter, enum_pins); } static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); struct strmbase_pin *pin; unsigned int i; - TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); + TRACE("filter %p %s, id %s, ret %p.\n", filter, debugstr_w(filter->name), debugstr_w(id), ret); - for (i = 0; (pin = This->ops->filter_get_pin(This, i)); ++i) + for (i = 0; (pin = filter->ops->filter_get_pin(filter, i)); ++i) { if (!lstrcmpW(id, pin->name)) { @@ -449,7 +450,7 @@ static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *in { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, info %p.\n", filter, info); + TRACE("filter %p %s, info %p.\n", filter, debugstr_w(filter->name), info); lstrcpyW(info->achName, filter->name); info->pGraph = filter->graph; @@ -464,7 +465,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *g { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("filter %p, graph %p, name %s.\n", filter, graph, debugstr_w(name)); + TRACE("filter %p %s, graph %p, name %s.\n", filter, debugstr_w(filter->name), graph, debugstr_w(name)); EnterCriticalSection(&filter->csFilter); @@ -480,9 +481,12 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *g return S_OK; } -static HRESULT WINAPI filter_QueryVendorInfo(IBaseFilter *iface, WCHAR **pVendorInfo) +static HRESULT WINAPI filter_QueryVendorInfo(IBaseFilter *iface, WCHAR **info) { - TRACE("(%p)->(%p)\n", iface, pVendorInfo); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); + + TRACE("filter %p %s, info %p.\n", filter, debugstr_w(filter->name), info); + return E_NOTIMPL; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020