January 2022 - Wine-Commits

Eric Pouech : adsldp: Use correct integral type.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: e785da84bd8becffd8bf44d089615a400940b061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e785da84bd8becffd8bf44d0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:41 2022 +0100 adsldp: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 3d5ea29882c..8039065eff3 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -245,7 +245,7 @@ static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) { - UINT size; + ULONG size; WCHAR *name; TRACE("%p,%p\n", iface, retval);

1 0

Eric Pouech : winedbg: Use correct integral type.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: aa9eb8e067049587f6eccaead1be2c614c871f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9eb8e067049587f6eccaea… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:20 2022 +0100 winedbg: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 44079c2fe76..d82c4ccb687 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -341,7 +341,7 @@ static BOOL be_x86_64_is_break_insn(const void* insn) return dbg_read_memory(insn, &c, sizeof(c)) && c == 0xCC; } -static BOOL fetch_value(const char* addr, unsigned sz, int* value) +static BOOL fetch_value(const char* addr, unsigned sz, LONG* value) { char value8; short value16;

1 0

Matteo Bruni : d3dcompiler/tests: Use the relevant d3dcompiler version in blob tests.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: edd9d23ee15e680b4071f73c0ca6406e35e8fc20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd9d23ee15e680b4071f73c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 26 22:37:13 2022 +0100 d3dcompiler/tests: Use the relevant d3dcompiler version in blob tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/blob.c | 205 ++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=edd9d23ee15e680b4071…

1 0

Paul Gofman : winhttp: Attemp sync websocket send even if data doesn't fit frame buffer.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 9861b6796f0edc781584072c3d4d192e9c2784a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9861b6796f0edc781584072c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jan 27 02:03:07 2022 +0300 winhttp: Attemp sync websocket send even if data doesn't fit frame buffer. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 56 ++++++++++++++++++++++++++++-------------- dlls/winhttp/winhttp_private.h | 4 +++ 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e8576256fe7..a5bd828c9b7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3145,10 +3145,10 @@ static DWORD send_bytes( struct socket *socket, char *bytes, int len, int *sent, static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final, WSAOVERLAPPED *ovr ) { - DWORD i = 0, j, offset = 2, len = buflen; - DWORD buffer_size, ret = 0, send_size; - char hdr[14], *mask = NULL; + DWORD i, offset = 2, len = buflen; + DWORD buffer_size, ret = 0; int sent_size; + char hdr[14]; char *ptr; TRACE( "sending %02x frame, len %u.\n", opcode, len ); @@ -3179,7 +3179,6 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR buffer_size = len + offset + 4; assert( buffer_size - len < MAX_FRAME_BUFFER_SIZE ); - if (ovr && buffer_size > MAX_FRAME_BUFFER_SIZE) return WSAEWOULDBLOCK; if (buffer_size > socket->send_frame_buffer_size && socket->send_frame_buffer_size < MAX_FRAME_BUFFER_SIZE) { DWORD new_size; @@ -3199,27 +3198,32 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR memcpy(ptr, hdr, offset); ptr += offset; - mask = &hdr[offset]; - RtlGenRandom( mask, 4 ); - memcpy( ptr, mask, 4 ); + RtlGenRandom( socket->mask, 4 ); + memcpy( ptr, socket->mask, 4 ); ptr += 4; + socket->mask_index = 0; if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { - *ptr++ = (status >> 8) ^ mask[i++ % 4]; - *ptr++ = (status & 0xff) ^ mask[i++ % 4]; + *ptr++ = (status >> 8) ^ socket->mask[socket->mask_index++ % 4]; + *ptr++ = (status & 0xff) ^ socket->mask[socket->mask_index++ % 4]; } offset = ptr - socket->send_frame_buffer; - send_size = offset + buflen; - while (1) + socket->send_remaining_size = offset + buflen; + socket->client_buffer_offset = 0; + while (socket->send_remaining_size) { - j = 0; - while (j < buflen && offset < MAX_FRAME_BUFFER_SIZE) - socket->send_frame_buffer[offset++] = buf[j++] ^ mask[i++ % 4]; + len = min( buflen, MAX_FRAME_BUFFER_SIZE - offset ); + for (i = 0; i < len; ++i) + { + socket->send_frame_buffer[offset++] = buf[socket->client_buffer_offset++] + ^ socket->mask[socket->mask_index++ % 4]; + } sent_size = 0; ret = send_bytes( socket, socket->send_frame_buffer, offset, &sent_size, ovr ); + socket->send_remaining_size -= sent_size; if (ret) { if (ovr && ret == WSA_IO_PENDING) @@ -3229,17 +3233,16 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR } return ret; } - if (!(send_size -= offset)) break; + assert( sent_size == offset ); offset = 0; - buf += j; - buflen -= j; + buflen -= len; } return ERROR_SUCCESS; } static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, const char *buf ) { - DWORD ret, retflags, len; + DWORD ret, retflags, len, i; if (!WSAGetOverlappedResult( socket->request->netconn->socket, ovr, &len, TRUE, &retflags )) return WSAGetLastError(); @@ -3249,6 +3252,22 @@ static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, con ret = send_bytes( socket, socket->send_frame_buffer, socket->bytes_in_send_frame_buffer, NULL, NULL ); if (ret) return ret; } + + assert( socket->bytes_in_send_frame_buffer <= socket->send_remaining_size ); + socket->send_remaining_size -= socket->bytes_in_send_frame_buffer; + + while (socket->send_remaining_size) + { + len = min( socket->send_remaining_size, MAX_FRAME_BUFFER_SIZE ); + for (i = 0; i < len; ++i) + { + socket->send_frame_buffer[i] = buf[socket->client_buffer_offset++] + ^ socket->mask[socket->mask_index++ % 4]; + } + ret = send_bytes( socket, socket->send_frame_buffer, len, NULL, NULL ); + if (ret) return ret; + socket->send_remaining_size -= len; + } return ERROR_SUCCESS; } @@ -3371,7 +3390,6 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ async_send = TRUE; complete_async = TRUE; } - else if (ret == WSAEWOULDBLOCK) async_send = TRUE; } if (async_send) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 639c97b126e..b41eb0ee676 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -247,6 +247,8 @@ struct socket struct queue recv_q; enum socket_opcode opcode; DWORD read_size; + char mask[4]; + unsigned int mask_index; BOOL close_frame_received; DWORD close_frame_receive_err; USHORT status; @@ -254,7 +256,9 @@ struct socket DWORD reason_len; char *send_frame_buffer; unsigned int send_frame_buffer_size; + unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; + unsigned int client_buffer_offset; }; struct send_request

