June 2022 - Wine-Commits - list.winehq.org

Stefan Dösinger : include: Emit CFI directives when building on Mac with gcc.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 9618f5ab8f74dfbff32b868baae78d4167466834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9618f5ab8f74dfbff32b868b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 15 13:16:26 2022 +0300 include: Emit CFI directives when building on Mac with gcc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53157 Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 0547ee94b19..2c996ccd86b 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -35,7 +35,7 @@ # define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name) #endif -#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__)) +#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || ((defined(__APPLE__) || defined(__clang__)) && defined(__GNUC__) && !defined(__SEH__)) # define __ASM_CFI(str) str #else # define __ASM_CFI(str)

1 0

Zebediah Figura : user32/tests: Add some more tests related to the RAWINPUT structure.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: ac5f064521e20ead01829914f392d801d3099fa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac5f064521e20ead01829914… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 13 01:45:41 2022 -0500 user32/tests: Add some more tests related to the RAWINPUT structure. --- dlls/user32/tests/input.c | 96 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6232a7456e8..0d003c6cc21 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2101,13 +2101,29 @@ static void test_RegisterRawInputDevices(void) static int rawinputbuffer_wndproc_count; +typedef struct +{ + DWORD dwType; + DWORD dwSize; + ULONG hDevice; + ULONG wParam; +} RAWINPUTHEADER32; + #ifdef _WIN64 +typedef RAWINPUTHEADER RAWINPUTHEADER64; typedef RAWINPUT RAWINPUT64; #else typedef struct { - RAWINPUTHEADER header; - char pad[8]; + DWORD dwType; + DWORD dwSize; + ULONGLONG hDevice; + ULONGLONG wParam; +} RAWINPUTHEADER64; + +typedef struct +{ + RAWINPUTHEADER64 header; union { RAWMOUSE mouse; RAWKEYBOARD keyboard; @@ -2124,9 +2140,9 @@ static int rawinput_buffer_mouse_x(void *buffer, size_t index) static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + UINT i, size, count, rawinput_size, iteration = rawinputbuffer_wndproc_count++; RAWINPUT ri; char buffer[16 * sizeof(RAWINPUT64)]; - UINT size, count, rawinput_size, iteration = rawinputbuffer_wndproc_count++; MSG message; if (is_wow64) rawinput_size = sizeof(RAWINPUT64); @@ -2134,8 +2150,10 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara if (msg == WM_INPUT) { + SetLastError(0xdeadbeef); count = GetRawInputBuffer(NULL, NULL, sizeof(RAWINPUTHEADER)); ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); size = sizeof(buffer); count = GetRawInputBuffer(NULL, &size, sizeof(RAWINPUTHEADER)); @@ -2147,6 +2165,27 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); ok(count == 3, "GetRawInputBuffer returned %u\n", count); ok(size == sizeof(buffer), "GetRawInputBuffer returned unexpected size: %u\n", size); + + for (i = 0; i < 3; ++i) + { + if (is_wow64) + { + const RAWINPUT64 *data = &((RAWINPUT64 *)buffer)[i]; + ok(data->header.dwType == RIM_TYPEMOUSE, "Unexpected rawinput type: %lu\n", data->header.dwType); + ok(data->header.dwSize == sizeof(*data), "Unexpected rawinput size: %lu\n", data->header.dwSize); + todo_wine_if (wparam) + ok(data->header.wParam == wparam, "Unexpected wparam: %#I64x\n", data->header.wParam); + } + else + { + const RAWINPUT *data = &((RAWINPUT *)buffer)[i]; + ok(data->header.dwType == RIM_TYPEMOUSE, "Unexpected rawinput type: %lu\n", data->header.dwType); + ok(data->header.dwSize == sizeof(*data), "Unexpected rawinput size: %lu\n", data->header.dwSize); + todo_wine_if (wparam) + ok(data->header.wParam == wparam, "Unexpected wparam: %#Ix\n", data->header.wParam); + } + } + ok(rawinput_buffer_mouse_x(buffer, 0) == 2, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 0)); ok(rawinput_buffer_mouse_x(buffer, 1) == 3, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 1)); ok(rawinput_buffer_mouse_x(buffer, 2) == 4, "Unexpected rawinput data: %d\n", rawinput_buffer_mouse_x(buffer, 2)); @@ -2183,7 +2222,12 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara { SetLastError(0xdeadbeef); count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, 0); - ok(count == ~0U, "GetRawInputData succeeded\n"); + ok(count == ~0u, "GetRawInputData returned %d\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER) + 1); + ok(count == ~0u, "GetRawInputData returned %d\n", count); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2204,6 +2248,30 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara ok(count == sizeof(ri), "GetRawInputData failed\n"); ok(ri.data.mouse.lLastX == 6, "Unexpected rawinput data: %ld\n", ri.data.mouse.lLastX); ok(GetLastError() == 0xdeadbeef, "GetRawInputData returned %08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = sizeof(buffer); + if (sizeof(void *) == 8) + { + count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER32)); + ok(count == ~0u, "GetRawInputData returned %d\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); + } + else + { + count = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &ri, &size, sizeof(RAWINPUTHEADER64)); + if (is_wow64) + { + todo_wine ok(count == sizeof(ri), "GetRawInputData returned %d\n", count); + ok(ri.data.mouse.lLastX == 6, "Unexpected rawinput data: %ld\n", ri.data.mouse.lLastX); + todo_wine ok(GetLastError() == 0xdeadbeef, "GetRawInputData returned %08lx\n", GetLastError()); + } + else + { + ok(count == ~0u, "GetRawInputData returned %d\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputData returned %08lx\n", GetLastError()); + } + } } else { @@ -2219,9 +2287,9 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara static void test_GetRawInputBuffer(void) { + unsigned int size, count, rawinput_size, header_size; RAWINPUTDEVICE raw_devices[1]; char buffer[16 * sizeof(RAWINPUT64)]; - UINT size, count, rawinput_size; HWND hwnd; BOOL ret; POINT pt; @@ -2295,6 +2363,21 @@ static void test_GetRawInputBuffer(void) ok(count == ~0U, "GetRawInputBuffer succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + size = sizeof(buffer); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER) + 1); + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08lx\n", GetLastError()); + + /* the function returns 64-bit RAWINPUT structures on WoW64, but still + * forbids sizeof(RAWINPUTHEADER) from the wrong architecture */ + SetLastError(0xdeadbeef); + size = sizeof(buffer); + header_size = (sizeof(void *) == 8 ? sizeof(RAWINPUTHEADER32) : sizeof(RAWINPUTHEADER64)); + count = GetRawInputBuffer((RAWINPUT*)buffer, &size, header_size); + ok(count == ~0U, "GetRawInputBuffer succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRawInputBuffer returned %08lx\n", GetLastError()); + size = sizeof(buffer); memset(buffer, 0, sizeof(buffer)); count = GetRawInputBuffer((RAWINPUT*)buffer, &size, sizeof(RAWINPUTHEADER)); @@ -2365,6 +2448,9 @@ static LRESULT CALLBACK rawinput_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA ret = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &raw, &raw_size, sizeof(RAWINPUTHEADER)); ok(ret > 0 && ret != (UINT)-1, "GetRawInputData failed\n"); ok(raw.header.dwType == RIM_TYPEMOUSE, "Unexpected rawinput type: %lu\n", raw.header.dwType); + ok(raw.header.dwSize == raw_size, "Expected size %u, got %lu\n", raw_size, raw.header.dwSize); + todo_wine_if (wparam) + ok(raw.header.wParam == wparam, "Expected wparam %Iu, got %Iu\n", wparam, raw.header.wParam); ok(!(raw.data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE), "Unexpected absolute rawinput motion\n"); ok(!(raw.data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP), "Unexpected virtual desktop rawinput motion\n");

