wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Zebediah Figura : ws2_32: Cap the negotiated winsock version to 1.1 or 2.2.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: e078f698815ea160ee78b49f2c9679d3607e998d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e078f698815ea160ee78b49f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:48 2022 -0600 ws2_32: Cap the negotiated winsock version to 1.1 or 2.2. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++++- dlls/ws2_32/tests/protocol.c | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 23140529b24..565f1c89dc0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -578,7 +578,13 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) if (data) { - data->wVersion = version; + if (!LOBYTE(version) || LOBYTE(version) > 2 + || (LOBYTE(version) == 2 && HIBYTE(version) > 2)) + data->wVersion = MAKEWORD(2, 2); + else if (LOBYTE(version) == 1 && HIBYTE(version) > 1) + data->wVersion = MAKEWORD(1, 1); + else + data->wVersion = version; data->wHighVersion = MAKEWORD(2, 2); strcpy( data->szDescription, "WinSock 2.0" ); strcpy( data->szSystemStatus, "Running" ); diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index f859ad40e30..db89febff2e 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2851,8 +2851,7 @@ static void test_startup(void) data.lpVendorInfo = (void *)0xdeadbeef; ret = WSAStartup(tests[i].version, &data); ok(ret == (LOBYTE(tests[i].version) ? 0 : WSAVERNOTSUPPORTED), "got %d\n", ret); - todo_wine_if (tests[i].version != tests[i].ret_version) - ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); + ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); if (!ret) { ret = WSAStartup(tests[i].version, &data);

1 0

Zebediah Figura : ws2_32: Always fill the WSADATA structure in WSAStartup().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 864bef4f8d3faadcc83f94b213e7fae4e564c217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=864bef4f8d3faadcc83f94b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:47 2022 -0600 ws2_32: Always fill the WSADATA structure in WSAStartup(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++++++++++----------------- dlls/ws2_32/tests/protocol.c | 9 +++------ 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe7e4fb3464..23140529b24 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -572,29 +572,28 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) /*********************************************************************** * WSAStartup (WS2_32.115) */ -int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) +int WINAPI WSAStartup( WORD version, WSADATA *data ) { - TRACE("verReq=%x\n", wVersionRequested); + TRACE( "version %#x\n", version ); - if (LOBYTE(wVersionRequested) < 1) + if (data) + { + data->wVersion = version; + data->wHighVersion = MAKEWORD(2, 2); + strcpy( data->szDescription, "WinSock 2.0" ); + strcpy( data->szSystemStatus, "Running" ); + data->iMaxSockets = MAX_SOCKETS_PER_PROCESS; + data->iMaxUdpDg = MAX_UDP_DATAGRAM; + /* don't fill lpVendorInfo */ + } + + if (!LOBYTE(version)) return WSAVERNOTSUPPORTED; - if (!lpWSAData) return WSAEINVAL; + if (!data) return WSAEINVAL; num_startup++; - - /* that's the whole of the negotiation for now */ - lpWSAData->wVersion = wVersionRequested; - /* return winsock information */ - lpWSAData->wHighVersion = 0x0202; - strcpy(lpWSAData->szDescription, "WinSock 2.0" ); - strcpy(lpWSAData->szSystemStatus, "Running" ); - lpWSAData->iMaxSockets = MAX_SOCKETS_PER_PROCESS; - lpWSAData->iMaxUdpDg = MAX_UDP_DATAGRAM; - /* don't do anything with lpWSAData->lpVendorInfo */ - /* (some apps don't allocate the space for this field) */ - - TRACE("succeeded starts: %d\n", num_startup); + TRACE( "increasing startup count to %d\n", num_startup ); return 0; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index a23cf51a8bd..f859ad40e30 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2869,12 +2869,9 @@ static void test_startup(void) todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); } ok(data.lpVendorInfo == (void *)0xdeadbeef, "got vendor info %p\n", data.lpVendorInfo); - todo_wine_if (ret) - { - ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); - ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); - ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); - } + ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); + ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); + ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg);