1 0

Paul Gofman : winhttp: Attemp sync websocket send even if data doesn't fit SSL buffer.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: a0e5fcdc001cb5ed3d109d7f39a44bcfbff707b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0e5fcdc001cb5ed3d109d7f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 27 02:03:06 2022 +0300 winhttp: Attemp sync websocket send even if data doesn't fit SSL buffer. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 15 +++++-- dlls/winhttp/request.c | 35 ++++++++++++---- dlls/winhttp/tests/notification.c | 86 ++++++++++++++++++++++++++++----------- dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 101 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0e5fcdc001cb5ed3d10…

1 0

Eric Pouech : comctl32: Use correct integral type.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 5e56ada9c4552ff6865f668fae472df3321bba8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e56ada9c4552ff6865f668f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:47 2022 +0100 comctl32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 7 ++++++- dlls/comctl32/taskdialog.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index a2a1c9e0561..88b48a4a5c0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1229,7 +1229,12 @@ static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) /* ImageList has priority over image */ if (infoPtr->imagelist.himl) - ImageList_GetIconSize(infoPtr->imagelist.himl, &size.cx, &size.cy); + { + int scx, scy; + ImageList_GetIconSize(infoPtr->imagelist.himl, &scx, &scy); + size.cx = scx; + size.cy = scy; + } else if (infoPtr->u.image) { if (infoPtr->image_type == IMAGE_ICON) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 92a2b533efb..4523695d614 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -430,7 +430,8 @@ static void taskdialog_get_expando_size(struct taskdialog_info *dialog_info, HWN HFONT hfont, old_hfont; HDC hdc; RECT rect = {0}; - LONG icon_width, icon_height, text_offset; + LONG icon_width, icon_height; + INT text_offset; LONG max_width, max_text_height; hdc = GetDC(hwnd); @@ -1092,7 +1093,8 @@ static void taskdialog_draw_expando_control(struct taskdialog_info *dialog_info, HDC hdc; RECT rect = {0}; WCHAR *text; - LONG icon_width, icon_height, text_offset; + LONG icon_width, icon_height; + INT text_offset; UINT style = DFCS_FLAT; BOOL draw_focus;

1 0

Eric Pouech : winetest: Use correct integral type.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 53085f10f105366145f94daf69f1335ec3be1beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=53085f10f105366145f94daf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:26 2022 +0100 winetest: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0c431a903d7..3ed514f73e2 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -318,7 +318,8 @@ static BOOL is_native_dll( HMODULE module ) */ static BOOL is_stub_dll(const char *filename) { - DWORD size, ver; + UINT size; + DWORD ver; BOOL isstub = FALSE; char *p, *data;

1 0

Nikolay Sivov : d3dcompiler: Implement D3DWriteBlobToFile().
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: d12d6b29786575d261bcd41236c0937daf291627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d12d6b29786575d261bcd412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 22:37:14 2022 +0100 d3dcompiler: Implement D3DWriteBlobToFile(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/blob.c | 25 ++++++++++++++++++++++--- dlls/d3dcompiler_43/tests/blob.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 5cc49fe5699..ee23893576d 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -514,9 +514,28 @@ HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) return S_OK; } -HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob* blob, const WCHAR *filename, BOOL overwrite) +HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob *blob, const WCHAR *filename, BOOL overwrite) { - FIXME("blob %p, filename %s, overwrite %d\n", blob, debugstr_w(filename), overwrite); + DWORD written_size; + SIZE_T data_size; + HANDLE file; + BOOL ret; + + TRACE("blob %p, filename %s, overwrite %#x.\n", blob, debugstr_w(filename), overwrite); + + file = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, overwrite ? CREATE_ALWAYS : CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); - return E_NOTIMPL; + data_size = ID3D10Blob_GetBufferSize(blob); + ret = WriteFile(file, ID3D10Blob_GetBufferPointer(blob), data_size, &written_size, NULL); + CloseHandle(file); + if (!ret || data_size != written_size) + { + WARN("Failed to write blob contents.\n"); + return E_FAIL; + } + + return S_OK; } diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 9369fcd97f5..400d5940bf7 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -859,6 +859,37 @@ static void test_D3DReadFileToBlob(void) DeleteFileW(filename); ID3D10Blob_Release(blob); } + +static void test_D3DWriteBlobToFile(void) +{ + WCHAR temp_dir[MAX_PATH], filename[MAX_PATH]; + ID3DBlob *blob; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + GetTempFileNameW(temp_dir, NULL, 0, filename); + + hr = D3DCreateBlob(16, &blob); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = D3DWriteBlobToFile(blob, filename, FALSE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + + hr = D3DWriteBlobToFile(blob, filename, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + DeleteFileW(filename); + + hr = D3DWriteBlobToFile(blob, filename, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = D3DWriteBlobToFile(blob, filename, FALSE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + + DeleteFileW(filename); + + ID3D10Blob_Release(blob); +} #endif #endif @@ -870,6 +901,7 @@ START_TEST(blob) test_get_blob_part2(); #if D3D_COMPILER_VERSION >= 46 test_D3DReadFileToBlob(); + test_D3DWriteBlobToFile(); #endif #endif }

1 0

Paul Gofman : winhttp: Append mask to output frame even if buffer length is zero.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 67252dec2234d4ab380ef3b727b9503ae1f4d3d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67252dec2234d4ab380ef3b7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 27 02:03:05 2022 +0300 winhttp: Append mask to output frame even if buffer length is zero. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cbfe2b21bd0..0a5362d3c16 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3174,8 +3174,7 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR offset += 8; } - buffer_size = len + offset; - if (len) buffer_size += 4; + buffer_size = len + offset + 4; assert( buffer_size - len < MAX_FRAME_BUFFER_SIZE ); if (ovr && buffer_size > MAX_FRAME_BUFFER_SIZE) return WSAEWOULDBLOCK; if (buffer_size > socket->send_frame_buffer_size && socket->send_frame_buffer_size < MAX_FRAME_BUFFER_SIZE) @@ -3196,13 +3195,11 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR memcpy(ptr, hdr, offset); ptr += offset; - if (len) - { - mask = &hdr[offset]; - RtlGenRandom( mask, 4 ); - memcpy( ptr, mask, 4 ); - ptr += 4; - } + + mask = &hdr[offset]; + RtlGenRandom( mask, 4 ); + memcpy( ptr, mask, 4 ); + ptr += 4; if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ {

1 0

Eric Pouech : comdlg32: Use correct integral type.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: d55aad928bb658126c745c60ae8bd9773f5834c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d55aad928bb658126c745c60… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:53 2022 +0100 comdlg32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index d6957d51a66..603d48876c0 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -393,7 +393,8 @@ static void fill_filename_from_selection(FileDialogImpl *This) IShellItem *psi; LPWSTR *names; HRESULT hr; - UINT item_count, valid_count; + DWORD item_count; + UINT valid_count; UINT len_total, i; if(!This->psia_selection) @@ -412,7 +413,7 @@ static void fill_filename_from_selection(FileDialogImpl *This) hr = IShellItemArray_GetItemAt(This->psia_selection, i, &psi); if(SUCCEEDED(hr)) { - UINT attr; + DWORD attr; hr = IShellItem_GetAttributes(psi, SFGAO_FOLDER, &attr); if(SUCCEEDED(hr) && @@ -2675,7 +2676,7 @@ static HRESULT WINAPI IFileDialog2_fnGetResult(IFileDialog2 *iface, IShellItem * if(This->psia_results) { - UINT item_count; + DWORD item_count; hr = IShellItemArray_GetCount(This->psia_results, &item_count); if(SUCCEEDED(hr)) {

1 0