1 0

Zebediah Figura : user32: Correctly fill the RAWINPUT structure on WoW64.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 12e3c4949fe581c8afea01034d96eaeebc03360b URL: https://source.winehq.org/git/wine.git/?a=commit;h=12e3c4949fe581c8afea0103… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 13 01:53:48 2022 -0500 user32: Correctly fill the RAWINPUT structure on WoW64. This changes the offset of the wParam field. --- dlls/user32/rawinput.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index ab542956f11..99e2270b77c 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -646,12 +646,20 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * } #ifdef _WIN64 +typedef RAWINPUTHEADER RAWINPUTHEADER64; typedef RAWINPUT RAWINPUT64; #else typedef struct { - RAWINPUTHEADER header; - char pad[8]; + DWORD dwType; + DWORD dwSize; + ULONGLONG hDevice; + ULONGLONG wParam; +} RAWINPUTHEADER64; + +typedef struct +{ + RAWINPUTHEADER64 header; union { RAWMOUSE mouse; RAWKEYBOARD keyboard;

1 0

Zebediah Figura : win32u: Move NtUserGetRawInputBuffer from user32.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 591fd06b6c8e3266d9ed534408c931261a0f6099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=591fd06b6c8e3266d9ed5344… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 15:35:14 2022 -0500 win32u: Move NtUserGetRawInputBuffer from user32. --- dlls/user32/rawinput.c | 111 -------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 4 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntuser_private.h | 4 + dlls/win32u/rawinput.c | 245 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 1 + 10 files changed, 260 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=591fd06b6c8e3266d9ed…

