February 2020 - Wine-commits

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

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

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

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