January 2021 - Wine-Devel - list.winehq.org

[PATCH] ieframe: Implement SetQueryNetSessionCount.
by Jacek Caban Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/ieframe.h | 9 +++++++ dlls/ieframe/ieframe.spec | 1 + dlls/ieframe/ieframe_main.c | 22 ++++++++++++++++ dlls/ieframe/oleobject.c | 1 + dlls/ieframe/tests/webbrowser.c | 45 +++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+)

2 1

[PATCH 1/3] dxgi/tests: Test removing WS_EX_TOPMOST on a swapchain's fullscreen state output window.
by Gabriel Ivăncescu Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/dxgi/tests/dxgi.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2d8826f..14cb555 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2826,10 +2826,47 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_VISIBLE, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + + /* Removing topmost style makes the swapchain lose fullscreen state on next Present */ + SetWindowPos(swapchain_desc.OutputWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + flush_events(); + + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == DXGI_ERROR_INVALID_CALL) /* Win10 1809 */, "Got unexpected hr %#x.\n", hr); + if (hr != DXGI_ERROR_INVALID_CALL) + { + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + DestroyWindow(swapchain_desc.OutputWindow); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); -- 2.29.2

3 6

[PATCH 1/7] mf/tests: Use interface check helper more.
by Nikolay Sivov Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8272064466f..34090d0a9d4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1154,7 +1154,6 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { IMFRateControl *rate_control, *rate_control2; - IMFLocalMFTRegistration *local_reg; MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; IMFAttributes *attributes; @@ -1163,7 +1162,6 @@ static void test_media_session(void) IMFShutdown *shutdown; PROPVARIANT propvar; DWORD status, caps; - IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -1176,23 +1174,19 @@ static void test_media_session(void) hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(session, &IID_IMFGetService, TRUE); + check_interface(session, &IID_IMFAttributes, FALSE); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, - (void **)&local_reg); + hr = MFGetService((IUnknown *)session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, (void **)&unk); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr); if (SUCCEEDED(hr)) - IMFLocalMFTRegistration_Release(local_reg); + IUnknown_Release(unk); hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); @@ -1220,6 +1214,8 @@ static void test_media_session(void) hr = IMFMediaSession_GetClock(session, &clock); ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); + check_interface(clock, &IID_IMFPresentationClock, TRUE); + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2); ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); @@ -1241,8 +1237,6 @@ todo_wine IMFRateControl_Release(rate_control); IMFRateSupport_Release(rate_support); - IMFGetService_Release(gs); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session); -- 2.29.2

2 8

[PATCH] wldap32: log in with the authentication name instead of the authorization name
by Damjan Jovanovic Jan. 29, 2021

Jan. 29, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50572 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wldap32/bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

3 5

[PATCH v2 2/2] gdi32: Create a bitmap of the size of the virtual screen for display DCs.
by Zhiyi Zhang Jan. 29, 2021

Jan. 29, 2021

