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

Brendan Shanks : include: Fix size of tomConstants enum.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 4aaa9196cdaf04281aff0e9f1b3efa3c1451160e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaa9196cdaf04281aff0e9f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:55:53 2020 -0800 include: Fix size of tomConstants enum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e408452a4fa8b4b1e02ec4bb16cba6822200b61) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/tom.idl | 342 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 171 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4aaa9196cdaf04281aff…

1 0

Brendan Shanks : include: Fix size of RecordCreateOptionsEnum.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: c2a28685d9d42898fb51c434fae484c4a4f58556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a28685d9d42898fb51c434… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:57:02 2020 -0800 include: Fix size of RecordCreateOptionsEnum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 61d0cc78b24cf591746ab62d21259fe3b8e4d7e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msado15_backcompat.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..68fda6ab21 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -430,12 +430,12 @@ typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum { - adCreateCollection = 0x00002000, - adCreateStructDoc = 0x80000000, - adCreateNonCollection = 0x00000000, - adOpenIfExists = 0x02000000, - adCreateOverwrite = 0x04000000, - adFailIfNotExists = -1 + adCreateCollection = (int) 0x00002000, + adCreateStructDoc = (int) 0x80000000, + adCreateNonCollection = (int) 0x00000000, + adOpenIfExists = (int) 0x02000000, + adCreateOverwrite = (int) 0x04000000, + adFailIfNotExists = (int) -1 } RecordCreateOptionsEnum; typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum

1 0

Dmitry Timoshkov : user32/tests: Add some tests for classes with non-zero low word instance.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 9e2ca4bae54823daeede530a0c8726365055551f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e2ca4bae54823daeede530a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:29:54 2020 +0800 user32/tests: Add some tests for classes with non-zero low word instance. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2c0f51312b367989def1c4dd850aac796bd0943) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/class.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2702fa00b9..67c95225f4 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -98,6 +98,7 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) LONG i; WCHAR str[20]; ATOM classatom; + HINSTANCE hInstance2; cls.style = CS_HREDRAW | CS_VREDRAW | (global?CS_GLOBALCLASS:0); cls.lpfnWndProc = ClassTest_WndProc; @@ -121,6 +122,26 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) "RegisterClass of the same class should fail for the second time\n"); /* Setup windows */ + hInstance2 = (HINSTANCE)(((ULONG_PTR)hInstance & ~0xffff) | 0xdead); + + hTestWnd = CreateWindowW (className, winName, + WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, + 0, hInstance2, 0); +todo_wine_if (!global) + ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); + +todo_wine_if (!global) + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p != %p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); +todo_wine_if (!global) + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, + "Wrong GWL instance %p != %p\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); + + DestroyWindow(hTestWnd); + hTestWnd = CreateWindowW (className, winName, WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, @@ -128,6 +149,14 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) ok(hTestWnd!=0, "Failed to create window\n"); + ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, + "Wrong GCL instance %p/%p\n", + (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); + ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance, + "Wrong GWL instance %p/%p\n", + (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance); + + /* test initial values of valid classwords */ for(i=0; i<NUMCLASSWORDS; i++) { @@ -1491,6 +1520,8 @@ START_TEST(class) ClassTest(hInstance,FALSE); ClassTest(hInstance,TRUE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), FALSE); + ClassTest((HANDLE)((ULONG_PTR)hInstance | 0x1234), TRUE); CreateDialogParamTest(hInstance); test_styles(); test_builtinproc();

1 0

Dmitry Timoshkov : server: Ignore low word of a class instance when looking up for a window class.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 6961e627c1ec115e7dab262459911f061a5706b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6961e627c1ec115e7dab2624… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 19 12:30:33 2020 +0800 server: Ignore low word of a class instance when looking up for a window class. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ac2ba3e3cb8110c59071ab57098116a85427589) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/class.c | 3 --- server/class.c | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 67c95225f4..51bc116908 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -128,14 +128,11 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, 0, hInstance2, 0); -todo_wine_if (!global) ok(hTestWnd != 0, "Failed to create window for hInstance %p\n", hInstance2); -todo_wine_if (!global) ok((HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE) == hInstance, "Wrong GCL instance %p != %p\n", (HINSTANCE)GetClassLongPtrA(hTestWnd, GCLP_HMODULE), hInstance); -todo_wine_if (!global) ok((HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE) == hInstance2, "Wrong GWL instance %p != %p\n", (HINSTANCE)GetWindowLongPtrA(hTestWnd, GWLP_HINSTANCE), hInstance2); diff --git a/server/class.c b/server/class.c index b8240bd568..92cbfa2d7e 100644 --- a/server/class.c +++ b/server/class.c @@ -100,9 +100,12 @@ static struct window_class *find_class( struct process *process, atom_t atom, mo LIST_FOR_EACH( ptr, &process->classes ) { + int is_win16; struct window_class *class = LIST_ENTRY( ptr, struct window_class, entry ); if (class->atom != atom) continue; - if (!instance || !class->local || class->instance == instance) return class; + is_win16 = !(class->instance >> 16); + if (!instance || !class->local || class->instance == instance || + (!is_win16 && ((class->instance & ~0xffff) == (instance & ~0xffff)))) return class; } return NULL; }