1 0

Zebediah Figura : ws2_32/tests: Add tests for WSAStartup().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 155449c5d1d8c12114b2cdda2855e28c158e271f URL: https://source.winehq.org/git/wine.git/?a=commit;h=155449c5d1d8c12114b2cdda… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:46 2022 -0600 ws2_32/tests: Add tests for WSAStartup(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 99 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 5597e3df854..a23cf51a8bd 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2815,10 +2815,86 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_startup(void) +{ + unsigned int i; + WSADATA data; + int ret; + + static const struct + { + WORD version; + WORD ret_version; + } + tests[] = + { + {MAKEWORD(0, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0, 1), MAKEWORD(2, 2)}, + {MAKEWORD(1, 0), MAKEWORD(1, 0)}, + {MAKEWORD(1, 1), MAKEWORD(1, 1)}, + {MAKEWORD(1, 2), MAKEWORD(1, 1)}, + {MAKEWORD(1, 0xff), MAKEWORD(1, 1)}, + {MAKEWORD(2, 0), MAKEWORD(2, 0)}, + {MAKEWORD(2, 1), MAKEWORD(2, 1)}, + {MAKEWORD(2, 2), MAKEWORD(2, 2)}, + {MAKEWORD(2, 3), MAKEWORD(2, 2)}, + {MAKEWORD(2, 0xff), MAKEWORD(2, 2)}, + {MAKEWORD(3, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0xff, 0), MAKEWORD(2, 2)}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Version %#x", tests[i].version); + + memset(&data, 0xcc, sizeof(data)); + data.lpVendorInfo = (void *)0xdeadbeef; + ret = WSAStartup(tests[i].version, &data); + ok(ret == (LOBYTE(tests[i].version) ? 0 : WSAVERNOTSUPPORTED), "got %d\n", ret); + todo_wine_if (tests[i].version != tests[i].ret_version) + ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); + if (!ret) + { + ret = WSAStartup(tests[i].version, &data); + ok(!ret, "got %d\n", ret); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + } + ok(data.lpVendorInfo == (void *)0xdeadbeef, "got vendor info %p\n", data.lpVendorInfo); + todo_wine_if (ret) + { + ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); + ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); + ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); + } + todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); + todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSANOTINITIALISED, "got error %u\n", WSAGetLastError()); + + ret = WSAStartup(tests[i].version, NULL); + todo_wine_if (LOBYTE(tests[i].version)) + ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); + + winetest_pop_context(); + } +} + START_TEST( protocol ) { WSADATA data; - WORD version = MAKEWORD( 2, 2 ); + int ret; pFreeAddrInfoExW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "FreeAddrInfoExW"); pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "GetAddrInfoExOverlappedResult"); @@ -2830,7 +2906,8 @@ START_TEST( protocol ) pInetPtonW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "InetPtonW"); pWSCGetProviderInfo = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "WSCGetProviderInfo"); - if (WSAStartup( version, &data )) return; + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); @@ -2839,8 +2916,6 @@ START_TEST( protocol ) test_getservbyname(); test_WSALookupService(); - test_WSAAsyncGetServByPort(); - test_WSAAsyncGetServByName(); test_inet_ntoa(); test_inet_pton(); @@ -2862,4 +2937,20 @@ START_TEST( protocol ) test_WSAEnumNameSpaceProvidersW(); test_WSCGetProviderInfo(); test_WSCGetProviderPath(); + + WSACleanup(); + + /* These tests are finnicky. If WSAStartup() is ever called with a + * version below 2.2, it causes getaddrinfo() to behave differently. */ + + test_startup(); + + /* And if WSAAsyncGetServBy*() is ever called, it somehow causes + * WSAStartup() to succeed with 0.1 instead of failing. */ + + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); + + test_WSAAsyncGetServByPort(); + test_WSAAsyncGetServByName(); }

