February 2022 - Wine-Commits

Eric Pouech : mshtml: Use correct integral type.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 88e66e997417588ba30e0459ccc202787f701d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=88e66e997417588ba30e0459… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:15 2022 +0100 mshtml: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlevent.c | 16 ++++++++-------- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/pluginhost.c | 6 +++--- dlls/mshtml/range.c | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 2fff4d444b2..450bc8efe51 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -945,7 +945,7 @@ static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lc hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, flags, &new_dp, res, ei, caller); IDispatchEx_Release(dispex); }else { - ULONG err = 0; + UINT err = 0; hres = IDispatch_Invoke(func_disp, DISPID_VALUE, &IID_NULL, lcid, flags, &new_dp, res, ei, &err); } if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7ed1dfd2adc..50ca4cbb168 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1198,7 +1198,7 @@ static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p) static HRESULT WINAPI DOMUIEvent_get_detail(IDOMUIEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMUIEvent(iface); - INT32 detail; + LONG detail; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1314,7 +1314,7 @@ static HRESULT WINAPI DOMMouseEvent_Invoke(IDOMMouseEvent *iface, DISPID dispIdM static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 screen_x; + LONG screen_x; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1330,7 +1330,7 @@ static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 screen_y; + LONG screen_y; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1346,7 +1346,7 @@ static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 client_x; + LONG client_x; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1362,7 +1362,7 @@ static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_clientY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 client_y; + LONG client_y; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1653,7 +1653,7 @@ static HRESULT WINAPI DOMMouseEvent_get_offsetY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 r; + LONG r; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1669,7 +1669,7 @@ static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - INT32 r; + LONG r; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -2375,7 +2375,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event { DISPPARAMS dp = {NULL,NULL,0,0}; VARIANT event_arg; - ULONG argerr; + UINT argerr; EXCEPINFO ei; TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv); diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e9b53dadb92..c0f6db8dd3b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1245,7 +1245,7 @@ static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextEle static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - INT32 selection_start; + LONG selection_start; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -1278,7 +1278,7 @@ static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextEleme static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextElement2 *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - INT32 selection_end; + LONG selection_end; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 23ab7195aca..9918174fa41 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -107,7 +107,7 @@ static ULONG WINAPI HTMLDOMChildrenCollectionEnum_Release(IEnumVARIANT *iface) static ULONG get_enum_len(HTMLDOMChildrenCollectionEnum *This) { - ULONG len; + UINT32 len; nsresult nsres; nsres = nsIDOMNodeList_GetLength(This->col->nslist, &len); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index b2c10f725bb..9400ee043b6 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -792,7 +792,7 @@ static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - DWORD val; + UINT32 val; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 389552c3088..5aa2351f5f0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2428,7 +2428,7 @@ static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT * static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - INT32 ret; + LONG ret; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -2446,7 +2446,7 @@ static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) static HRESULT WINAPI HTMLWindow7_get_innerHeight(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - INT32 ret; + LONG ret; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -2465,7 +2465,7 @@ static HRESULT WINAPI HTMLWindow7_get_pageXOffset(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); nsresult nsres; - INT32 ret; + LONG ret; TRACE("(%p)->(%p)\n", This, p); @@ -2483,7 +2483,7 @@ static HRESULT WINAPI HTMLWindow7_get_pageYOffset(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); nsresult nsres; - INT32 ret; + LONG ret; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index ad67db5548c..b6a2c57479c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -378,7 +378,7 @@ static BOOL check_script_safety(PluginHost *host) DWORD policy_size, policy; struct CONFIRMSAFETY cs; BYTE *ppolicy; - ULONG err = 0; + UINT err = 0; VARIANT v; HRESULT hres; @@ -412,7 +412,7 @@ static void update_readystate(PluginHost *host) DISPPARAMS params = {NULL,NULL,0,0}; IDispatchEx *dispex; IDispatch *disp; - ULONG err = 0; + UINT err = 0; VARIANT v; HRESULT hres; @@ -643,7 +643,7 @@ static void notif_enabled(PluginHost *plugin_host) { DISPPARAMS args = {NULL, NULL, 0, 0}; IDispatch *disp; - ULONG err = 0; + UINT err = 0; VARIANT res; HRESULT hres; diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index bea5ac6b371..375f76de40c 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1389,7 +1389,7 @@ static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how, HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); HTMLTxtRange *src_range; nsIDOMNode *ref_node; - INT32 ref_offset; + LONG ref_offset; BOOL set_start; int how_type; INT16 cmp; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 4cd47acd107..cd8ba65b5b8 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -395,7 +395,7 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *if static HRESULT WINAPI HTMLXMLHttpRequest_get_status(IHTMLXMLHttpRequest *iface, LONG *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - DWORD val; + UINT32 val; nsresult nsres; TRACE("(%p)->(%p)\n", This, p);

1 0

Piotr Caban : msvcrt: Don't use fegetenv in nearbyint.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Zebediah Figura : ws2_32/tests: Add tests for WSAStartup().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Piotr Caban : msvcrt: Fix fmaf not to depend on rounding mode.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: f12bcfd2ab1ee985134144cc4163247562b4054c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f12bcfd2ab1ee985134144cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 31 21:36:16 2022 +0100 msvcrt: Fix fmaf not to depend on rounding mode. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9bb3e26570f..d03b4def801 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5058,8 +5058,8 @@ double CDECL fma( double x, double y, double z ) float CDECL fmaf( float x, float y, float z ) { union { double f; UINT64 i; } u; - double xy, adjust; - int e; + double xy, err; + int e, neg; xy = (double)x * y; u.f = xy + z; @@ -5083,11 +5083,15 @@ float CDECL fmaf( float x, float y, float z ) * If result is inexact, and exactly halfway between two float values, * we need to adjust the low-order bit in the direction of the error. */ - _controlfp(_RC_CHOP, _MCW_RC); - adjust = fp_barrier(xy + z); - _controlfp(_RC_NEAR, _MCW_RC); - if (u.f == adjust) + neg = u.i >> 63; + if (neg == (z > xy)) + err = xy - u.f + z; + else + err = z - u.f + xy; + if (neg == (err < 0)) u.i++; + else + u.i--; return u.f; }

1 0

Zebediah Figura : ws2_32: Always fill the WSADATA structure in WSAStartup().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Piotr Caban : msvcrt: Don't set SSE control word in _except1.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: e617fe0bdac2ea520c6fa4411e56037f2660814f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e617fe0bdac2ea520c6fa441… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 31 21:36:26 2022 +0100 msvcrt: Don't set SSE control word in _except1. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d03b4def801..b12ba3e9585 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -10365,7 +10365,7 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, case 0x300: fpword |= _PC_64; break; } if (cw & 0x1000) fpword |= _IC_AFFINE; - _control87(fpword, 0xffffffff); + _setfp(&fpword, _MCW_EM | _MCW_RC | _MCW_PC | _MCW_IC, NULL, 0); return res; }

1 0

Zebediah Figura : winsta: Remove useless IDL attributes from TS_ALL_PROCESSES_INFO.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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 : user32/tests: Remove unnecessary redefinitions of SPI_GETDESKWALLPAPER.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Fabian Maurer : xmllite/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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 : wininet: Use CHAR_BIT from msvcrt limits.h.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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