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

[PATCH 2/6] winegcc: Link unix libs directly to native libraries.
by Jacek Caban 28 May '21

28 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch uses --subsystem,native option (in addition to -munix) to opt-in to that. My thinking is to make that for -munix at when all relevant code is ready. tools/winegcc/utils.c | 14 +++++++------- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 19 ++++++++++++++++--- 3 files changed, 24 insertions(+), 11 deletions(-)

1 0

[PATCH 1/6] winegcc: Use -soname for unix libs.
by Jacek Caban 28 May '21

28 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This allows linking to them using ELF linking and providing Unix library as full file name. It's not needed on Mach-O targets. tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] rtworkq/tests: Document the CoGetApartmentType() situation.
by Francois Gouget 28 May '21

28 May '21

It is reported as missing on Vista but is available on Windows 7 while rtworkq itself is only available on Windows 8+. So there is no need to load CoGetApartmentType() dynamically. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Given that loading CoGetApartmentType() dynamically seems undesirable I propose to just document the situation instead. See: https://test.winehq.org/data/tests/rtworkq:rtworkq.html https://www.winehq.org/pipermail/wine-devel/2021-April/185461.html --- dlls/rtworkq/tests/rtworkq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c index 627e024d761..f6c2fc594e8 100644 --- a/dlls/rtworkq/tests/rtworkq.c +++ b/dlls/rtworkq/tests/rtworkq.c @@ -31,7 +31,11 @@ static void test_platform_init(void) APTTYPE apttype; HRESULT hr; - /* Startup initializes MTA. */ + /* Startup initializes MTA. + * Note that CoGetApartmentType() is available on Windows 7+ while + * rtworkq is only available on Windows 8+. So it is not necessary to + * load CoGetApartmentType() dynamically. + */ hr = CoGetApartmentType(&apttype, &qualifier); ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); -- 2.20.1

1 0

[PATCH] ntdll/tests: Fix the XState AllFeatureSize check on old CPUs.
by Francois Gouget 28 May '21

28 May '21

On old CPUs lacking XSAVEC, Windows 8+ does not set AllFeatureSize and AllFeatures. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51188 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- As per the comment and commit message, my understanding is that this is tied to the XSAVEC support in the CPU. I removed broken() to match the xstate.AllFeatures check. But I'm also fine with having either or both with broken(): I don't know what we want / can do in Wine for this. This should fix the Windows 8.1 failures on cw-gtx560 and cw-rx460: https://test.winehq.org/data/patterns.html#ntdll:virtual --- dlls/ntdll/tests/virtual.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index e657a424fcd..5f155b1a147 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -952,12 +952,14 @@ static void test_user_shared_data(void) ok(xstate.OptimizedSave, "Got zero OptimizedSave with compaction enabled.\n"); ok(!xstate.AlignedFeatures, "Got unexpected AlignedFeatures %s.\n", wine_dbgstr_longlong(xstate.AlignedFeatures)); - ok(xstate.AllFeatureSize >= 512 + sizeof(XSTATE), "Got unexpected AllFeatureSize %u.\n", - xstate.AllFeatureSize); + ok(xstate.AllFeatureSize >= 512 + sizeof(XSTATE) + || !xstate.AllFeatureSize /* win8 on CPUs without XSAVEC */, + "Got unexpected AllFeatureSize %u.\n", xstate.AllFeatureSize); for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i] || !xstate.AllFeatures[i], + ok(xstate.AllFeatures[i] == feature_sizes[i] + || !xstate.AllFeatures[i] /* win8+ on CPUs without XSAVEC */, "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i, -- 2.20.1

1 0

[PATCH] ntdll: Update the STATUS_NO_SUCH_DEVICE error mapping.
by Francois Gouget 28 May '21

28 May '21

