May 2021 - Wine-devel - list.winehq.org

[PATCH v2 1/3] wined3d: Make sure scissor offsets are not negative.
by Jan Sikorski 04 May '21

04 May '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2: Added a reference to the spec that mandates this. --- dlls/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fbc1e294fcd..83b1d081514 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2204,6 +2204,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->scissor.extent.width = key->viewport.width; key->scissor.extent.height = key->viewport.height; } + /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ + if (key->scissor.offset.x < 0) + key->scissor.offset.x = 0; + if (key->scissor.offset.y < 0) + key->scissor.offset.y = 0; key->viewport.y += key->viewport.height; key->viewport.height = -key->viewport.height; -- 2.30.2

3 7

[PATCH 1/2] wined3d: Clamp negative scissor offset to 0.
by Jan Sikorski 04 May '21

04 May '21

This should not change behavior, however on some Vulkan implementations, negative scissor offset combined with negative viewport offset causes nothing to be drawn. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fbc1e294fcd..c50a12fac28 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2204,6 +2204,10 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->scissor.extent.width = key->viewport.width; key->scissor.extent.height = key->viewport.height; } + if (key->scissor.offset.x < 0) + key->scissor.offset.x = 0; + if (key->scissor.offset.y < 0) + key->scissor.offset.y = 0; key->viewport.y += key->viewport.height; key->viewport.height = -key->viewport.height; -- 2.30.2

2 2

[PATCH 1/4] user32: Factor GetKeyboardLayoutNameW implementations.
by Rémi Bernon 04 May '21

04 May '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/driver.c | 13 ------------- dlls/user32/input.c | 20 ++++++++++++++++---- dlls/user32/user_private.h | 1 - dlls/winemac.drv/keyboard.c | 15 --------------- dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/keyboard.c | 16 +--------------- dlls/winex11.drv/winex11.drv.spec | 1 - 7 files changed, 17 insertions(+), 50 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index efaa04db096..51149f1cbb1 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -110,7 +110,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); GET_USER_FUNC(GetKeyboardLayoutList); - GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); GET_USER_FUNC(MapVirtualKeyEx); GET_USER_FUNC(RegisterHotKey); @@ -211,11 +210,6 @@ static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) return (HKL)~0; /* use default implementation */ } -static BOOL CDECL nulldrv_GetKeyboardLayoutName( LPWSTR name ) -{ - return FALSE; -} - static HKL CDECL nulldrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { return 0; @@ -429,7 +423,6 @@ static USER_DRIVER null_driver = nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayout, nulldrv_GetKeyboardLayoutList, - nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, nulldrv_MapVirtualKeyEx, nulldrv_RegisterHotKey, @@ -512,11 +505,6 @@ static UINT CDECL loaderdrv_GetKeyboardLayoutList( INT size, HKL *layouts ) return load_driver()->pGetKeyboardLayoutList( size, layouts ); } -static BOOL CDECL loaderdrv_GetKeyboardLayoutName( LPWSTR name ) -{ - return load_driver()->pGetKeyboardLayoutName( name ); -} - static HKL CDECL loaderdrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { return load_driver()->pLoadKeyboardLayout( name, flags ); @@ -644,7 +632,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayout, loaderdrv_GetKeyboardLayoutList, - loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, loaderdrv_MapVirtualKeyEx, loaderdrv_RegisterHotKey, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1f795e43545..bf9f5be80a3 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1105,14 +1105,26 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) /**************************************************************************** * GetKeyboardLayoutNameW (USER32.@) */ -BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID) +BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) { - if (!pwszKLID) + DWORD tmp; + HKL layout; + + TRACE_(keyboard)( "name %p\n", name ); + + if (!name) { - SetLastError(ERROR_NOACCESS); + SetLastError( ERROR_NOACCESS ); return FALSE; } - return USER_Driver->pGetKeyboardLayoutName(pwszKLID); + + layout = GetKeyboardLayout( 0 ); + tmp = HandleToUlong( layout ); + if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp ); + swprintf( name, KL_NAMELENGTH, L"%08X", tmp ); + + TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) ); + return TRUE; } /**************************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5f8059a12a0..de88a3128d7 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -67,7 +67,6 @@ typedef struct tagUSER_DRIVER { INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); HKL (CDECL *pGetKeyboardLayout)(DWORD); UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); - BOOL (CDECL *pGetKeyboardLayoutName)(LPWSTR); HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL); BOOL (CDECL *pRegisterHotKey)(HWND, UINT, UINT); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 6732c5755ee..99367643b8f 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1336,21 +1336,6 @@ UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) return count; } -/*********************************************************************** - * GetKeyboardLayoutName (MACDRV.@) - */ -BOOL CDECL macdrv_GetKeyboardLayoutName(LPWSTR name) -{ - static const WCHAR formatW[] = {'%','0','8','x',0}; - DWORD layout; - - layout = HandleToUlong(macdrv_GetKeyboardLayout(0)); - if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); - sprintfW(name, formatW, layout); - TRACE("returning %s\n", debugstr_w(name)); - return TRUE; -} - /*********************************************************************** * MapVirtualKeyEx (MACDRV.@) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 39cf33370b4..45a62255b86 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -16,7 +16,6 @@ @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutList(long ptr) macdrv_GetKeyboardLayoutList -@ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d583c8588cd..cfae93498c5 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1563,20 +1563,6 @@ static HKL get_locale_kbd_layout(void) return (HKL)layout; } -/*********************************************************************** - * GetKeyboardLayoutName (X11DRV.@) - */ -BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) -{ - static const WCHAR formatW[] = {'%','0','8','x',0}; - DWORD layout; - - layout = HandleToUlong( get_locale_kbd_layout() ); - if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); - sprintfW(name, formatW, layout); - TRACE("returning %s\n", debugstr_w(name)); - return TRUE; -} static void set_kbd_layout_preload_key(void) { @@ -1595,7 +1581,7 @@ static void set_kbd_layout_preload_key(void) RegCloseKey(hkey); return; } - if (X11DRV_GetKeyboardLayoutName(layout)) + if (GetKeyboardLayoutNameW( layout )) RegSetValueExW(hkey, one, 0, REG_SZ, (const BYTE *)layout, sizeof(layout)); RegCloseKey(hkey); diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index c0e24d8fe82..bde1d146ba1 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -8,7 +8,6 @@ @ cdecl Beep() X11DRV_Beep @ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText @ cdecl GetKeyboardLayout(long) X11DRV_GetKeyboardLayout -@ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName @ cdecl LoadKeyboardLayout(wstr long) X11DRV_LoadKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) X11DRV_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx -- 2.31.0

3 9

[PATCH] mfplat: Trace I8 propvariant values.
by Nikolay Sivov 04 May '21