Fix a bug that WeChat screenshot is black when there is only one monitor. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 11 ++++++- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 5 +++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/bitmap.c | 1 - dlls/user32/tests/monitor.c | 3 -- 6 files changed, 74 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..16aea2933aa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -649,7 +649,16 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (!lstrcmpiW( driver, L"DISPLAY" ) || is_display_device( driver ) || is_display_device( device )) + { + dc->display_dc = 1; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DISPLAY_BITMAP )); + } + else + { + dc->display_dc = 0; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + } TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..d59061066a3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -85,7 +85,7 @@ static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM) static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); -static INT (WINAPI *pGetSystemMetrics)(INT); +INT (WINAPI *pGetSystemMetrics)(INT) = NULL; static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..13865f37ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* extra stock object: the bitmap for display DCs */ +#define DISPLAY_BITMAP (STOCK_LAST+2) struct gdi_obj_funcs { @@ -72,6 +74,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL display_dc:1; /* Whether this DC is a display DC */ POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ @@ -761,4 +764,6 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; +extern INT (WINAPI *pGetSystemMetrics)( INT ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2309fdac582..bda1cf387be 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" @@ -101,12 +102,13 @@ static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -/* reserve one extra entry for the stock default bitmap */ +/* reserve extra entries for the stock default bitmap and a bitmap for display DCs */ /* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) +#define NB_STOCK_OBJECTS (STOCK_LAST+3) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; +static SIZE display_bitmap_size = { 1, 1 }; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -642,6 +644,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DISPLAY_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); @@ -1007,6 +1010,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { + HBITMAP bitmap; + SIZE size; + if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; switch (obj) { @@ -1016,6 +1022,32 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) case DEFAULT_GUI_FONT: if (get_system_dpi() != 96) return scaled_stock_objects[obj]; break; + case DISPLAY_BITMAP: + { + EnterCriticalSection( &gdi_section ); + + if (pGetSystemMetrics) + { + size.cx = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + size.cy = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (size.cx != display_bitmap_size.cx || size.cy != display_bitmap_size.cy) + { + if ((bitmap = CreateBitmap( size.cx, size.cy, 1, 32, NULL ))) + { + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], FALSE ); + if (!GDI_get_ref_count( stock_objects[DISPLAY_BITMAP] )) + DeleteObject( stock_objects[DISPLAY_BITMAP] ); + stock_objects[DISPLAY_BITMAP] = bitmap; + display_bitmap_size = size; + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], TRUE ); + } + } + } + + bitmap = stock_objects[DISPLAY_BITMAP]; + LeaveCriticalSection( &gdi_section ); + return bitmap; + } } return stock_objects[obj]; } @@ -1125,6 +1157,7 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) { HGDIOBJ ret = 0; DC * dc = get_dc_ptr( hdc ); + HBITMAP display_bitmap; if (!dc) return 0; @@ -1134,7 +1167,29 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) case OBJ_BRUSH: ret = dc->hBrush; break; case OBJ_PAL: ret = dc->hPalette; break; case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; + case OBJ_BITMAP: + { + if (dc->display_dc) + { + EnterCriticalSection( &gdi_section ); + + display_bitmap = GetStockObject( DISPLAY_BITMAP ); + if (dc->hBitmap != display_bitmap) + { + GDI_dec_ref_count( dc->hBitmap ); + dc->hBitmap = GDI_inc_ref_count( display_bitmap ); + } + + ret = dc->hBitmap; + LeaveCriticalSection( &gdi_section ); + } + else + { + ret = dc->hBitmap; + } + + break; + } /* tests show that OBJ_REGION is explicitly ignored */ case OBJ_REGION: break; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index fe3482671b2..b8071dc2155 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2783,7 +2783,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); -todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 926b288da11..adea730f65f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2039,13 +2039,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); - todo_wine ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); - todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), -- 2.27.0

1 0

[PATCH v2 1/2] user32/tests: Add display DC bitmap tests.
by Zhiyi Zhang Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 198913~198914. Remove a todo_wine for a test that succeeds now. dlls/user32/tests/monitor.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..926b288da11 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -1995,7 +2000,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2023,6 +2031,29 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + ok_(__FILE__, line)(ret || broken(!ret), /* <= Win7 */ "GetObjectA failed, error %#x.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), + "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) -- 2.27.0

1 0

[PATCH] user32/clipboard: Set bitmap and palette handles as system object.
by Jactry Zeng Jan. 29, 2021

Jan. 29, 2021