1 0

Fabian Maurer : xmllite/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 7e2cbad2ebbe476fd04dce5e7f04490ac08ea37e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e2cbad2ebbe476fd04dce5e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:06 2022 +0100 xmllite/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 12 ++++++------ dlls/xmllite/tests/writer.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index cb3a3f4e571..c4e53a5c40c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -797,16 +797,16 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); @@ -1006,11 +1006,11 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine + todo_wine ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); TEST_READER_POSITION(reader, 1, 41); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); IStream_Release(stream); @@ -1556,7 +1556,7 @@ static void test_read_pending(void) ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ -todo_wine + todo_wine ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 13d67becbe4..c69aa42598d 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -434,7 +434,7 @@ static void test_writeroutput(void) unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); ok(hr == S_OK, "got %08x\n", hr); -todo_wine + todo_wine ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output); EXPECT_REF(output, 2); /* releasing 'unk' crashes on native */ @@ -1694,7 +1694,7 @@ static void test_WriteAttributeString(void) hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, attribute_tests[i].uri, attribute_tests[i].value); - todo_wine_if(attribute_tests[i].todo_hr) + todo_wine_if(attribute_tests[i].todo_hr) ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr); hr = IXmlWriter_Flush(writer); @@ -1734,7 +1734,7 @@ static void test_WriteAttributeString(void) ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); -todo_wine + todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); hr = write_start_element(writer, NULL, "b", NULL);

1 0

Zebediah Figura : user32/tests: Remove unnecessary redefinitions of SPI_GETDESKWALLPAPER.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 69fd35d57d854e7ba94c88340b1a48e80dd10a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=69fd35d57d854e7ba94c8834… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 31 17:00:59 2022 -0600 user32/tests: Remove unnecessary redefinitions of SPI_GETDESKWALLPAPER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 4 ---- dlls/user32/tests/win.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 89a524407bf..f2d9694bd6f 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -30,10 +30,6 @@ #include "winuser.h" #include "winnls.h" -#ifndef SPI_GETDESKWALLPAPER -# define SPI_GETDESKWALLPAPER 0x0073 -#endif - static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL (WINAPI *pIsProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDPIAware)(void); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ba9b16d89bd..5ce7eb02f1c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -34,10 +34,6 @@ #include "wine/test.h" -#ifndef SPI_GETDESKWALLPAPER -#define SPI_GETDESKWALLPAPER 0x0073 -#endif - #ifndef WM_SYSTIMER #define WM_SYSTIMER 0x0118 #endif

1 0