04 May '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Stream events use that for position offset. dlls/mfplat/mfplat_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 8c968fe6fba..117907bb1a9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -132,6 +132,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {VT_UI4: %d}", v, v->ulVal); case VT_UI8: return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); case VT_CLSID: -- 2.30.2

1 0

[PATCH 1/5] user32: Always refresh rawinput device list when requested.
by Rémi Bernon 04 May '21

04 May '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/rawinput.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 5c009624fe6..6172c500839 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -166,8 +166,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) static void find_devices(void) { - static ULONGLONG last_check; - SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; HIDD_ATTRIBUTES attr; @@ -176,10 +174,6 @@ static void find_devices(void) HDEVINFO set; DWORD idx; - if (GetTickCount64() - last_check < 2000) - return; - last_check = GetTickCount64(); - HidD_GetHidGuid(&hid_guid); EnterCriticalSection(&rawinput_devices_cs); -- 2.31.0

2 7

[PATCH] shell32: support the CF_HDROP format too when pasting from the context menu
by Damjan Jovanovic 04 May '21

04 May '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 145 ++++++++++++++++++++++----------- dlls/shell32/tests/shlfolder.c | 10 +++ 2 files changed, 107 insertions(+), 48 deletions(-)

2 1

[PATCH 0/2] IPv6 control message structures
by Alex Henrie 04 May '21

04 May '21

While investigating why IPV6_HOPLIMIT isn't always defined on Mac OS, I realized that we really need some tests for the three IPV6 control messages that Windows can return from WSARecvMsg (IPV6_HOPLIMIT, IPV6_PKTINFO, and IPV6_RTHDR), and in order to write those tests, the corresponding structures need to be defined. Alex Henrie (2): include: Add IN6_PKTINFO include: Add IPV6_ROUTING_HEADER include/netiodef.h | 32 ++++++++++++++++++++++++++++++++ include/ws2ipdef.h | 5 +++++ 2 files changed, 37 insertions(+) create mode 100644 include/netiodef.h -- 2.31.1

2 4

[PATCH 1/5] ws2_32: Move address/string conversion functions to protocol.c.
by Zebediah Figura 04 May '21