This fixes an issue of WeChat's screenshot function that bitmap isn't available to be copied to the input box. Inspired by a PoC from Zhiyi. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/user32/clipboard.c | 9 +++- dlls/user32/tests/clipboard.c | 79 ++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 3d17b658e45..3e39a2d9ded 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -41,6 +41,7 @@ #include "user_private.h" #include "win.h" +#include "wine/gdi_driver.h" #include "wine/list.h" #include "wine/server.h" #include "wine/debug.h" @@ -302,8 +303,9 @@ static void free_cached_data( struct cached_format *cache ) switch (cache->format) { case CF_BITMAP: - case CF_DSPBITMAP: case CF_PALETTE: + __wine_make_gdi_object_system( cache->handle, FALSE ); + case CF_DSPBITMAP: DeleteObject( cache->handle ); break; case CF_ENHMETAFILE: @@ -886,6 +888,11 @@ HANDLE WINAPI SetClipboardData( UINT format, HANDLE data ) if (!(cache = HeapAlloc( GetProcessHeap(), 0, sizeof(*cache) ))) goto done; cache->format = format; cache->handle = data; + + if (format == CF_BITMAP || format == CF_PALETTE) + { + __wine_make_gdi_object_system( cache->handle , TRUE ); + } } EnterCriticalSection( &clipboard_cs ); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 6fc4325e985..e24db5851ca 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1779,10 +1779,14 @@ static void test_data_handles(void) { BOOL r; char *ptr; - HANDLE h, text; + HANDLE h, text, metafile; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); BITMAPINFO bmi; void *bits; + PALETTEENTRY entry; + BYTE buffer[1024]; + HENHMETAFILE emf; + int result; ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -1895,6 +1899,79 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + r = OpenClipboard( hwnd ); + ok( r, "OpenClipboard failed: %#x.\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_BITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + result = GetDIBits( GetDC(0), h, 0, 0, NULL, &bmi, 0 ); + ok( !!result && result != ERROR_INVALID_PARAMETER, "GetDIBits failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_DSPBITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_DSPBITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok( !GetDIBits( GetDC(0), h, 0, 0, 0, &bmi, 0 ), "GetDIBits returned unexpected value.\n" ); + + palette = CreatePalette( &logpalette ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_PALETTE ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); + + emf = create_emf(); + h = SetClipboardData( CF_ENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_ENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + emf = create_emf(); + h = SetClipboardData( CF_DSPENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + metafile = create_metafile(); + h = SetClipboardData( CF_METAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_METAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + metafile = create_metafile(); + h = SetClipboardData( CF_DSPMETAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "CloseClipboard failed: %#x.\n", GetLastError() ); + DestroyWindow( hwnd ); } -- 2.29.2

2 1