Windows 10 >= 1909 returns ERROR_NO_SUCH_DEVICE. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should clear out: https://test.winehq.org/data/patterns.html#ntdll:error --- dlls/ntdll/make_errors | 2 +- dlls/ntdll/tests/error.c | 2 +- include/winerror.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors index 5b7885e0427..a994808c2ef 100755 --- a/dlls/ntdll/make_errors +++ b/dlls/ntdll/make_errors @@ -246,7 +246,7 @@ my %error_map = qw( STATUS_INVALID_CID ERROR_INVALID_PARAMETER STATUS_TIMER_NOT_CANCELED ERROR_TIMER_NOT_CANCELED STATUS_INVALID_PARAMETER ERROR_INVALID_PARAMETER - STATUS_NO_SUCH_DEVICE ERROR_FILE_NOT_FOUND + STATUS_NO_SUCH_DEVICE ERROR_NO_SUCH_DEVICE STATUS_NO_SUCH_FILE ERROR_FILE_NOT_FOUND STATUS_INVALID_DEVICE_REQUEST ERROR_INVALID_FUNCTION STATUS_END_OF_FILE ERROR_HANDLE_EOF diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index c812aa779cc..8f099e6903a 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -247,7 +247,7 @@ static void run_error_tests(void) cmp(STATUS_RESOURCE_TYPE_NOT_FOUND, ERROR_RESOURCE_TYPE_NOT_FOUND); cmp(STATUS_RESOURCE_NAME_NOT_FOUND, ERROR_RESOURCE_NAME_NOT_FOUND); cmp(STATUS_RESOURCE_LANG_NOT_FOUND, ERROR_RESOURCE_LANG_NOT_FOUND); - cmp(STATUS_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND); + cmp3(STATUS_NO_SUCH_DEVICE, ERROR_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND); cmp(STATUS_NO_SUCH_FILE, ERROR_FILE_NOT_FOUND); cmp(STATUS_INVALID_DEVICE_REQUEST, ERROR_INVALID_FUNCTION); cmp2(STATUS_VOLUME_NOT_UPGRADED, ERROR_INVALID_FUNCTION); diff --git a/include/winerror.h b/include/winerror.h index 86f7aace68e..8765e177029 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -410,6 +410,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_THREAD_MODE_NOT_BACKGROUND 401 #define ERROR_PROCESS_MODE_ALREADY_BACKGROUND 402 #define ERROR_PROCESS_MODE_NOT_BACKGROUND 403 +#define ERROR_NO_SUCH_DEVICE 433 #define ERROR_PNP_QUERY_REMOVE_DEVICE_TIMEOUT 480 #define ERROR_PNP_QUERY_REMOVE_RELATED_DEVICE_TIMEOUT 481 #define ERROR_PNP_QUERY_REMOVE_UNRELATED_DEVICE_TIMEOUT 482 -- 2.20.1

2 2

[PATCH] user32/tests: Fix a typo in a comment.
by Francois Gouget 28 May '21

28 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 8fab62c951e..89a524407bf 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1500,7 +1500,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ /* SPI_GETNONCLIENTMETRICS returns some "cooked" values. For instance if the caption font height is higher than the CaptionHeight field, the latter is adjusted accordingly. To be able to restore these setting - accurately be restore the raw values. */ + accurately we restore the raw values. */ Ncmorig.iCaptionWidth = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, real_dpi); Ncmorig.iCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iSmCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_SMCAPTIONHEIGHT_VALNAME, dpi); -- 2.20.1

2 1

[PATCH] user32/tests: Trace GetLastError() when OpenClipboard() fails in edit.
by Francois Gouget 28 May '21

28 May '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 34bb1e5a76e..6edec12e03b 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2187,7 +2187,7 @@ static void test_espassword(void) ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); r = OpenClipboard(hwEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); r = CloseClipboard(); @@ -3190,7 +3190,7 @@ static void test_paste(void) GlobalUnlock(hmem); r = OpenClipboard(hEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); hmem_ret = SetClipboardData(CF_TEXT, hmem); @@ -3213,7 +3213,7 @@ static void test_paste(void) GlobalUnlock(hmem); r = OpenClipboard(hEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); hmem_ret = SetClipboardData(CF_TEXT, hmem); -- 2.20.1

2 1

[PATCH v5 1/5] server: Add hardware_msg_data size for variable size messages.
by Rémi Bernon 28 May '21