1 0

Piotr Caban : d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromResourceA.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 1b39e769b5132315797813b7b97bda595e28ce5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b39e769b5132315797813b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 14:19:03 2022 +0200 d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTextureFromResourceA. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 31775fd6863..7a4031727fa 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -674,11 +674,32 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE mo if (!device) return E_INVALIDARG; - hr = load_resourceA(module, resource, &buffer, &size); - if (FAILED(hr)) + if (pump) + { + ID3DX10DataProcessor *processor; + ID3DX10DataLoader *loader; + + if (FAILED((hr = D3DX10CreateAsyncResourceLoaderA(module, resource, &loader)))) + return hr; + if (FAILED((hr = D3DX10CreateAsyncTextureProcessor(device, load_info, &processor)))) + { + ID3DX10DataLoader_Destroy(loader); + return hr; + } + if (FAILED((hr = ID3DX10ThreadPump_AddWorkItem(pump, loader, processor, hresult, (void **)texture)))) + { + ID3DX10DataLoader_Destroy(loader); + ID3DX10DataProcessor_Destroy(processor); + } return hr; + } - return D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); + if (FAILED((hr = load_resourceA(module, resource, &buffer, &size)))) + return hr; + hr = create_texture(device, buffer, size, load_info, texture); + if (hresult) + *hresult = hr; + return hr; } HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource,

1 0

Jacek Caban : win32u: Move NtUserGetTitleBarInfo implementation from user32.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 86f9c8b1f6f8f5eb00c848e22b80a043726c6d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f9c8b1f6f8f5eb00c848e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 22:33:26 2022 +0200 win32u: Move NtUserGetTitleBarInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/nonclient.c | 125 ------------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/defwnd.c | 73 ++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++ include/ntuser.h | 1 + 8 files changed, 86 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86f9c8b1f6f8f5eb00c8…

1 0