04 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/protocol.c | 369 ++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 411 ----------------------------------------- 2 files changed, 369 insertions(+), 411 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 2cb6ef4be1c..fe30f26db53 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1653,3 +1653,372 @@ struct WS_servent * WINAPI WS_getservbyport( int port, const char *proto ) TRACE( "%d (i.e. port %d), %s ret %p\n", port, (int)ntohl(port), debugstr_a(proto), retval ); return retval; } + + +/*********************************************************************** + * inet_ntoa (ws2_32.12) + */ +char * WINAPI WS_inet_ntoa( struct WS_in_addr in ) +{ + unsigned int long_ip = ntohl( in.WS_s_addr ); + struct per_thread_data *data = get_per_thread_data(); + + sprintf( data->ntoa_buffer, "%u.%u.%u.%u", + (long_ip >> 24) & 0xff, + (long_ip >> 16) & 0xff, + (long_ip >> 8) & 0xff, + long_ip & 0xff ); + + return data->ntoa_buffer; +} + + +/*********************************************************************** + * inet_ntop (ws2_32.@) + */ +const char * WINAPI WS_inet_ntop( int family, void *addr, char *buffer, SIZE_T len ) +{ + NTSTATUS status; + ULONG size = min( len, (ULONG)-1 ); + + TRACE( "family %d, addr %p, buffer %p, len %ld\n", family, addr, buffer, len ); + if (!buffer) + { + SetLastError( STATUS_INVALID_PARAMETER ); + return NULL; + } + + switch (family) + { + case WS_AF_INET: + { + status = RtlIpv4AddressToStringExA( (IN_ADDR *)addr, 0, buffer, &size ); + break; + } + case WS_AF_INET6: + { + status = RtlIpv6AddressToStringExA( (IN6_ADDR *)addr, 0, 0, buffer, &size ); + break; + } + default: + SetLastError( WSAEAFNOSUPPORT ); + return NULL; + } + + if (status == STATUS_SUCCESS) return buffer; + SetLastError( STATUS_INVALID_PARAMETER ); + return NULL; +} + +/*********************************************************************** + * inet_pton (ws2_32.@) + */ +int WINAPI WS_inet_pton( int family, const char *addr, void *buffer ) +{ + NTSTATUS status; + const char *terminator; + + TRACE( "family %d, addr %s, buffer %p\n", family, debugstr_a(addr), buffer ); + + if (!addr || !buffer) + { + SetLastError( WSAEFAULT ); + return -1; + } + + switch (family) + { + case WS_AF_INET: + status = RtlIpv4StringToAddressA(addr, TRUE, &terminator, buffer); + break; + case WS_AF_INET6: + status = RtlIpv6StringToAddressA(addr, &terminator, buffer); + break; + default: + SetLastError( WSAEAFNOSUPPORT ); + return -1; + } + + return (status == STATUS_SUCCESS && *terminator == 0); +} + +/*********************************************************************** + * InetPtonW (ws2_32.@) + */ +int WINAPI InetPtonW( int family, const WCHAR *addr, void *buffer ) +{ + char *addrA; + int len; + INT ret; + + TRACE( "family %d, addr %s, buffer %p\n", family, debugstr_w(addr), buffer ); + + if (!addr) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + len = WideCharToMultiByte( CP_ACP, 0, addr, -1, NULL, 0, NULL, NULL ); + if (!(addrA = HeapAlloc( GetProcessHeap(), 0, len ))) + { + SetLastError( WSA_NOT_ENOUGH_MEMORY ); + return -1; + } + WideCharToMultiByte( CP_ACP, 0, addr, -1, addrA, len, NULL, NULL ); + + ret = WS_inet_pton( family, addrA, buffer ); + if (!ret) SetLastError( WSAEINVAL ); + + HeapFree( GetProcessHeap(), 0, addrA ); + return ret; +} + +/*********************************************************************** + * InetNtopW (ws2_32.@) + */ +const WCHAR * WINAPI InetNtopW( int family, void *addr, WCHAR *buffer, SIZE_T len ) +{ + char bufferA[WS_INET6_ADDRSTRLEN]; + PWSTR ret = NULL; + + TRACE( "family %d, addr %p, buffer %p, len %ld\n", family, addr, buffer, len ); + + if (WS_inet_ntop( family, addr, bufferA, sizeof(bufferA) )) + { + if (MultiByteToWideChar( CP_ACP, 0, bufferA, -1, buffer, len )) + ret = buffer; + else + SetLastError( ERROR_INVALID_PARAMETER ); + } + return ret; +} + + +/*********************************************************************** + * WSAStringToAddressA (ws2_32.@) + */ +int WINAPI WSAStringToAddressA( char *string, int family, WSAPROTOCOL_INFOA *protocol_info, + struct WS_sockaddr *addr, int *addr_len ) +{ + NTSTATUS status; + + TRACE( "string %s, family %u\n", debugstr_a(string), family ); + + if (!addr || !addr_len) return -1; + + if (!string) + { + SetLastError( WSAEINVAL ); + return -1; + } + + if (protocol_info) + FIXME( "ignoring protocol_info\n" ); + + switch (family) + { + case WS_AF_INET: + { + struct WS_sockaddr_in *addr4 = (struct WS_sockaddr_in *)addr; + + if (*addr_len < sizeof(struct WS_sockaddr_in)) + { + *addr_len = sizeof(struct WS_sockaddr_in); + SetLastError( WSAEFAULT ); + return -1; + } + memset( addr, 0, sizeof(struct WS_sockaddr_in) ); + + status = RtlIpv4StringToAddressExA( string, FALSE, &addr4->sin_addr, &addr4->sin_port ); + if (status != STATUS_SUCCESS) + { + SetLastError( WSAEINVAL ); + return -1; + } + addr4->sin_family = WS_AF_INET; + *addr_len = sizeof(struct WS_sockaddr_in); + return 0; + } + case WS_AF_INET6: + { + struct WS_sockaddr_in6 *addr6 = (struct WS_sockaddr_in6 *)addr; + + if (*addr_len < sizeof(struct WS_sockaddr_in6)) + { + *addr_len = sizeof(struct WS_sockaddr_in6); + SetLastError( WSAEFAULT ); + return -1; + } + memset( addr, 0, sizeof(struct WS_sockaddr_in6) ); + + status = RtlIpv6StringToAddressExA( string, &addr6->sin6_addr, &addr6->sin6_scope_id, &addr6->sin6_port ); + if (status != STATUS_SUCCESS) + { + SetLastError( WSAEINVAL ); + return -1; + } + addr6->sin6_family = WS_AF_INET6; + *addr_len = sizeof(struct WS_sockaddr_in6); + return 0; + } + default: + /* According to MSDN, only AF_INET and AF_INET6 are supported. */ + TRACE( "Unsupported address family specified: %d.\n", family ); + SetLastError( WSAEINVAL ); + return -1; + } +} + + +/*********************************************************************** + * WSAStringToAddressW (ws2_32.@) + */ +int WINAPI WSAStringToAddressW( WCHAR *string, int family, WSAPROTOCOL_INFOW *protocol_info, + struct WS_sockaddr *addr, int *addr_len ) +{ + WSAPROTOCOL_INFOA infoA; + WSAPROTOCOL_INFOA *protocol_infoA = NULL; + int sizeA, ret; + char *stringA; + + TRACE( "string %s, family %u\n", debugstr_w(string), family ); + + if (!addr || !addr_len) return -1; + + if (protocol_info) + { + protocol_infoA = &infoA; + memcpy( protocol_infoA, protocol_info, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); + + if (!WideCharToMultiByte( CP_ACP, 0, protocol_info->szProtocol, -1, protocol_infoA->szProtocol, + sizeof(protocol_infoA->szProtocol), NULL, NULL )) + { + SetLastError( WSAEINVAL ); + return -1; + } + } + + if (!string) + { + SetLastError( WSAEINVAL ); + return -1; + } + + sizeA = WideCharToMultiByte( CP_ACP, 0, string, -1, NULL, 0, NULL, NULL ); + if (!(stringA = HeapAlloc( GetProcessHeap(), 0, sizeA ))) + { + SetLastError( WSA_NOT_ENOUGH_MEMORY ); + return -1; + } + WideCharToMultiByte( CP_ACP, 0, string, -1, stringA, sizeA, NULL, NULL ); + ret = WSAStringToAddressA( stringA, family, protocol_infoA, addr, addr_len ); + HeapFree( GetProcessHeap(), 0, stringA ); + return ret; +} + + +/*********************************************************************** + * WSAAddressToStringA (ws2_32.@) + */ +int WINAPI WSAAddressToStringA( struct WS_sockaddr *addr, DWORD addr_len, + WSAPROTOCOL_INFOA *info, char *string, DWORD *string_len ) +{ + char buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ + DWORD size; + + TRACE( "addr %s\n", debugstr_sockaddr(addr) ); + + if (!addr) return SOCKET_ERROR; + if (!string || !string_len) return SOCKET_ERROR; + + switch (addr->sa_family) + { + case WS_AF_INET: + { + const struct WS_sockaddr_in *addr4 = (const struct WS_sockaddr_in *)addr; + unsigned int long_ip = ntohl( addr4->sin_addr.WS_s_addr ); + char *p; + + if (addr_len < sizeof(struct WS_sockaddr_in)) return -1; + sprintf( buffer, "%u.%u.%u.%u:%u", + (long_ip >> 24) & 0xff, + (long_ip >> 16) & 0xff, + (long_ip >> 8) & 0xff, + long_ip & 0xff, + ntohs( addr4->sin_port ) ); + + p = strchr( buffer, ':' ); + if (!addr4->sin_port) *p = 0; + break; + } + case WS_AF_INET6: + { + struct WS_sockaddr_in6 *addr6 = (struct WS_sockaddr_in6 *)addr; + size_t len; + + buffer[0] = 0; + if (addr_len < sizeof(struct WS_sockaddr_in6)) return -1; + if (addr6->sin6_port) + strcpy( buffer, "[" ); + len = strlen( buffer ); + if (!WS_inet_ntop( WS_AF_INET6, &addr6->sin6_addr, &buffer[len], sizeof(buffer) - len )) + { + SetLastError( WSAEINVAL ); + return -1; + } + if (addr6->sin6_scope_id) + sprintf( buffer + strlen( buffer ), "%%%u", addr6->sin6_scope_id ); + if (addr6->sin6_port) + sprintf( buffer + strlen( buffer ), "]:%u", ntohs( addr6->sin6_port ) ); + break; + } + + default: + SetLastError( WSAEINVAL ); + return -1; + } + + size = strlen( buffer ) + 1; + + if (*string_len < size) + { + *string_len = size; + SetLastError( WSAEFAULT ); + return -1; + } + + TRACE( "=> %s, %u bytes\n", debugstr_a(buffer), size ); + *string_len = size; + strcpy( string, buffer ); + return 0; +} + + +/*********************************************************************** + * WSAAddressToStringW (ws2_32.@) + */ +int WINAPI WSAAddressToStringW( struct WS_sockaddr *addr, DWORD addr_len, + WSAPROTOCOL_INFOW *info, WCHAR *string, DWORD *string_len ) +{ + INT ret; + char buf[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ + + TRACE( "(%p, %d, %p, %p, %p)\n", addr, addr_len, info, string, string_len ); + + if ((ret = WSAAddressToStringA( addr, addr_len, NULL, buf, string_len ))) return ret; + + MultiByteToWideChar( CP_ACP, 0, buf, *string_len, string, *string_len ); + TRACE( "=> %s, %u chars\n", debugstr_w(string), *string_len ); + return 0; +} + + +/*********************************************************************** + * inet_addr (ws2_32.11) + */ +WS_u_long WINAPI WS_inet_addr( const char *cp ) +{ + if (!cp) return INADDR_NONE; + return inet_addr( cp ); +} diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2776e2f0014..3d930d13bb6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -40,10 +40,6 @@ # define sipx_node sipx_addr.x_host.c_host #endif /* __FreeBSD__ */ -#ifndef INADDR_NONE -#define INADDR_NONE ~0UL -#endif - #if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE) /* TCP_KEEPALIVE is the Mac OS name for TCP_KEEPIDLE */ #define TCP_KEEPIDLE TCP_KEEPALIVE @@ -3896,16 +3892,6 @@ int WINAPI WSAHtons(SOCKET s, WS_u_short hostshort, WS_u_short *lpnetshort) } -/*********************************************************************** - * inet_addr (WS2_32.11) - */ -WS_u_long WINAPI WS_inet_addr(const char *cp) -{ - if (!cp) return INADDR_NONE; - return inet_addr(cp); -} - - /*********************************************************************** * ntohl (WS2_32.14) */ @@ -3924,23 +3910,6 @@ WS_u_short WINAPI WS_ntohs(WS_u_short netshort) } -/*********************************************************************** - * inet_ntoa (WS2_32.12) - */ -char* WINAPI WS_inet_ntoa(struct WS_in_addr in) -{ - unsigned int long_ip = ntohl(in.WS_s_addr); - struct per_thread_data *data = get_per_thread_data(); - - sprintf( data->ntoa_buffer, "%u.%u.%u.%u", - (long_ip >> 24) & 0xff, - (long_ip >> 16) & 0xff, - (long_ip >> 8) & 0xff, - long_ip & 0xff); - - return data->ntoa_buffer; -} - static const char *debugstr_wsaioctl(DWORD code) { const char *name = NULL, *buf_type, *family; @@ -6449,386 +6418,6 @@ int WINAPI WSARemoveServiceClass(LPGUID info) return SOCKET_ERROR; } -/*********************************************************************** - * inet_ntop (WS2_32.@) - */ -PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) -{ - NTSTATUS status; - ULONG size = min( len, (ULONG)-1 ); - - TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); - if (!buffer) - { - SetLastError( STATUS_INVALID_PARAMETER ); - return NULL; - } - - switch (family) - { - case WS_AF_INET: - { - status = RtlIpv4AddressToStringExA( (IN_ADDR *)addr, 0, buffer, &size ); - break; - } - case WS_AF_INET6: - { - status = RtlIpv6AddressToStringExA( (IN6_ADDR *)addr, 0, 0, buffer, &size ); - break; - } - default: - SetLastError( WSAEAFNOSUPPORT ); - return NULL; - } - - if (status == STATUS_SUCCESS) return buffer; - SetLastError( STATUS_INVALID_PARAMETER ); - return NULL; -} - -/*********************************************************************** -* inet_pton (WS2_32.@) -*/ -INT WINAPI WS_inet_pton(INT family, const char *addr, void *buffer) -{ - NTSTATUS status; - const char *terminator; - - TRACE("family %d, addr %s, buffer (%p)\n", family, debugstr_a(addr), buffer); - - if (!addr || !buffer) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - switch (family) - { - case WS_AF_INET: - status = RtlIpv4StringToAddressA(addr, TRUE, &terminator, buffer); - break; - case WS_AF_INET6: - status = RtlIpv6StringToAddressA(addr, &terminator, buffer); - break; - default: - SetLastError(WSAEAFNOSUPPORT); - return SOCKET_ERROR; - } - - return (status == STATUS_SUCCESS && *terminator == 0); -} - -/*********************************************************************** -* InetPtonW (WS2_32.@) -*/ -INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) -{ - char *addrA; - int len; - INT ret; - - TRACE("family %d, addr %s, buffer (%p)\n", family, debugstr_w(addr), buffer); - - if (!addr) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - len = WideCharToMultiByte(CP_ACP, 0, addr, -1, NULL, 0, NULL, NULL); - if (!(addrA = HeapAlloc(GetProcessHeap(), 0, len))) - { - SetLastError(WSA_NOT_ENOUGH_MEMORY); - return SOCKET_ERROR; - } - WideCharToMultiByte(CP_ACP, 0, addr, -1, addrA, len, NULL, NULL); - - ret = WS_inet_pton(family, addrA, buffer); - if (!ret) SetLastError(WSAEINVAL); - - HeapFree(GetProcessHeap(), 0, addrA); - return ret; -} - -/*********************************************************************** - * InetNtopW (WS2_32.@) - */ -PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR buffer, SIZE_T len) -{ - char bufferA[WS_INET6_ADDRSTRLEN]; - PWSTR ret = NULL; - - TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); - - if (WS_inet_ntop(family, addr, bufferA, sizeof(bufferA))) - { - if (MultiByteToWideChar(CP_ACP, 0, bufferA, -1, buffer, len)) - ret = buffer; - else - SetLastError(ERROR_INVALID_PARAMETER); - } - return ret; -} - -/*********************************************************************** - * WSAStringToAddressA (WS2_32.80) - */ -INT WINAPI WSAStringToAddressA(LPSTR AddressString, - INT AddressFamily, - LPWSAPROTOCOL_INFOA lpProtocolInfo, - LPSOCKADDR lpAddress, - LPINT lpAddressLength) -{ - INT res=0; - NTSTATUS status; - - TRACE( "(%s, %x, %p, %p, %p)\n", debugstr_a(AddressString), AddressFamily, - lpProtocolInfo, lpAddress, lpAddressLength ); - - if (!lpAddressLength || !lpAddress) return SOCKET_ERROR; - - if (!AddressString) - { - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - - if (lpProtocolInfo) - FIXME("ProtocolInfo not implemented.\n"); - - switch(AddressFamily) - { - case WS_AF_INET: - { - SOCKADDR_IN *addr4 = (SOCKADDR_IN *)lpAddress; - - /* If lpAddressLength is too small, tell caller the size we need */ - if (*lpAddressLength < sizeof(SOCKADDR_IN)) - { - *lpAddressLength = sizeof(SOCKADDR_IN); - res = WSAEFAULT; - break; - } - memset(lpAddress, 0, sizeof(SOCKADDR_IN)); - - status = RtlIpv4StringToAddressExA(AddressString, FALSE, &addr4->sin_addr, &addr4->sin_port); - if (status != STATUS_SUCCESS) - { - res = WSAEINVAL; - break; - } - addr4->sin_family = WS_AF_INET; - *lpAddressLength = sizeof(SOCKADDR_IN); - break; - } - case WS_AF_INET6: - { - SOCKADDR_IN6 *addr6 = (SOCKADDR_IN6 *)lpAddress; - - /* If lpAddressLength is too small, tell caller the size we need */ - if (*lpAddressLength < sizeof(SOCKADDR_IN6)) - { - *lpAddressLength = sizeof(SOCKADDR_IN6); - res = WSAEFAULT; - break; - } - memset(lpAddress, 0, sizeof(SOCKADDR_IN6)); - - status = RtlIpv6StringToAddressExA(AddressString, &addr6->sin6_addr, &addr6->sin6_scope_id, &addr6->sin6_port); - if (status != STATUS_SUCCESS) - { - res = WSAEINVAL; - break; - } - addr6->sin6_family = WS_AF_INET6; - *lpAddressLength = sizeof(SOCKADDR_IN6); - break; - } - default: - /* According to MSDN, only AF_INET and AF_INET6 are supported. */ - TRACE("Unsupported address family specified: %d.\n", AddressFamily); - res = WSAEINVAL; - } - - if (!res) return 0; - SetLastError(res); - return SOCKET_ERROR; -} - -/*********************************************************************** - * WSAStringToAddressW (WS2_32.81) - * - * FIXME: Does anybody know if this function allows using Hebrew/Arabic/Chinese... digits? - * If this should be the case, it would be required to map these digits - * to Unicode digits (0-9) using FoldString first. - */ -INT WINAPI WSAStringToAddressW(LPWSTR AddressString, - INT AddressFamily, - LPWSAPROTOCOL_INFOW lpProtocolInfo, - LPSOCKADDR lpAddress, - LPINT lpAddressLength) -{ - INT sBuffer,res=0; - LPSTR workBuffer=NULL; - WSAPROTOCOL_INFOA infoA; - LPWSAPROTOCOL_INFOA lpProtoInfoA = NULL; - - TRACE( "(%s, %x, %p, %p, %p)\n", debugstr_w(AddressString), AddressFamily, lpProtocolInfo, - lpAddress, lpAddressLength ); - - if (!lpAddressLength || !lpAddress) return SOCKET_ERROR; - - /* if ProtocolInfo is available - convert to ANSI variant */ - if (lpProtocolInfo) - { - lpProtoInfoA = &infoA; - memcpy( lpProtoInfoA, lpProtocolInfo, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); - - if (!WideCharToMultiByte( CP_ACP, 0, lpProtocolInfo->szProtocol, -1, - lpProtoInfoA->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL )) - { - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - } - - if (AddressString) - { - /* Translate AddressString to ANSI code page - assumes that only - standard digits 0-9 are used with this API call */ - sBuffer = WideCharToMultiByte( CP_ACP, 0, AddressString, -1, NULL, 0, NULL, NULL ); - workBuffer = HeapAlloc( GetProcessHeap(), 0, sBuffer ); - - if (workBuffer) - { - WideCharToMultiByte( CP_ACP, 0, AddressString, -1, workBuffer, sBuffer, NULL, NULL ); - res = WSAStringToAddressA(workBuffer,AddressFamily,lpProtoInfoA, - lpAddress,lpAddressLength); - HeapFree( GetProcessHeap(), 0, workBuffer ); - return res; - } - else - res = WSA_NOT_ENOUGH_MEMORY; - } - else - res = WSAEINVAL; - - SetLastError(res); - return SOCKET_ERROR; -} - -/*********************************************************************** - * WSAAddressToStringA (WS2_32.27) - * - * See WSAAddressToStringW - */ -INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, - LPWSAPROTOCOL_INFOA info, LPSTR string, - LPDWORD lenstr ) -{ - DWORD size; - CHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ - CHAR *p; - - TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - - if (!sockaddr) return SOCKET_ERROR; - if (!string || !lenstr) return SOCKET_ERROR; - - switch(sockaddr->sa_family) - { - case WS_AF_INET: - { - unsigned int long_ip = ntohl(((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr); - if (len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; - sprintf( buffer, "%u.%u.%u.%u:%u", - (long_ip >> 24) & 0xff, - (long_ip >> 16) & 0xff, - (long_ip >> 8) & 0xff, - long_ip & 0xff, - ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) ); - - p = strchr( buffer, ':' ); - if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; - break; - } - case WS_AF_INET6: - { - struct WS_sockaddr_in6 *sockaddr6 = (LPSOCKADDR_IN6) sockaddr; - size_t slen; - - buffer[0] = 0; - if (len < sizeof(SOCKADDR_IN6)) return SOCKET_ERROR; - if ((sockaddr6->sin6_port)) - strcpy(buffer, "["); - slen = strlen(buffer); - if (!WS_inet_ntop(WS_AF_INET6, &sockaddr6->sin6_addr, &buffer[slen], sizeof(buffer) - slen)) - { - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - if ((sockaddr6->sin6_scope_id)) - sprintf(buffer+strlen(buffer), "%%%u", sockaddr6->sin6_scope_id); - if ((sockaddr6->sin6_port)) - sprintf(buffer+strlen(buffer), "]:%u", ntohs(sockaddr6->sin6_port)); - break; - } - - default: - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - - size = strlen( buffer ) + 1; - - if (*lenstr < size) - { - *lenstr = size; - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - TRACE("=> %s,%u bytes\n", debugstr_a(buffer), size); - *lenstr = size; - strcpy( string, buffer ); - return 0; -} - -/*********************************************************************** - * WSAAddressToStringW (WS2_32.28) - * - * Convert a sockaddr address into a readable address string. - * - * PARAMS - * sockaddr [I] Pointer to a sockaddr structure. - * len [I] Size of the sockaddr structure. - * info [I] Pointer to a WSAPROTOCOL_INFOW structure (optional). - * string [I/O] Pointer to a buffer to receive the address string. - * lenstr [I/O] Size of the receive buffer in WCHARs. - * - * RETURNS - * Success: 0 - * Failure: SOCKET_ERROR - * - * NOTES - * The 'info' parameter is ignored. - */ -INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, - LPWSAPROTOCOL_INFOW info, LPWSTR string, - LPDWORD lenstr ) -{ - INT ret; - char buf[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ - - TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - - if ((ret = WSAAddressToStringA(sockaddr, len, NULL, buf, lenstr))) return ret; - - MultiByteToWideChar(CP_ACP, 0, buf, *lenstr, string, *lenstr); - TRACE("=> %s,%u chars\n", debugstr_w(string), *lenstr); - return 0; -} - /*********************************************************************** * WSAEnumNameSpaceProvidersA (WS2_32.34) */ -- 2.30.2

2 5

[PATCH v2] include: Add IN6_PKTINFO
by Alex Henrie 04 May '21

04 May '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Omit WS prefix from all-caps identifiers --- include/ws2ipdef.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index fc465804962..4e1ec373f71 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -177,6 +177,11 @@ typedef struct WS(in_pktinfo) { UINT ipi_ifindex; } IN_PKTINFO, *PIN_PKTINFO; +typedef struct WS(in6_pktinfo) { + IN6_ADDR ipi6_addr; + ULONG ipi6_ifindex; +} IN6_PKTINFO, *PIN6_PKTINFO; + #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 #define IPV6_HDRINCL 2 -- 2.31.1

1 0

[PATCH 1/3] user32/tests: Add window surface tests.
by Rémi Bernon 03 May '21

03 May '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- These tests are checking composition outcode of window surfaces, child and layered windows, as well as drawing API interactions. They seem to consistently pass on the testbot but I'm not completely sure about them. They are a bit brittle as screen capture and window rendering is heavily dependent on the WM on Linux. Still, I believe they are useful, and they show that we currently do several things incorrectly so I'm sending them anyway. dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/win.c | 640 ++++++++++++++++++++++++++++++++++ 2 files changed, 641 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3c..5b058b7d914 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 hid +IMPORTS = user32 gdi32 advapi32 hid dwmapi C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a37afd2dc5e..92fc9449245 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "dwmapi.h" #include "wine/test.h" @@ -12004,6 +12005,643 @@ static void test_cancel_mode(void) DestroyWindow(hwnd2); } +#define capture_surface(hdc, x, y, width, height, surface, surface_size) capture_surface_(__LINE__, hdc, x, y, width, height, surface, surface_size) +static SIZE_T capture_surface_(int line, HDC hdc, int x, int y, int width, int height, DWORD *surface, SIZE_T surface_size) +{ + BITMAPINFOHEADER info; + HBITMAP bmp_obj; + SIZE_T data_size; + BITMAP bmp; + DWORD count; + BOOL ret; + HDC hdc_dst; + + hdc_dst = CreateCompatibleDC(hdc); + ok_(__FILE__, line)(hdc_dst != 0, "CreateCompatibleDC failed, last error %u\n", GetLastError()); + bmp_obj = CreateCompatibleBitmap(hdc, width, height); + ok_(__FILE__, line)(bmp_obj != 0, "CreateCompatibleBitmap failed, last error %u\n", GetLastError()); + +#ifndef CAPTUREBLT +#define CAPTUREBLT 0x40000000 +#endif + + SelectObject(hdc_dst, bmp_obj); + ret = BitBlt(hdc_dst, 0, 0, width, height, hdc, x, y, SRCCOPY | CAPTUREBLT); + ok_(__FILE__, line)(ret, "BitBlt failed, last error %u\n", GetLastError()); + count = GetObjectW(bmp_obj, sizeof(BITMAP), &bmp); + ok_(__FILE__, line)(count == sizeof(BITMAP), "GetObjectW failed, last error %u\n", GetLastError()); + + info.biSize = sizeof(BITMAPINFOHEADER); + info.biWidth = bmp.bmWidth; + info.biHeight = bmp.bmHeight; + info.biPlanes = 1; + info.biBitCount = 32; + info.biCompression = BI_RGB; + info.biSizeImage = 0; + info.biXPelsPerMeter = 0; + info.biYPelsPerMeter = 0; + info.biClrUsed = 0; + info.biClrImportant = 0; + + data_size = ((bmp.bmWidth * info.biBitCount + 31) / 32) * 4 * bmp.bmHeight; + ok_(__FILE__, line)( data_size == surface_size, "Got %Iu bytes, expected %Iu\n", data_size, surface_size ); + count = GetDIBits(hdc_dst, bmp_obj, 0, bmp.bmHeight, surface, (BITMAPINFO*)&info, DIB_RGB_COLORS); + ok_(__FILE__, line)(count == bmp.bmHeight, "GetDIBits failed, last error %u\n", GetLastError()); + + DeleteObject(bmp_obj); + DeleteDC(hdc_dst); + +#if 0 + { + BITMAPFILEHEADER header; + HANDLE file; + + header.bfType = 0x4d42; + header.bfSize = sizeof(header) + sizeof(info) + data_size; + header.bfOffBits = sizeof(header) + sizeof(info); + + file = CreateFileW(L"surface.bmp", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed, error %u\n", GetLastError()); + ret = WriteFile(file, &header, sizeof(header), &count, NULL); + ok(ret && count == sizeof(header), "WriteFile failed, error %u\n", GetLastError()); + ret = WriteFile(file, &info, sizeof(info), &count, NULL); + ok(ret && count == sizeof(info), "WriteFile failed, error %u\n", GetLastError()); + ret = WriteFile(file, surface, data_size, &count, NULL); + ok(ret && count == data_size, "WriteFile failed, error %u\n", GetLastError()); + CloseHandle(file); + } +#endif + + return data_size; +} + +#define capture_screen_surface(hwnd, surface, surface_size) capture_screen_surface_(__LINE__, hwnd, surface, surface_size) +static SIZE_T capture_screen_surface_(int line, HWND hwnd, DWORD *surface, SIZE_T surface_size) +{ + SIZE_T data_size, i; + RECT rect, rect_win; + HDC hdc; + + GetWindowRect(hwnd, &rect_win); + GetClientRect(hwnd, &rect); + OffsetRect(&rect, -rect.left, -rect.top); + + hdc = GetDC(NULL); + ok_(__FILE__, line)(hdc != 0, "GetDC failed, last error %u\n", GetLastError()); + if (DwmFlush() == E_NOTIMPL) flush_events( TRUE ); + data_size = capture_surface_(line, hdc, rect_win.left, rect_win.top, rect.right, rect.bottom, surface, surface_size); + ReleaseDC(NULL, hdc); + + for (i = data_size / 4; i != 0; i--) surface[i - 1] &= 0xffffff; + return data_size; +} + +#define check_screen_surface(hwnd, expect, expect_size, todo) check_screen_surface_(__LINE__, hwnd, expect, expect_size, todo) +static void check_screen_surface_(int line, HWND hwnd, const DWORD *expect, SIZE_T expect_size, BOOL todo) +{ + SIZE_T data_size; + DWORD *data; + + data = malloc(expect_size); + ok_(__FILE__, line)(data != NULL, "Failed to allocate %Iu bytes\n", expect_size); + data_size = capture_screen_surface_(line, hwnd, data, expect_size); + if (data_size != expect_size) + todo_wine_if(todo) ok_(__FILE__, line)(0, "Unexpected screen surface size %Iu, expected %Iu", data_size, expect_size); + else if (memcmp( data, expect, data_size )) + todo_wine_if(todo) ok_(__FILE__, line)(0, "Unexpected screen surface data\n"); + else if (todo) + todo_wine ok_(__FILE__, line)(1, "Got expected screen surface data\n"); + free(data); +} + +#define capture_client_surface(hwnd, surface, surface_size) capture_client_surface_(__LINE__, hwnd, surface, surface_size) +static SIZE_T capture_client_surface_(int line, HWND hwnd, DWORD *surface, SIZE_T surface_size) +{ + SIZE_T data_size; + RECT rect; + HDC hdc; + + GetClientRect(hwnd, &rect); + OffsetRect(&rect, -rect.left, -rect.top); + + hdc = GetDC(hwnd); + ok_(__FILE__, line)(hdc != 0, "GetDC failed, last error %u\n", GetLastError()); + data_size = capture_surface_(line, hdc, 0, 0, rect.right, rect.bottom, surface, surface_size); + ReleaseDC(hwnd, hdc); + + return data_size; +} + +#define check_client_surface(hwnd, expect, expect_size, todo) check_client_surface_(__LINE__, hwnd, expect, expect_size, todo) +static void check_client_surface_(int line, HWND hwnd, const DWORD *expect, SIZE_T expect_size, BOOL todo) +{ + SIZE_T data_size; + DWORD *data; + + data = malloc(expect_size); + ok_(__FILE__, line)(data != NULL, "Failed to allocate %Iu bytes\n", expect_size); + data_size = capture_client_surface_(line, hwnd, data, expect_size); + if (data_size != expect_size) + todo_wine_if(todo) ok_(__FILE__, line)(0, "Unexpected client surface size %Iu, expected %Iu", data_size, expect_size); + else if (memcmp( data, expect, data_size )) + todo_wine_if(todo) ok_(__FILE__, line)(0, "Unexpected client surface data\n"); + else if (todo) + todo_wine ok_(__FILE__, line)(1, "Got expected client surface data\n"); + free(data); +} + +static void paint_client_rect(HWND hwnd, COLORREF color) +{ + HDC hdc = GetDC(hwnd); + HPEN pen = CreatePen(PS_SOLID, 0, color); + HBRUSH brush = CreateSolidBrush(color); + RECT rect; + GetClientRect(hwnd, &rect); + + SelectObject(hdc, pen); + SelectObject(hdc, brush); + Rectangle(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); + DeleteObject(brush); + DeleteObject(pen); + DeleteDC(hdc); +} + +LRESULT WINAPI test_surface_composition_winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_ERASEBKGND: return 0; + case WM_NCPAINT: + case WM_PAINT: + { + BeginPaint(hwnd, NULL); + EndPaint(hwnd, NULL); + return 0; + } + default: + return DefWindowProcW(hwnd, msg, wparam, lparam); + } +} + +static void test_surface_composition(void) +{ +#define COLOR1 0x00ff0000 +#define COLOR2 0x0000ffff +#define BGRA2RGB(x) RGB((x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff) + static const DWORD minimized_surface[] = + { + 0x00000000 + }; + static const DWORD hidden_surface[] = + { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + }; + static const DWORD partial_surface[] = + { + 0x00000000, 0x00000000, COLOR1, COLOR1, + 0x00000000, 0x00000000, COLOR1, COLOR1, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + }; + static const DWORD painted_surface[] = + { + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + }; + static const DWORD painted_child_surface[] = { + COLOR1, COLOR1, COLOR1, COLOR1, + COLOR1, COLOR2, COLOR2, COLOR1, + COLOR1, COLOR2, COLOR2, COLOR1, + COLOR1, COLOR1, COLOR1, COLOR1, + }; + + DWORD screen_surface[ARRAY_SIZE(painted_surface)]; + DWORD layered_const_surface[ARRAY_SIZE(painted_surface)]; + DWORD layered_child_surface[ARRAY_SIZE(painted_child_surface)]; + DWORD layered_child_const_surface[ARRAY_SIZE(painted_child_surface)]; + DWORD layered_child_alpha_surface[ARRAY_SIZE(painted_child_surface)]; + + BLENDFUNCTION blend_cst_alpha = { AC_SRC_OVER, 0, 0x7f, 0 }; + BLENDFUNCTION blend_src_alpha = { AC_SRC_OVER, 0, 0xff, AC_SRC_ALPHA }; + WNDCLASSEXW wc; + BITMAPINFO info; + HBITMAP bmp_obj; + HRESULT hres; + SIZE_T i; + DWORD *data; + HWND hwnd, hwnd_child; + RECT rect; + BOOL ret; + HDC hdc_dst, hdc_src; + + wc.cbSize = sizeof(WNDCLASSEXW); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = test_surface_composition_winproc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleW(NULL); + wc.hIcon = 0; + wc.hCursor = 0; + wc.hbrBackground = 0; + wc.lpszMenuName = NULL; + wc.lpszClassName = L"surface"; + wc.hIconSm = 0; + RegisterClassExW(&wc); + + + hres = DwmFlush(); + todo_wine ok(hres == S_OK || broken(hres == DWM_E_COMPOSITIONDISABLED), "DwmFlush returned %#x\n", hres); + if (hres == DWM_E_COMPOSITIONDISABLED) + { + win_skip("Cannot reliably capture screen surfaces, skipping tests\n"); + return; + } + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, NULL, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + + capture_screen_surface(hwnd, screen_surface, sizeof(screen_surface)); + + for (i = 0; i < ARRAY_SIZE(painted_surface); i++) + { + BYTE sr = (screen_surface[i] >> 16) & 0xff, dr = (painted_surface[i] >> 16) & 0xff; + BYTE sg = (screen_surface[i] >> 8) & 0xff, dg = (painted_surface[i] >> 8) & 0xff; + BYTE sb = (screen_surface[i] >> 0) & 0xff, db = (painted_surface[i] >> 0) & 0xff; + BYTE da = 0x7f; + dr = min(max((sr * (0xff - da) + dr * da + 0x7f) / 0xff, 0), 0xff); + dg = min(max((sg * (0xff - da) + dg * da + 0x7f) / 0xff, 0), 0xff); + db = min(max((sb * (0xff - da) + db * da + 0x7f) / 0xff, 0), 0xff); + layered_const_surface[i] = BGRA2RGB(RGB(dr, dg, db)); + } + + memcpy(layered_child_surface, screen_surface, sizeof(screen_surface)); + for (i = 0; i < ARRAY_SIZE(painted_child_surface); i++) + { + if (painted_child_surface[i] == painted_surface[i]) + layered_child_surface[i] = painted_surface[i]; + } + + for (i = 0; i < ARRAY_SIZE(painted_child_surface); i++) + { + BYTE sr = (screen_surface[i] >> 16) & 0xff, dr = (painted_child_surface[i] >> 16) & 0xff; + BYTE sg = (screen_surface[i] >> 8) & 0xff, dg = (painted_child_surface[i] >> 8) & 0xff; + BYTE sb = (screen_surface[i] >> 0) & 0xff, db = (painted_child_surface[i] >> 0) & 0xff; + BYTE da = 0x7f; + dr = min(max((sr * (0xff - da) + dr * da + 0x7f) / 0xff, 0), 0xff); + dg = min(max((sg * (0xff - da) + dg * da + 0x7f) / 0xff, 0), 0xff); + db = min(max((sb * (0xff - da) + db * da + 0x7f) / 0xff, 0), 0xff); + layered_child_const_surface[i] = BGRA2RGB(RGB(dr, dg, db)); + } + + for (i = 0; i < ARRAY_SIZE(painted_child_surface); i++) + { + BYTE sr = (screen_surface[i] >> 16) & 0xff, dr = (painted_child_surface[i] >> 16) & 0xff; + BYTE sg = (screen_surface[i] >> 8) & 0xff, dg = (painted_child_surface[i] >> 8) & 0xff; + BYTE sb = (screen_surface[i] >> 0) & 0xff, db = (painted_child_surface[i] >> 0) & 0xff; + BYTE sa = painted_child_surface[i] == COLOR2 ? 0xff : 0x00; + dr = min(max((sr * (0xff - sa) + dr * 0xff + 0x7f) / 0xff, 0), 0xff); + dg = min(max((sg * (0xff - sa) + dg * 0xff + 0x7f) / 0xff, 0), 0xff); + db = min(max((sb * (0xff - sa) + db * 0xff + 0x7f) / 0xff, 0), 0xff); + layered_child_alpha_surface[i] = BGRA2RGB(RGB(dr, dg, db)); + } + + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + ShowWindow(hwnd, SW_MINIMIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, minimized_surface, sizeof(minimized_surface), FALSE); + check_screen_surface(hwnd, minimized_surface, sizeof(minimized_surface), FALSE); + + ShowWindow(hwnd, SW_RESTORE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + SetWindowPos(hwnd, 0, -100, -100, 0, 0, SWP_NOSIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + check_screen_surface(hwnd, hidden_surface, sizeof(hidden_surface), FALSE); + + SetWindowPos(hwnd, 0, -2, -2, 0, 0, SWP_NOSIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, partial_surface, sizeof(partial_surface), TRUE); + + SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + + DestroyWindow(hwnd); + + + /* WS_EX_LAYERED */ + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), TRUE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + + DestroyWindow(hwnd); + + + /* SetLayeredWindowAttributes / LWA_ALPHA */ + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), FALSE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ret = SetLayeredWindowAttributes(hwnd, 0, 0x7f, LWA_ALPHA); + ok(ret, "SetLayeredWindowAttributes failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, layered_const_surface, sizeof(layered_const_surface), TRUE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, layered_const_surface, sizeof(layered_const_surface), TRUE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, layered_const_surface, sizeof(layered_const_surface), TRUE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + + DestroyWindow(hwnd); + + + /* SetLayeredWindowAttributes / LWA_COLORKEY */ + + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + ret = SetLayeredWindowAttributes(hwnd, BGRA2RGB(COLOR2), 0, LWA_COLORKEY); + ok(ret, "SetLayeredWindowAttributes failed, last error %u\n", GetLastError()); + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + check_screen_surface(hwnd, painted_surface, sizeof(painted_surface), FALSE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); + + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + + DestroyWindow(hwnd_child); + check_client_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), FALSE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), FALSE); + + GetClientRect(hwnd, &rect); + OffsetRect(&rect, -rect.left, -rect.top); + + memset(&info, 0, sizeof(info)); + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = rect.right; + info.bmiHeader.biHeight = rect.bottom; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = rect.right * rect.bottom * 4; + + hdc_dst = GetDC(hwnd); + ok(hdc_dst != 0, "GetDC failed, last error %u\n", GetLastError()); + hdc_src = CreateCompatibleDC(hdc_dst); + ok(hdc_src != 0, "CreateCompatibleDC failed, last error %u\n", GetLastError()); + bmp_obj = CreateDIBSection(hdc_src, &info, DIB_RGB_COLORS, (void **)&data, NULL, 0x0); + ok(bmp_obj != 0, "CreateBitmap failed, last error %u\n", GetLastError()); + SelectObject(hdc_src, bmp_obj); + ret = BitBlt(hdc_src, 0, 0, rect.right, rect.bottom, hdc_dst, 0, 0, SRCCOPY); + ok(ret, "BitBlt failed, last error %u\n", GetLastError()); + ReleaseDC(hwnd, hdc_dst); + + for (i = rect.bottom * rect.right; i != 0; i--) + if (data[i - 1] == COLOR2) data[i - 1] |= 0xff000000; + + DestroyWindow(hwnd); + + + /* UpdateLayeredWindow */ + + hdc_dst = GetDC(NULL); + hwnd = CreateWindowW(L"surface", L"", WS_POPUP, 0, 0, 4, 4, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + + SetWindowLongW(hwnd, GWL_EXSTYLE, GetWindowLongW(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), FALSE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, 0, NULL, ULW_OPAQUE); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, screen_surface, sizeof(screen_surface), FALSE); + + ShowWindow(hwnd, SW_SHOW); + flush_events( TRUE ); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, painted_child_surface, sizeof(painted_child_surface), TRUE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, BGRA2RGB(COLOR2), NULL, ULW_COLORKEY); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_surface, sizeof(layered_child_surface), TRUE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, 0, &blend_cst_alpha, ULW_ALPHA); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_const_surface, sizeof(layered_child_const_surface), TRUE); + + ret = UpdateLayeredWindow(hwnd, hdc_dst, NULL, (SIZE *)&rect.right, hdc_src, (POINT *)&rect.left, 0, &blend_src_alpha, ULW_ALPHA); + ok(ret, "UpdateLayeredWindow failed, last error %u\n", GetLastError()); + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + DeleteObject(bmp_obj); + DeleteDC(hdc_src); + ReleaseDC(NULL, hdc_dst); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + hwnd_child = CreateWindowW(L"surface", L"", WS_CHILD | WS_VISIBLE, 1, 1, 2, 2, hwnd, NULL, NULL, NULL); + ok(hwnd_child != 0, "CreateWindowW failed, last error %u\n", GetLastError()); + flush_events( TRUE ); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + paint_client_rect(hwnd, BGRA2RGB(COLOR1)); + paint_client_rect(hwnd_child, BGRA2RGB(COLOR2)); + check_client_surface(hwnd, hidden_surface, sizeof(hidden_surface), TRUE); + check_screen_surface(hwnd, layered_child_alpha_surface, sizeof(layered_child_alpha_surface), TRUE); + + DestroyWindow(hwnd_child); + DestroyWindow(hwnd); + + + UnregisterClassW(L"surface", NULL); + +#undef BGRA2RGB +#undef COLOR1 +#undef COLOR2 +} + START_TEST(win) { char **argv; @@ -12178,6 +12816,8 @@ START_TEST(win) DestroyWindow(hwndMain2); DestroyWindow(hwndMain); + test_surface_composition(); + /* Make sure that following tests are executed last, under Windows they * tend to break the tests which are sensitive to z-order and activation * state of hwndMain and hwndMain2 windows. -- 2.31.0

2 5