1 0

Hans Leidekker : wbemprox: Implement Win32_DesktopMonitor.Name.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 6fc30a3235d743f8fa506ee22e25fe212ebe9eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fc30a3235d743f8fa506ee2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 25 11:39:52 2020 +0100 wbemprox: Implement Win32_DesktopMonitor.Name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48646 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9631a526cfae1bd24d0bc855a5f94e6d80d161af) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1f8afb46fe..fcabd06837 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -543,6 +543,7 @@ static const struct column col_datafile[] = }; static const struct column col_desktopmonitor[] = { + { prop_nameW, CIM_STRING }, { prop_pixelsperxlogicalinchW, CIM_UINT32 } }; static const struct column col_directory[] = @@ -1022,6 +1023,7 @@ struct record_datafile }; struct record_desktopmonitor { + const WCHAR *name; UINT32 pixelsperxlogicalinch; }; struct record_directory @@ -2413,6 +2415,7 @@ static enum fill_status fill_desktopmonitor( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_desktopmonitor *)table->data; + rec->name = L"Generic Non-PnP Monitor"; rec->pixelsperxlogicalinch = get_pixelsperxlogicalinch(); if (match_row( table, row, cond, &status )) row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 40eaefee4c..0212cdcb69 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1710,6 +1710,32 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DesktopMonitor( IWbemServices *services ) +{ + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"PixelsPerXlogicalInch", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { static const WCHAR bitsperpixelW[] = @@ -1835,6 +1861,7 @@ START_TEST(query) test_Win32_ComputerSystem( services ); test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); + test_Win32_DesktopMonitor( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services );

1 0

Alistair Leslie-Hughes : dmstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: b4c777d165822432569602d121fa22977f964ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c777d165822432569602d1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 26 04:19:29 2020 +0000 dmstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48648 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79b91eaf28f449ce0d03dde1130cb238e064f093) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/style.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 3e480028b9..5a97dac079 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -151,11 +151,17 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, - IDirectMusicBand **ppBand) + IDirectMusicBand **band) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p): stub\n", This, ppBand); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + FIXME("(%p, %p): stub\n", This, band); + + if (!band) + return E_POINTER; + + *band = NULL; + + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index,

1 0