28 May '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v5: Add padding field to align hardware_msg_data on 8 bytes. dlls/user32/rawinput.c | 2 +- server/protocol.def | 2 ++ server/queue.c | 15 ++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e4e7bad508f..115513ea144 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -624,7 +624,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, data->header.dwSize - sizeof(RAWINPUTHEADER)); data->header.dwSize += overhead; data = NEXTRAWINPUTBLOCK(data); - msg_data++; + msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size); } if (count == 0 && next_size == 0) *data_size = 0; diff --git a/server/protocol.def b/server/protocol.def index 4239be834d1..0c98ac31328 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -308,6 +308,8 @@ union rawinput struct hardware_msg_data { lparam_t info; /* extra info */ + data_size_t size; /* size of hardware message data */ + int __pad; unsigned int hw_id; /* unique id */ unsigned int flags; /* hook flags */ struct hw_msg_source source; /* message source */ diff --git a/server/queue.c b/server/queue.c index 5d65e030112..07d4c7e0885 100644 --- a/server/queue.c +++ b/server/queue.c @@ -367,6 +367,7 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour memset( msg_data, 0, sizeof(*msg_data) ); msg_data->info = info; + msg_data->size = msg->data_size; msg_data->source = source; return msg; } @@ -1794,6 +1795,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data = &raw_msg.data; msg_data->info = input->mouse.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; @@ -1929,6 +1931,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data = &raw_msg.data; msg_data->info = input->kbd.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = input->kbd.flags; msg_data->rawinput.type = RIM_TYPEKEYBOARD; msg_data->rawinput.kbd.message = message_code; @@ -1996,6 +1999,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg_data = &raw_msg.data; msg_data->info = 0; + msg_data->size = sizeof(*msg_data); msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; @@ -3295,16 +3299,17 @@ DECL_HANDLER(get_rawinput_buffer) { struct message *msg = LIST_ENTRY( ptr, struct message, entry ); struct hardware_msg_data *data = msg->data; + data_size_t extra_size = data->size - sizeof(*data); ptr = list_next( &input->msg_list, ptr ); if (msg->msg != WM_INPUT) continue; - next_size = req->rawinput_size; + next_size = req->rawinput_size + extra_size; if (size + next_size > req->buffer_size) break; - if (cur + sizeof(*data) > buf + get_reply_max_size()) break; - if (cur + sizeof(*data) > buf + buf_size) + if (cur + data->size > buf + get_reply_max_size()) break; + if (cur + data->size > buf + buf_size) { - buf_size += buf_size / 2; + buf_size += buf_size / 2 + extra_size; if (!(tmp = realloc( buf, buf_size ))) { set_error( STATUS_NO_MEMORY ); @@ -3314,7 +3319,7 @@ DECL_HANDLER(get_rawinput_buffer) buf = tmp; } - memcpy(cur, data, sizeof(*data)); + memcpy( cur, data, data->size ); list_remove( &msg->entry ); free_message( msg ); -- 2.31.0

2 6

[website 1/2] Update Dutch IRC website
by Floris Renaud 28 May '21

28 May '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/nl/irc.template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/templates/nl/irc.template b/templates/nl/irc.template index 6852edc2..b272da53 100644 --- a/templates/nl/irc.template +++ b/templates/nl/irc.template @@ -15,6 +15,10 @@ kanalen over Wine. Gebruik uw favorite IRC programma met de volgende instellinge <td><b>Poort:</b></td> <td>6697</td> </tr> + <tr> + <td><b>TLS:</b></td> + <td>ingeschakeld</td> + </tr> </table> </blockquote> @@ -51,9 +55,9 @@ kunnen de chat bezoeken met:</p> </ul> <p>Om de gespekken zo nuttig mogelijk te houden, doorzoek eerst de -<a href="https://wiki.winehq.org/FAQ">Wine FAQ</a>, +<a href="https://wiki.winehq.org/FAQ_nl">Wine FAQ</a>, <a href="//appdb.winehq.org">AppDB</a> en de -<a href="//www.winehq.org/download">download pagina's</a> voordat +<a href="https://wiki.winehq.org/Download_nl">download pagina's</a> voordat u een vraag stelt.</p> <h2>IRC Regels en Straffen</h2> @@ -90,14 +94,13 @@ gezet en waarom de sanctie moet worden opgeheven.</p> </tr> <tr> <td>Gebruik pastebin als u meer dan 1 of 2 regels tekst plakt</td> - <td><a href="http://winehq.pastebin.com">winehq.pastebin.com</a> en - <a href="http://pastebin.ca">pastebin.ca</a> kunnen worden gebruikt.</td> + <td></td> <td>0</td> <td>5</td> </tr> <tr> <td>Gebruik het goede kanaal</td> - <td>Als u niet zeker weet welk kanaal vraag het in <b>#winehq</b>.</td> + <td>Bij twijfel, vraag het in <b>#winehq</b>.</td> <td>2</td> <td>3</td> </tr> -- 2.32.0.rc0