Hans Leidekker : winhttp: Release object on allocation failure.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: c8a356ca1595f708e21bd9ca3a88c8e91f00311f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8a356ca1595f708e21bd9ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 13 11:24:27 2022 +0200 winhttp: Release object on allocation failure. --- dlls/winhttp/request.c | 52 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7fb582362aa..ece4e34f0b8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2308,7 +2308,12 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, const WCHAR *headers, DWORD { struct send_request *s; - if (!(s = malloc( sizeof(*s) ))) return FALSE; + if (!(s = malloc( sizeof(*s) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } s->headers = strdupW( headers ); s->headers_len = headers_len; s->optional = optional; @@ -2886,8 +2891,12 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) { struct receive_response *r; - if (!(r = malloc( sizeof(*r) ))) return FALSE; - + if (!(r = malloc( sizeof(*r) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr, &request->hdr ))) free( r ); } @@ -2981,7 +2990,13 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { struct query_data *q; - if (!(q = malloc( sizeof(*q) ))) return FALSE; + if (!(q = malloc( sizeof(*q) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + q->available = available; if ((ret = queue_task( &request->queue, task_query_data_available, &q->task_hdr, &request->hdr ))) @@ -3034,7 +3049,12 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW { struct read_data *r; - if (!(r = malloc( sizeof(*r) ))) return FALSE; + if (!(r = malloc( sizeof(*r) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } r->buffer = buffer; r->to_read = to_read; r->read = read; @@ -3110,7 +3130,12 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_w { struct write_data *w; - if (!(w = malloc( sizeof(*w) ))) return FALSE; + if (!(w = malloc( sizeof(*w) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } w->buffer = buffer; w->to_write = to_write; w->written = written; @@ -3973,10 +3998,11 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D if (!(r = malloc( sizeof(*r) ))) { InterlockedDecrement( &socket->hdr.pending_receives ); + release_object( &socket->hdr ); return ERROR_OUTOFMEMORY; } - r->buf = buf; - r->len = len; + r->buf = buf; + r->len = len; if ((ret = queue_task( &socket->recv_q, task_socket_receive, &r->task_hdr, &socket->hdr ))) { @@ -4191,8 +4217,8 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas cancel_queue( &socket->recv_q ); } - if (prev_state < SOCKET_STATE_SHUTDOWN - && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) goto done; + if (prev_state < SOCKET_STATE_SHUTDOWN && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) + goto done; if (pending_receives == 1 && socket->close_frame_received) { @@ -4205,7 +4231,11 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas { struct socket_shutdown *s; - if (!(s = calloc( 1, sizeof(*s) ))) return FALSE; + if (!(s = calloc( 1, sizeof(*s) ))) + { + ret = ERROR_OUTOFMEMORY; + goto done; + } if ((ret = queue_task( &socket->recv_q, task_socket_close, &s->task_hdr, &socket->hdr ))) { InterlockedDecrement( &socket->hdr.pending_receives );

1 0

Jacek Caban : win32u: Move NtUserDrawCaptionTemp implementation from user32.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 67e39efb7528dc9e5505b8e7fbc3e0e39f1c5779 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67e39efb7528dc9e5505b8e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:52:44 2022 +0200 win32u: Move NtUserDrawCaptionTemp implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/nonclient.c | 185 +------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/defwnd.c | 112 +++++++++++++++++++++++++- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 7 ++ include/ntuser.h | 2 + 8 files changed, 128 insertions(+), 185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67e39efb7528dc9e5505…

1 0

Jinoh Kang : comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: wine Branch: master Commit: 0b07bb8566b60cf7c2d7410999a0db5a011b8ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b07bb8566b60cf7c2d74109… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Mar 15 02:40:03 2022 +0900 comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush. This is consistent with the behaviour of other static control styles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/comctl32/static.c | 7 ++++--- dlls/comctl32/tests/static.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 3151cda6552..c09655da903 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -849,13 +849,16 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style { HDC hMemDC; HBITMAP hBitmap, oldbitmap; + RECT rcClient; + + GetClientRect( hwnd, &rcClient ); + FillRect( hdc, &rcClient, hbrush ); if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) && (hMemDC = CreateCompatibleDC( hdc ))) { BITMAP bm; - RECT rcClient; LOGBRUSH brush; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); @@ -870,10 +873,8 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style if (brush.lbStyle == BS_SOLID) SetBkColor(hdc, brush.lbColor); } - GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - FillRect( hdc, &rcClient, hbrush ); rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; rcClient.right = rcClient.left + bm.bmWidth; diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index dbd71539a57..756fed86fe0 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -118,7 +118,6 @@ static void test_updates(int style) { HDC hdc = GetDC(hStatic); COLORREF colour = GetPixel(hdc, 10, 10); - todo_wine ok(colour == 0, "Unexpected pixel color.\n"); ReleaseDC(hStatic, hdc); }

1 0

Francois Gouget : testbot: Empty configuration regexps match any configuration.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 23f7f716a869553d0a0e7ab54a066a4f36614936 URL: https://source.winehq.org/git/tools.git/?a=commit;h=23f7f716a869553d0a0e7ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:50:03 2022 +0200 testbot: Empty configuration regexps match any configuration. Unlike the failure regexps which must not be empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 720482f3..9e73b5f6 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1390,7 +1390,7 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { $ConfigRegExp and $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= [];

1 0