Paul Gofman : iphlpapi: Support InitialNotification flag in NotifyUnicastIpAddressChange().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 3020b07c4b03f9baff73c3961e05c27547c97494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3020b07c4b03f9baff73c396… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Feb 27 14:10:32 2020 +0300 iphlpapi: Support InitialNotification flag in NotifyUnicastIpAddressChange(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48669 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5cdd3848f500350dd02e3b8f6d87766c3689f48a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 6 +++++- dlls/iphlpapi/tests/iphlpapi.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8c7c9018c4..8338a7f025 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2791,9 +2791,13 @@ DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped) DWORD WINAPI NotifyUnicastIpAddressChange(ADDRESS_FAMILY family, PUNICAST_IPADDRESS_CHANGE_CALLBACK callback, PVOID context, BOOLEAN init_notify, PHANDLE handle) { - FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): semi-stub\n", family, callback, context, init_notify, handle); if (handle) *handle = NULL; + + if (init_notify) + callback(context, NULL, MibInitialNotification); + return ERROR_NOT_SUPPORTED; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1b0bc9383a..02bb783efd 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -100,6 +100,9 @@ static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,USHORT*,BYTE*); +static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK, + PVOID, BOOLEAN, HANDLE *); +static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -158,6 +161,8 @@ static void loadIPHlpApi(void) pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); + pNotifyUnicastIpAddressChange = (void *)GetProcAddress(hLibrary, "NotifyUnicastIpAddressChange"); + pCancelMibChangeNotify2 = (void *)GetProcAddress(hLibrary, "CancelMibChangeNotify2"); } } @@ -2381,6 +2386,41 @@ static void test_ParseNetworkString(void) } } +static void WINAPI test_ipaddtess_change_callback(PVOID context, PMIB_UNICASTIPADDRESS_ROW row, + MIB_NOTIFICATION_TYPE notification_type) +{ + BOOL *callback_called = context; + + *callback_called = TRUE; + + ok(notification_type == MibInitialNotification, "Unexpected notification_type %#x.\n", + notification_type); + ok(!row, "Unexpected row %p.\n", row); +} + +static void test_NotifyUnicastIpAddressChange(void) +{ + BOOL callback_called; + HANDLE handle; + DWORD ret; + + if (!pNotifyUnicastIpAddressChange) + { + win_skip("NotifyUnicastIpAddressChange not available.\n"); + return; + } + + callback_called = FALSE; + ret = pNotifyUnicastIpAddressChange(AF_INET, test_ipaddtess_change_callback, + &callback_called, TRUE, &handle); + todo_wine ok(ret == NO_ERROR, "Unexpected ret %#x.\n", ret); + ok(callback_called, "Callback was not called.\n"); + + ret = pCancelMibChangeNotify2(handle); + ok(ret == NO_ERROR, "Unexpected ret %#x.\n", ret); + ok(!CloseHandle(handle), "CloseHandle() succeded.\n"); +} + START_TEST(iphlpapi) { @@ -2411,6 +2451,7 @@ START_TEST(iphlpapi) test_ConvertLengthToIpv4Mask(); test_GetUdp6Table(); test_ParseNetworkString(); + test_NotifyUnicastIpAddressChange(); freeIPHlpApi(); } }

1 0

Damjan Jovanovic : gdiplus: In CompositingModeSourceCopy, fully transparent pixels are drawn black.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 79b2c4a97d6fbcd45dd8c07b4b326ad3b9ef36c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79b2c4a97d6fbcd45dd8c07b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Mar 5 03:35:40 2020 +0200 gdiplus: In CompositingModeSourceCopy, fully transparent pixels are drawn black. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42585 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99a171981cc42970f0caee69e1ceb0e810d5955f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 7 ++++++- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e485e5c99f..810300ae59 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -384,7 +384,12 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ src_color = ((ARGB*)(src + src_stride * y))[x]; if (comp_mode == CompositingModeSourceCopy) - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, src_color); + { + if (!(src_color & 0xff000000)) + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, 0); + else + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, src_color); + } else { if (!(src_color & 0xff000000)) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 62cd79fec6..ad941d266f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4208,7 +4208,7 @@ static void test_DrawImage_SourceCopy(void) expect(0, dst_pixels[0]); expect(0xffff0000, dst_pixels[1]); expect(0, dst_pixels[2]); - todo_wine expect(0, dst_pixels[3]); + expect(0, dst_pixels[3]); status = GdipDeleteGraphics(graphics); expect(Ok, status);

1 0

Aaro Altonen : kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: a7549d9df7cac2147981c70a58278679a96619e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7549d9df7cac2147981c70a… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 4 09:47:51 2020 +0200 kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx(). Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 723506ef4834cd9a16b890042a1c43861b39f3e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/console.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..8f19161c9c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,53 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + pGetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "GetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx || !pGetConsoleScreenBufferInfoEx) + { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + memset(&info, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + pGetConsoleScreenBufferInfoEx(std_output, &info); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3445,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); }

1 0

Aaro Altonen : kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 4e884779ff803f33192863a5d1fa30b77e2209e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e884779ff803f33192863a5… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 4 09:47:52 2020 +0200 kernelbase: Implement SetConsoleScreenBufferInfoEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b21881f53c6b88523b3eaf6281be8c7a05258ce0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8f19161c9c..9698f11779 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3167,24 +3167,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..b9843850c8 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ( set_console_output_info ) + { + req->handle = console_handle_unmap( handle ); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min( info->dwMaximumWindowSize.X, info->dwSize.X ); + req->max_height = min( info->dwMaximumWindowSize.Y, info->dwSize.Y ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + + return ret; }

1 0