[tools] winetest/dissect: Improve the documentation of the missing start line handling.
by Francois Gouget Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e9729dbc8..27bcf1704 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -717,23 +717,28 @@ while ($line = <IN>) { if ($l_dll ne $dll or $l_unit ne $unit) { - # First close the current test unit taking into account - # it may have been polluted by the new one. + # Warn about the missing start line in the current test unit box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; + + # And close the current test unit taking into account + # it may have been polluted by the new one. $broken = 1; close_test_unit(0); - # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); %units = ($unit => 1); $units_re = $unit; + $broken = 1; $testbox = create_test_unit_box(); + # Finally, warn about the missing start line in the new test unit + # box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; - $broken = 1; } my $class = $l_rc ? "failed" : ""; -- 2.20.1

1 0

[tools] testbot/LogUtils: Fix handling of new test units with no start line.
by Francois Gouget Jan. 29, 2021

Jan. 29, 2021

Create a real new test unit object so $Cur->{LineFailures} is not counted multiple times. This matches the winetest parser behavior. Improve the documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the failure count reported in this wtbsuite test: WTBS A test unit with no start line (browseui:progressdlg). testbot/lib/WineTestBot/LogUtils.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1b4ee7a28..15ec31a42 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -675,11 +675,14 @@ sub ParseWineTestReport($$$) $Cur->{IsBroken} = 1; _CloseTestUnit($LogInfo, $Cur, 0); - # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. - ($Cur->{Dll}, $Cur->{Unit}) = ($Dll, $Unit); - _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too so set IsBroken. + $Cur = _NewCurrentUnit($Dll, $Unit); $Cur->{IsBroken} = 1; + + # Finally, warn about the missing start line. + _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); } if ($Rc == 258) -- 2.20.1

1 0

[PATCH 2/2] gdi32: Create a bitmap of the size of the virtual screen for display DCs.
by Zhiyi Zhang Jan. 29, 2021

Jan. 29, 2021

Fix a bug that WeChat screenshot is black when there is only one monitor. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 11 ++++++- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 5 +++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++++++-- dlls/user32/tests/monitor.c | 3 -- 5 files changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..16aea2933aa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -649,7 +649,16 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (!lstrcmpiW( driver, L"DISPLAY" ) || is_display_device( driver ) || is_display_device( device )) + { + dc->display_dc = 1; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DISPLAY_BITMAP )); + } + else + { + dc->display_dc = 0; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + } TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..d59061066a3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -85,7 +85,7 @@ static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM) static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); -static INT (WINAPI *pGetSystemMetrics)(INT); +INT (WINAPI *pGetSystemMetrics)(INT) = NULL; static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..13865f37ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* extra stock object: the bitmap for display DCs */ +#define DISPLAY_BITMAP (STOCK_LAST+2) struct gdi_obj_funcs { @@ -72,6 +74,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL display_dc:1; /* Whether this DC is a display DC */ POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ @@ -761,4 +764,6 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; +extern INT (WINAPI *pGetSystemMetrics)( INT ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2309fdac582..bda1cf387be 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" @@ -101,12 +102,13 @@ static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -/* reserve one extra entry for the stock default bitmap */ +/* reserve extra entries for the stock default bitmap and a bitmap for display DCs */ /* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) +#define NB_STOCK_OBJECTS (STOCK_LAST+3) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; +static SIZE display_bitmap_size = { 1, 1 }; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -642,6 +644,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DISPLAY_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); @@ -1007,6 +1010,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { + HBITMAP bitmap; + SIZE size; + if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; switch (obj) { @@ -1016,6 +1022,32 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) case DEFAULT_GUI_FONT: if (get_system_dpi() != 96) return scaled_stock_objects[obj]; break; + case DISPLAY_BITMAP: + { + EnterCriticalSection( &gdi_section ); + + if (pGetSystemMetrics) + { + size.cx = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + size.cy = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (size.cx != display_bitmap_size.cx || size.cy != display_bitmap_size.cy) + { + if ((bitmap = CreateBitmap( size.cx, size.cy, 1, 32, NULL ))) + { + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], FALSE ); + if (!GDI_get_ref_count( stock_objects[DISPLAY_BITMAP] )) + DeleteObject( stock_objects[DISPLAY_BITMAP] ); + stock_objects[DISPLAY_BITMAP] = bitmap; + display_bitmap_size = size; + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], TRUE ); + } + } + } + + bitmap = stock_objects[DISPLAY_BITMAP]; + LeaveCriticalSection( &gdi_section ); + return bitmap; + } } return stock_objects[obj]; } @@ -1125,6 +1157,7 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) { HGDIOBJ ret = 0; DC * dc = get_dc_ptr( hdc ); + HBITMAP display_bitmap; if (!dc) return 0; @@ -1134,7 +1167,29 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) case OBJ_BRUSH: ret = dc->hBrush; break; case OBJ_PAL: ret = dc->hPalette; break; case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; + case OBJ_BITMAP: + { + if (dc->display_dc) + { + EnterCriticalSection( &gdi_section ); + + display_bitmap = GetStockObject( DISPLAY_BITMAP ); + if (dc->hBitmap != display_bitmap) + { + GDI_dec_ref_count( dc->hBitmap ); + dc->hBitmap = GDI_inc_ref_count( display_bitmap ); + } + + ret = dc->hBitmap; + LeaveCriticalSection( &gdi_section ); + } + else + { + ret = dc->hBitmap; + } + + break; + } /* tests show that OBJ_REGION is explicitly ignored */ case OBJ_REGION: break; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 926b288da11..adea730f65f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2039,13 +2039,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); - todo_wine ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); - todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), -- 2.27.0

1 0