Zebediah Figura : winsta: Remove useless IDL attributes from TS_ALL_PROCESSES_INFO.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: d2c98c4f3c446cdac1df3df3c4ef43c0c1b83bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c98c4f3c446cdac1df3df3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 31 17:01:00 2022 -0600 winsta: Remove useless IDL attributes from TS_ALL_PROCESSES_INFO. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/winsta.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winsta/winsta.h b/dlls/winsta/winsta.h index d908aa855cc..c4f5e986f16 100644 --- a/dlls/winsta/winsta.h +++ b/dlls/winsta/winsta.h @@ -82,11 +82,7 @@ typedef struct _TS_ALL_PROCESSES_INFO { PTS_SYS_PROCESS_INFORMATION pTsProcessInfo; DWORD SizeOfSid; -#ifdef MIDL_PASS - [size_is(SizeOfSid)] PBYTE pSid; -#else PBYTE pSid; -#endif } TS_ALL_PROCESSES_INFO, *PTS_ALL_PROCESSES_INFO; BOOLEAN WINAPI WinStationEnumerateW(HANDLE,PSESSIONIDW *,PULONG);

1 0

Zebediah Figura : wininet: Use CHAR_BIT from msvcrt limits.h.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 88b45b49fe847a53b8a4b5a397c9440e027b983d URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b45b49fe847a53b8a4b5a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 31 17:03:00 2022 -0600 wininet: Use CHAR_BIT from msvcrt limits.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/urlcache.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d8b0d5fb037..22d0f5bf11d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -27,6 +27,7 @@ #include "ws2tcpip.h" +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -52,10 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); static const char urlcache_ver_prefix[] = "WINE URLCache Ver "; static const char urlcache_ver[] = "0.2012001"; -#ifndef CHAR_BIT -#define CHAR_BIT (8 * sizeof(CHAR)) -#endif - #define ENTRY_START_OFFSET 0x4000 #define DIR_LENGTH 8 #define MAX_DIR_NO 0x20

1 0

Zebediah Figura : user32: Remove no longer needed assert() workarounds for MinGW.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 60c20ee2c5c3805d8625e651bf878b5567d94110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c20ee2c5c3805d8625e651… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 31 17:00:58 2022 -0600 user32: Remove no longer needed assert() workarounds for MinGW. We build with msvcrt, so we don't link against MinGW's assert() anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3b542ea1452..d1016780658 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -296,12 +296,6 @@ typedef struct extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; -/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ -#ifdef __MINGW32__ -#undef assert -#define assert(expr) ((void)0) -#endif - extern struct user_api_hook *user_api DECLSPEC_HIDDEN; LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Don't use fegetenv in nearbyintf.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 201266769dace8f2afb57924a3f9c6e3f571aa21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=201266769dace8f2afb57924… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 31 21:36:40 2022 +0100 msvcrt: Don't use fegetenv in nearbyintf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3907dc9dc94..b13a4e03fd1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6873,13 +6873,25 @@ double CDECL nearbyint(double x) */ float CDECL nearbyintf(float x) { - fenv_t env; + BOOL update_cw, update_sw; + unsigned int cw, sw; - fegetenv(&env); - _control87(_MCW_EM, _MCW_EM); + _setfp(&cw, 0, &sw, 0); + update_cw = !(cw & _EM_INEXACT); + update_sw = !(sw & _SW_INEXACT); + if (update_cw) + { + cw |= _EM_INEXACT; + _setfp(&cw, _EM_INEXACT, NULL, 0); + } x = rintf(x); - feclearexcept(FE_INEXACT); - feupdateenv(&env); + if (update_cw || update_sw) + { + sw = 0; + cw &= ~_EM_INEXACT; + _setfp(update_cw ? &cw : NULL, _EM_INEXACT, + update_sw ? &sw : NULL, _SW_INEXACT); + } return x; }

1 0

Piotr Caban : msvcrt: Don't use fegetenv in nearbyint.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 5d9d195f49693c7f6c99dab5e9337834b1ab04c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d9d195f49693c7f6c99dab5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 31 21:36:33 2022 +0100 msvcrt: Don't use fegetenv in nearbyint. The fegetenv/feupdateenv functions are broken in msvcr120 and are causing unintentional SSE control word changes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b12ba3e9585..3907dc9dc94 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6844,13 +6844,25 @@ double CDECL _yn(int n, double x) */ double CDECL nearbyint(double x) { - fenv_t env; + BOOL update_cw, update_sw; + unsigned int cw, sw; - fegetenv(&env); - _control87(_MCW_EM, _MCW_EM); + _setfp(&cw, 0, &sw, 0); + update_cw = !(cw & _EM_INEXACT); + update_sw = !(sw & _SW_INEXACT); + if (update_cw) + { + cw |= _EM_INEXACT; + _setfp(&cw, _EM_INEXACT, NULL, 0); + } x = rint(x); - feclearexcept(FE_INEXACT); - feupdateenv(&env); + if (update_cw || update_sw) + { + sw = 0; + cw &= ~_EM_INEXACT; + _setfp(update_cw ? &cw : NULL, _EM_INEXACT, + update_sw ? &sw : NULL, _SW_INEXACT); + } return x; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022