1 1

[PATCH v4 1/5] server: Add hardware_msg_data size for variable size messages.
by Rémi Bernon 28 May '21

28 May '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Pretty much rewritten the series around this new hardware_msg_data size, and reordered patches. HID WM_INPUT messages are translated earlier, without any report, and the reports are sent last. dlls/user32/rawinput.c | 2 +- server/protocol.def | 1 + server/queue.c | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e4e7bad508f..115513ea144 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -624,7 +624,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, data->header.dwSize - sizeof(RAWINPUTHEADER)); data->header.dwSize += overhead; data = NEXTRAWINPUTBLOCK(data); - msg_data++; + msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size); } if (count == 0 && next_size == 0) *data_size = 0; diff --git a/server/protocol.def b/server/protocol.def index 4239be834d1..6a185b822e7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -308,6 +308,7 @@ union rawinput struct hardware_msg_data { lparam_t info; /* extra info */ + data_size_t size; /* size of hardware message data */ unsigned int hw_id; /* unique id */ unsigned int flags; /* hook flags */ struct hw_msg_source source; /* message source */ diff --git a/server/queue.c b/server/queue.c index 5d65e030112..07d4c7e0885 100644 --- a/server/queue.c +++ b/server/queue.c @@ -367,6 +367,7 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour memset( msg_data, 0, sizeof(*msg_data) ); msg_data->info = info; + msg_data->size = msg->data_size; msg_data->source = source; return msg; } @@ -1794,6 +1795,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data = &raw_msg.data; msg_data->info = input->mouse.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; @@ -1929,6 +1931,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data = &raw_msg.data; msg_data->info = input->kbd.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = input->kbd.flags; msg_data->rawinput.type = RIM_TYPEKEYBOARD; msg_data->rawinput.kbd.message = message_code; @@ -1996,6 +1999,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg_data = &raw_msg.data; msg_data->info = 0; + msg_data->size = sizeof(*msg_data); msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; @@ -3295,16 +3299,17 @@ DECL_HANDLER(get_rawinput_buffer) { struct message *msg = LIST_ENTRY( ptr, struct message, entry ); struct hardware_msg_data *data = msg->data; + data_size_t extra_size = data->size - sizeof(*data); ptr = list_next( &input->msg_list, ptr ); if (msg->msg != WM_INPUT) continue; - next_size = req->rawinput_size; + next_size = req->rawinput_size + extra_size; if (size + next_size > req->buffer_size) break; - if (cur + sizeof(*data) > buf + get_reply_max_size()) break; - if (cur + sizeof(*data) > buf + buf_size) + if (cur + data->size > buf + get_reply_max_size()) break; + if (cur + data->size > buf + buf_size) { - buf_size += buf_size / 2; + buf_size += buf_size / 2 + extra_size; if (!(tmp = realloc( buf, buf_size ))) { set_error( STATUS_NO_MEMORY ); @@ -3314,7 +3319,7 @@ DECL_HANDLER(get_rawinput_buffer) buf = tmp; } - memcpy(cur, data, sizeof(*data)); + memcpy( cur, data, data->size ); list_remove( &msg->entry ); free_message( msg ); -- 2.31.0

2 9