February 2022 - Wine-Commits

Paul Gofman : hnetcfg: Get control URL for WANIPConnection service in init_gateway_connection().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 42d12db0ee5c9d77a5be960c897bdff169341629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d12db0ee5c9d77a5be960c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 13:49:24 2022 +0300 hnetcfg: Get control URL for WANIPConnection service in init_gateway_connection(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/port.c | 166 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 8435de81f94..926eec4e476 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hnetcfg.dll IMPORTS = oleaut32 ole32 advapi32 mpr uuid -DELAYIMPORTS = ws2_32 winhttp +DELAYIMPORTS = ws2_32 winhttp shcore xmllite EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index b1d5398a01a..389e36f4d50 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -25,9 +25,12 @@ #include "winbase.h" #include "winuser.h" #include "string.h" +#include "initguid.h" #include "assert.h" #include "winsock2.h" #include "winhttp.h" +#include "shlwapi.h" +#include "xmllite.h" #include "ole2.h" #include "netfw.h" #include "natupnp.h" @@ -43,6 +46,9 @@ static struct BOOL winsock_initialized; WCHAR locationW[256]; HINTERNET session, connection; + WCHAR desc_urlpath[128]; + WCHAR control_url[256]; + unsigned int version; } upnp_gateway_connection; @@ -85,19 +91,99 @@ static BOOL parse_search_response( char *response, WCHAR *locationW, unsigned in return FALSE; } +static BOOL parse_desc_xml( const char *desc_xml ) +{ + static const WCHAR urn_wanipconnection[] = L"urn:schemas-upnp-org:service:WANIPConnection:"; + WCHAR control_url[ARRAY_SIZE(upnp_gateway_connection.control_url)]; + BOOL service_type_matches, control_url_found, found = FALSE; + unsigned int version = 0; + XmlNodeType node_type; + IXmlReader *reader; + const WCHAR *value; + BOOL ret = FALSE; + IStream *stream; + HRESULT hr; + + if (!(stream = SHCreateMemStream( (BYTE *)desc_xml, strlen( desc_xml ) + 1 ))) return FALSE; + if (FAILED(hr = CreateXmlReader( &IID_IXmlReader, (void **)&reader, NULL ))) + { + IStream_Release( stream ); + return FALSE; + } + if (FAILED(hr = IXmlReader_SetInput( reader, (IUnknown*)stream ))) goto done; + + while (SUCCEEDED(IXmlReader_Read( reader, &node_type )) && node_type != XmlNodeType_None) + { + if (node_type != XmlNodeType_Element) continue; + + if (FAILED(IXmlReader_GetLocalName( reader, &value, NULL ))) goto done; + if (wcsicmp( value, L"service" )) continue; + control_url_found = service_type_matches = FALSE; + while (SUCCEEDED(IXmlReader_Read( reader, &node_type ))) + { + if (node_type != XmlNodeType_Element && node_type != XmlNodeType_EndElement) continue; + if (FAILED(IXmlReader_GetLocalName( reader, &value, NULL ))) + { + WARN( "IXmlReader_GetLocalName failed.\n" ); + goto done; + } + if (node_type == XmlNodeType_EndElement) + { + if (!wcsicmp( value, L"service" )) break; + continue; + } + if (!wcsicmp( value, L"serviceType" )) + { + if (FAILED(IXmlReader_Read(reader, &node_type ))) goto done; + if (node_type != XmlNodeType_Text) goto done; + if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done; + if (wcsnicmp( value, urn_wanipconnection, ARRAY_SIZE(urn_wanipconnection) - 1 )) break; + version = _wtoi( value + ARRAY_SIZE(urn_wanipconnection) - 1 ); + service_type_matches = version >= 1; + } + else if (!wcsicmp( value, L"controlURL" )) + { + if (FAILED(IXmlReader_Read(reader, &node_type ))) goto done; + if (node_type != XmlNodeType_Text) goto done; + if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done; + if (wcslen( value ) + 1 > ARRAY_SIZE(control_url)) goto done; + wcscpy( control_url, value ); + control_url_found = TRUE; + } + } + if (service_type_matches && control_url_found) + { + if (found) + { + FIXME( "Found another WANIPConnection service, ignoring.\n" ); + continue; + } + found = TRUE; + wcscpy( upnp_gateway_connection.control_url, control_url ); + upnp_gateway_connection.version = version; + } + } + + ret = found; +done: + IXmlReader_Release( reader ); + IStream_Release( stream ); + return ret; +} + static BOOL open_gateway_connection(void) { static const int timeout = 3000; - WCHAR hostname[64], urlpath[128]; + WCHAR hostname[64]; URL_COMPONENTS url; memset( &url, 0, sizeof(url) ); url.dwStructSize = sizeof(url); url.lpszHostName = hostname; url.dwHostNameLength = ARRAY_SIZE(hostname); - url.lpszUrlPath = urlpath; - url.dwUrlPathLength = ARRAY_SIZE(urlpath); + url.lpszUrlPath = upnp_gateway_connection.desc_urlpath; + url.dwUrlPathLength = ARRAY_SIZE(upnp_gateway_connection.desc_urlpath); if (!WinHttpCrackUrl( upnp_gateway_connection.locationW, 0, 0, &url )) return FALSE; @@ -107,7 +193,8 @@ static BOOL open_gateway_connection(void) if (!WinHttpSetTimeouts( upnp_gateway_connection.session, timeout, timeout, timeout, timeout )) return FALSE; - TRACE( "hostname %s, urlpath %s, port %u.\n", debugstr_w(hostname), debugstr_w(urlpath), url.nPort ); + TRACE( "hostname %s, urlpath %s, port %u.\n", + debugstr_w(hostname), debugstr_w(upnp_gateway_connection.desc_urlpath), url.nPort ); upnp_gateway_connection.connection = WinHttpConnect ( upnp_gateway_connection.session, hostname, url.nPort, 0 ); if (!upnp_gateway_connection.connection) { @@ -117,6 +204,69 @@ static BOOL open_gateway_connection(void) return TRUE; } +static BOOL get_control_url(void) +{ + static const WCHAR *accept_types[] = + { + L"text/xml", + NULL + }; + unsigned int desc_xml_size, offset; + DWORD size, status = 0; + HINTERNET request; + char *desc_xml; + BOOL ret; + + request = WinHttpOpenRequest( upnp_gateway_connection.connection, NULL, upnp_gateway_connection.desc_urlpath, NULL, + WINHTTP_NO_REFERER, accept_types, 0 ); + if (!request) return FALSE; + + if (!WinHttpSendRequest( request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0 )) + { + WARN( "Error sending request %u.\n", GetLastError() ); + WinHttpCloseHandle( request ); + return FALSE; + } + if (!WinHttpReceiveResponse(request, NULL)) + { + WARN( "Error receiving response %u.\n", GetLastError() ); + WinHttpCloseHandle( request ); + return FALSE; + } + size = sizeof(status); + if (!WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL) || status != HTTP_STATUS_OK ) + { + WARN( "Error response from server, error %u, http status %u.\n", GetLastError(), status ); + WinHttpCloseHandle( request ); + return FALSE; + } + desc_xml_size = 1024; + desc_xml = malloc( desc_xml_size ); + offset = 0; + while (WinHttpReadData( request, desc_xml + offset, desc_xml_size - offset - 1, &size ) && size) + { + offset += size; + if (offset + 1 == desc_xml_size) + { + char *new; + + desc_xml_size *= 2; + if (!(new = realloc( desc_xml, desc_xml_size ))) + { + ERR( "No memory.\n" ); + break; + } + desc_xml = new; + } + } + desc_xml[offset] = 0; + WinHttpCloseHandle( request ); + ret = parse_desc_xml( desc_xml ); + free( desc_xml ); + return ret; +} + static void gateway_connection_cleanup(void) { TRACE( ".\n" ); @@ -205,6 +355,14 @@ static BOOL init_gateway_connection(void) return FALSE; } TRACE( "Opened gateway connection.\n" ); + if (!get_control_url()) + { + WARN( "Could not get_control URL.\n" ); + gateway_connection_cleanup(); + return FALSE; + } + TRACE( "control_url %s, version %u.\n", debugstr_w(upnp_gateway_connection.control_url), + upnp_gateway_connection.version ); return TRUE; }

1 0

Paul Gofman : hnetcfg: Open connection to gateway in init_gateway_connection().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: c091620889195e761854dfd1cbdfb9ff58548abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c091620889195e761854dfd1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 13:49:23 2022 +0300 hnetcfg: Open connection to gateway in init_gateway_connection(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/port.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 8d1f1b27ffe..8435de81f94 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hnetcfg.dll IMPORTS = oleaut32 ole32 advapi32 mpr uuid -DELAYIMPORTS = ws2_32 +DELAYIMPORTS = ws2_32 winhttp EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index fa866d874c9..b1d5398a01a 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -42,6 +42,7 @@ static struct LONG refs; BOOL winsock_initialized; WCHAR locationW[256]; + HINTERNET session, connection; } upnp_gateway_connection; @@ -84,9 +85,43 @@ static BOOL parse_search_response( char *response, WCHAR *locationW, unsigned in return FALSE; } +static BOOL open_gateway_connection(void) +{ + static const int timeout = 3000; + + WCHAR hostname[64], urlpath[128]; + URL_COMPONENTS url; + + memset( &url, 0, sizeof(url) ); + url.dwStructSize = sizeof(url); + url.lpszHostName = hostname; + url.dwHostNameLength = ARRAY_SIZE(hostname); + url.lpszUrlPath = urlpath; + url.dwUrlPathLength = ARRAY_SIZE(urlpath); + + if (!WinHttpCrackUrl( upnp_gateway_connection.locationW, 0, 0, &url )) return FALSE; + + upnp_gateway_connection.session = WinHttpOpen( L"hnetcfg", WINHTTP_ACCESS_TYPE_NO_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0 ); + if (!upnp_gateway_connection.session) return FALSE; + if (!WinHttpSetTimeouts( upnp_gateway_connection.session, timeout, timeout, timeout, timeout )) + return FALSE; + + TRACE( "hostname %s, urlpath %s, port %u.\n", debugstr_w(hostname), debugstr_w(urlpath), url.nPort ); + upnp_gateway_connection.connection = WinHttpConnect ( upnp_gateway_connection.session, hostname, url.nPort, 0 ); + if (!upnp_gateway_connection.connection) + { + WARN( "WinHttpConnect error %u.\n", GetLastError() ); + return FALSE; + } + return TRUE; +} + static void gateway_connection_cleanup(void) { TRACE( ".\n" ); + WinHttpCloseHandle( upnp_gateway_connection.connection ); + WinHttpCloseHandle( upnp_gateway_connection.session ); if (upnp_gateway_connection.winsock_initialized) WSACleanup(); memset( &upnp_gateway_connection, 0, sizeof(upnp_gateway_connection) ); } @@ -164,6 +199,12 @@ static BOOL init_gateway_connection(void) return FALSE; } TRACE( "Gateway description location %s.\n", debugstr_w(upnp_gateway_connection.locationW) ); + if (!open_gateway_connection()) + { + WARN( "Error opening gateway connection.\n" ); + return FALSE; + } + TRACE( "Opened gateway connection.\n" ); return TRUE; }

1 0

Paul Gofman : hnetcfg/tests: Add tests for static port mapping collection.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 162dc17e09aaeb169807bf076140ba62805284f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=162dc17e09aaeb169807bf07… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 13:49:20 2022 +0300 hnetcfg/tests: Add tests for static port mapping collection. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 132 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index e2606933079..6abdcd7fb4e 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -29,6 +29,12 @@ #include "netfw.h" #include "natupnp.h" +static ULONG get_refcount(IUnknown *unk) +{ + IUnknown_AddRef(unk); + return IUnknown_Release(unk); +} + static void test_policy2_rules(INetFwPolicy2 *policy2) { HRESULT hr; @@ -164,6 +170,119 @@ static void test_NetFwAuthorizedApplication(void) INetFwAuthorizedApplication_Release(app); } +static void test_static_port_mapping_collection( IStaticPortMappingCollection *ports ) +{ + LONG i, count, count2, expected_count, external_port; + IStaticPortMapping *pm, *pm2; + ULONG refcount, refcount2; + IEnumVARIANT *enum_ports; + IUnknown *unk; + ULONG fetched; + BSTR protocol; + VARIANT var; + HRESULT hr; + + refcount = get_refcount((IUnknown *)ports); + hr = IStaticPortMappingCollection_get__NewEnum(ports, &unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void **)&enum_ports); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount2 = get_refcount((IUnknown *)ports); + ok(refcount2 == refcount, "Got unexpected refcount %u, refcount2 %u.\n", refcount, refcount2); + + hr = IEnumVARIANT_Reset(enum_ports); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + count = 0xdeadbeef; + hr = IStaticPortMappingCollection_get_Count(ports, &count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_get_Item(ports, 12345, (BSTR)L"UDP", &pm); + if (SUCCEEDED(hr)) + { + expected_count = count; + IStaticPortMapping_Release(pm); + } + else + { + expected_count = count + 1; + } + + hr = IStaticPortMappingCollection_Add(ports, 12345, (BSTR)L"udp", 12345, (BSTR)L"1.2.3.4", + VARIANT_TRUE, (BSTR)L"wine_test", &pm); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IStaticPortMappingCollection_Add(ports, 12345, (BSTR)L"UDP", 12345, (BSTR)L"1.2.3.4", + VARIANT_TRUE, (BSTR)L"wine_test", &pm); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_get_Count(ports, &count2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(count2 == expected_count, "Got unexpected count2 %u, expected %u.\n", count2, expected_count); + + hr = IStaticPortMappingCollection_get_Item(ports, 12345, NULL, &pm); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_get_Item(ports, 12345, (BSTR)L"UDP", NULL); + ok(hr == E_POINTER, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_get_Item(ports, 12345, (BSTR)L"udp", &pm); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_get_Item(ports, -1, (BSTR)L"UDP", &pm); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_get_Item(ports, 65536, (BSTR)L"UDP", &pm); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_get_Item(ports, 12346, (BSTR)L"UDP", &pm); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + + hr = IEnumVARIANT_Reset(enum_ports); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < count2; ++i) + { + VariantInit(&var); + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next(enum_ports, 1, &var, &fetched); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fetched == 1, "Got unexpected fetched %u.\n", fetched); + ok(V_VT(&var) == VT_DISPATCH, "Got unexpected variant type %u.\n", V_VT(&var)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IStaticPortMapping, (void **)&pm); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMapping_get_Protocol(pm, &protocol); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + external_port = 0xdeadbeef; + hr = IStaticPortMapping_get_ExternalPort(pm, &external_port); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(!wcscmp(protocol, L"UDP") || !wcscmp(protocol, L"TCP"), "Got unexpected protocol %s.\n", + debugstr_w(protocol)); + hr = IStaticPortMappingCollection_get_Item(ports, external_port, protocol, &pm2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(pm2 != pm, "Got same interface.\n"); + + IStaticPortMapping_Release(pm); + IStaticPortMapping_Release(pm2); + + SysFreeString(protocol); + + VariantClear(&var); + } + hr = IEnumVARIANT_Next(enum_ports, 1, &var, &fetched); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = IStaticPortMappingCollection_Remove(ports, 12345, (BSTR)L"UDP"); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + IEnumVARIANT_Release(enum_ports); +} + static void test_IUPnPNAT(void) { IUPnPNAT *nat; @@ -171,6 +290,7 @@ static void test_IUPnPNAT(void) IDynamicPortMappingCollection *dync_ports; INATEventManager *manager; IProvideClassInfo *provider; + ULONG refcount, refcount2; HRESULT hr; hr = CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUPnPNAT, (void**)&nat); @@ -179,11 +299,21 @@ static void test_IUPnPNAT(void) hr = IUPnPNAT_QueryInterface(nat, &IID_IProvideClassInfo, (void**)&provider); ok(hr == E_NOINTERFACE, "got: %08x\n", hr); + refcount = get_refcount((IUnknown *)nat); hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); + ok(hr == S_OK, "got: %08x\n", hr); if(hr == S_OK && static_ports) + { + refcount2 = get_refcount((IUnknown *)nat); + ok(refcount2 == refcount, "Got unexpected refcount %u, refcount2 %u.\n", refcount, refcount2); + test_static_port_mapping_collection( static_ports ); IStaticPortMappingCollection_Release(static_ports); - + } + else if (hr == S_OK) + { + skip( "UPNP gateway not found.\n" ); + } hr = IUPnPNAT_get_DynamicPortMappingCollection(nat, &dync_ports); ok(hr == S_OK || hr == E_NOTIMPL /* Windows 8.1 */, "got: %08x\n", hr); if(hr == S_OK && dync_ports)

1 0

Paul Gofman : hnetcfg: Use CRT allocation functions.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: f20f98825922030364df3ae0ae9c52ac270964f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20f98825922030364df3ae0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 1 13:49:19 2022 +0300 hnetcfg: Use CRT allocation functions. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/apps.c | 21 ++++++++++----------- dlls/hnetcfg/manager.c | 4 ++-- dlls/hnetcfg/policy.c | 14 +++++++------- dlls/hnetcfg/port.c | 13 ++++++------- dlls/hnetcfg/profile.c | 4 ++-- dlls/hnetcfg/service.c | 8 ++++---- 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index b6447cf4d63..16379e3457b 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -29,7 +29,6 @@ #include "natupnp.h" #include "wine/debug.h" -#include "wine/heap.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); @@ -62,7 +61,7 @@ static ULONG WINAPI fw_app_Release( { TRACE("destroying %p\n", fw_app); SysFreeString( fw_app->filename ); - HeapFree( GetProcessHeap(), 0, fw_app ); + free( fw_app ); } return refs; } @@ -281,7 +280,7 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( res = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, NULL, &sz); if (res == WN_MORE_DATA) { - if (!(path = heap_alloc(sz))) + if (!(path = malloc(sz))) return E_OUTOFMEMORY; info = (UNIVERSAL_NAME_INFOW *)&path; @@ -291,21 +290,21 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( SysFreeString(This->filename); This->filename = SysAllocString(info->lpUniversalName); } - heap_free(path); + free(path); return HRESULT_FROM_WIN32(res); } sz = GetFullPathNameW(image, 0, NULL, NULL); - if (!(path = heap_alloc(++sz * sizeof(WCHAR)))) + if (!(path = malloc(++sz * sizeof(WCHAR)))) return E_OUTOFMEMORY; GetFullPathNameW(image, sz, path, NULL); longsz = GetLongPathNameW(path, path, sz); if (longsz > sz) { - if (!(path = heap_realloc(path, longsz * sizeof(WCHAR)))) + if (!(path = realloc(path, longsz * sizeof(WCHAR)))) { - heap_free(path); + free(path); return E_OUTOFMEMORY; } GetLongPathNameW(path, path, longsz); @@ -313,7 +312,7 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( SysFreeString( This->filename ); This->filename = SysAllocString(path); - heap_free(path); + free(path); return This->filename ? S_OK : E_OUTOFMEMORY; } @@ -432,7 +431,7 @@ HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); + fa = malloc( sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; @@ -470,7 +469,7 @@ static ULONG WINAPI fw_apps_Release( if (!refs) { TRACE("destroying %p\n", fw_apps); - HeapFree( GetProcessHeap(), 0, fw_apps ); + free( fw_apps ); } return refs; } @@ -645,7 +644,7 @@ HRESULT NetFwAuthorizedApplications_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); + fa = malloc( sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; fa->INetFwAuthorizedApplications_iface.lpVtbl = &fw_apps_vtbl; diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 2c0790a73b5..fda69729901 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -58,7 +58,7 @@ static ULONG WINAPI fw_manager_Release( if (!refs) { TRACE("destroying %p\n", fw_manager); - HeapFree( GetProcessHeap(), 0, fw_manager ); + free( fw_manager ); } return refs; } @@ -244,7 +244,7 @@ HRESULT NetFwMgr_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); + fm = malloc( sizeof(*fm) ); if (!fm) return E_OUTOFMEMORY; fm->INetFwMgr_iface.lpVtbl = &fw_manager_vtbl; diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index 1f5b0daa568..7bdc1563d90 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -105,7 +105,7 @@ static ULONG WINAPI netfw_rules_Release( if (!refs) { TRACE("destroying %p\n", This); - HeapFree( GetProcessHeap(), 0, This ); + free( This ); } return refs; } @@ -265,7 +265,7 @@ static HRESULT create_INetFwRules(INetFwRules **object) TRACE("(%p)\n", object); - rules = HeapAlloc( GetProcessHeap(), 0, sizeof(*rules) ); + rules = malloc( sizeof(*rules) ); if (!rules) return E_OUTOFMEMORY; rules->INetFwRules_iface.lpVtbl = &fw_rules_vtbl; @@ -292,7 +292,7 @@ static ULONG WINAPI fw_policy_Release( if (!refs) { TRACE("destroying %p\n", fw_policy); - HeapFree( GetProcessHeap(), 0, fw_policy ); + free( fw_policy ); } return refs; } @@ -435,7 +435,7 @@ HRESULT NetFwPolicy_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + fp = malloc( sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; fp->INetFwPolicy_iface.lpVtbl = &fw_policy_vtbl; @@ -487,7 +487,7 @@ static ULONG WINAPI fwpolicy2_Release(INetFwPolicy2 *iface) { INetFwRules_Release(fw_policy->fw_policy2_rules); TRACE("destroying %p\n", fw_policy); - HeapFree( GetProcessHeap(), 0, fw_policy ); + free( fw_policy ); } return refs; } @@ -768,7 +768,7 @@ HRESULT NetFwPolicy2_create( IUnknown *outer, void **obj ) TRACE("(%p,%p)\n", outer, obj); - fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + fp = malloc( sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; fp->INetFwPolicy2_iface.lpVtbl = &fw_policy2_vtbl; @@ -778,7 +778,7 @@ HRESULT NetFwPolicy2_create( IUnknown *outer, void **obj ) if (FAILED(create_INetFwRules(&fp->fw_policy2_rules))) { - HeapFree( GetProcessHeap(), 0, fp ); + free( fp ); return E_OUTOFMEMORY; } diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index fd4ac4977d3..9e9264df1dc 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -28,7 +28,6 @@ #include "netfw.h" #include "natupnp.h" -#include "wine/heap.h" #include "wine/debug.h" #include "hnetcfg_private.h" @@ -64,7 +63,7 @@ static ULONG WINAPI fw_port_Release( { TRACE("destroying %p\n", fw_port); SysFreeString( fw_port->name ); - HeapFree( GetProcessHeap(), 0, fw_port ); + free( fw_port ); } return refs; } @@ -363,7 +362,7 @@ HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + fp = malloc( sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; fp->INetFwOpenPort_iface.lpVtbl = &fw_port_vtbl; @@ -404,7 +403,7 @@ static ULONG WINAPI fw_ports_Release( if (!refs) { TRACE("destroying %p\n", fw_ports); - HeapFree( GetProcessHeap(), 0, fw_ports ); + free( fw_ports ); } return refs; } @@ -592,7 +591,7 @@ HRESULT NetFwOpenPorts_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + fp = malloc( sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; fp->INetFwOpenPorts_iface.lpVtbl = &fw_ports_vtbl; @@ -653,7 +652,7 @@ static ULONG WINAPI upnpnat_Release(IUPnPNAT *iface) LONG refs = InterlockedDecrement( &This->ref ); if (!refs) { - heap_free( This ); + free( This ); } return refs; } @@ -762,7 +761,7 @@ HRESULT IUPnPNAT_create(IUnknown *outer, void **object) TRACE("(%p,%p)\n", outer, object); - nat = heap_alloc( sizeof(*nat) ); + nat = malloc( sizeof(*nat) ); if (!nat) return E_OUTOFMEMORY; nat->IUPnPNAT_iface.lpVtbl = &upnpnat_vtbl; diff --git a/dlls/hnetcfg/profile.c b/dlls/hnetcfg/profile.c index d0e9f48dab4..63f6d0cc7ed 100644 --- a/dlls/hnetcfg/profile.c +++ b/dlls/hnetcfg/profile.c @@ -58,7 +58,7 @@ static ULONG WINAPI fw_profile_Release( if (!refs) { TRACE("destroying %p\n", fw_profile); - HeapFree( GetProcessHeap(), 0, fw_profile ); + free( fw_profile ); } return refs; } @@ -334,7 +334,7 @@ HRESULT NetFwProfile_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + fp = malloc( sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; fp->INetFwProfile_iface.lpVtbl = &fw_profile_vtbl; diff --git a/dlls/hnetcfg/service.c b/dlls/hnetcfg/service.c index 5bfeedaaedf..122d9797bab 100644 --- a/dlls/hnetcfg/service.c +++ b/dlls/hnetcfg/service.c @@ -58,7 +58,7 @@ static ULONG WINAPI fw_service_Release( if (!refs) { TRACE("destroying %p\n", fw_service); - HeapFree( GetProcessHeap(), 0, fw_service ); + free( fw_service ); } return refs; } @@ -290,7 +290,7 @@ static HRESULT NetFwService_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + fp = malloc( sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; fp->INetFwService_iface.lpVtbl = &fw_service_vtbl; @@ -328,7 +328,7 @@ static ULONG WINAPI fw_services_Release( if (!refs) { TRACE("destroying %p\n", fw_services); - HeapFree( GetProcessHeap(), 0, fw_services ); + free( fw_services ); } return refs; } @@ -464,7 +464,7 @@ HRESULT NetFwServices_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + fp = malloc( sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; fp->INetFwServices_iface.lpVtbl = &fw_services_vtbl;

1 0

Rémi Bernon : winehid.sys: Fix printf format warnings with long types.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 4b7a20af16eeddbce35d26289f5160794cb1970b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7a20af16eeddbce35d2628… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 1 09:35:49 2022 +0100 winehid.sys: Fix printf format warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/Makefile.in | 1 - dlls/winehid.sys/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index 36302330877..0ae026647c9 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winehid.sys IMPORTS = hidclass ntoskrnl diff --git a/dlls/winehid.sys/main.c b/dlls/winehid.sys/main.c index 975deac993f..a807c0da097 100644 --- a/dlls/winehid.sys/main.c +++ b/dlls/winehid.sys/main.c @@ -61,7 +61,7 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) return IoCallDriver(((HID_DEVICE_EXTENSION *)device->DeviceExtension)->NextDeviceObject, irp); default: - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + FIXME("Unsupported ioctl %#lx (device=%lx access=%lx func=%lx method=%lx)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); IoCompleteRequest(irp, IO_NO_INCREMENT); return status;

1 0

Rémi Bernon : hidclass.sys: Fix printf format warnings with long types.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 0dd6bc9db06eb9b9bcce51f50235fd1bdef33038 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd6bc9db06eb9b9bcce51f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 1 09:35:48 2022 +0100 hidclass.sys: Fix printf format warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 1 - dlls/hidclass.sys/device.c | 10 +++++----- dlls/hidclass.sys/pnp.c | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index b597589dc53..788828ad66a 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hidclass.sys IMPORTLIB = hidclass IMPORTS = hal ntoskrnl user32 hidparse diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 0744865f8f7..c252125d8eb 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -351,7 +351,7 @@ static DWORD CALLBACK hid_device_thread(void *args) if (!(report = find_report_with_type_and_id( ext, HidP_Input, buffer[0], FALSE ))) WARN( "dropping unknown input id %u\n", buffer[0] ); else if (!polled && io.Information < report->InputLength) - WARN( "dropping short report, len %u expected %u\n", (ULONG)io.Information, report->InputLength ); + WARN( "dropping short report, len %Iu expected %u\n", io.Information, report->InputLength ); else { packet->reportId = buffer[0]; @@ -364,7 +364,7 @@ static DWORD CALLBACK hid_device_thread(void *args) res = WaitForSingleObject(ext->u.pdo.halt_event, polled ? ext->u.pdo.poll_interval : 0); } while (res == WAIT_TIMEOUT); - TRACE("device thread exiting, res %#x\n", res); + TRACE( "device thread exiting, res %#lx\n", res ); return 1; } @@ -561,7 +561,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = 0; - TRACE("device %p ioctl(%x)\n", device, irpsp->Parameters.DeviceIoControl.IoControlCode); + TRACE( "device %p code %#lx\n", device, irpsp->Parameters.DeviceIoControl.IoControlCode ); KeAcquireSpinLock(&ext->u.pdo.lock, &irql); removed = ext->u.pdo.removed; @@ -661,8 +661,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", - code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + FIXME( "Unsupported ioctl %#lx (device=%lx access=%lx func=%lx method=%lx)\n", code, + code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3 ); irp->IoStatus.Status = STATUS_NOT_SUPPORTED; break; } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 6dafa1b95af..fec51af40a9 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -143,13 +143,13 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b if ((status = get_device_id(bus_pdo, BusQueryDeviceID, device_id))) { - ERR("Failed to get PDO device id, status %#x.\n", status); + ERR( "Failed to get PDO device id, status %#lx.\n", status ); return status; } if ((status = get_device_id(bus_pdo, BusQueryInstanceID, instance_id))) { - ERR("Failed to get PDO instance id, status %#x.\n", status); + ERR( "Failed to get PDO instance id, status %#lx.\n", status ); return status; } @@ -159,7 +159,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b if ((status = IoCreateDevice(driver, sizeof(*ext) + minidriver->minidriver.DeviceExtensionSize, NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &fdo))) { - ERR("Failed to create bus FDO, status %#x.\n", status); + ERR( "Failed to create bus FDO, status %#lx.\n", status ); return status; } ext = fdo->DeviceExtension; @@ -177,7 +177,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b status = minidriver->AddDevice(minidriver->minidriver.DriverObject, fdo); if (status != STATUS_SUCCESS) { - ERR("Minidriver AddDevice failed (%x)\n",status); + ERR( "Minidriver AddDevice failed (%lx)\n", status ); IoDeleteDevice(fdo); return status; } @@ -206,7 +206,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) call_minidriver( IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr), &io ); if (io.Status != STATUS_SUCCESS) { - ERR( "Minidriver failed to get attributes, status %#x.\n", io.Status ); + ERR( "Minidriver failed to get attributes, status %#lx.\n", io.Status ); return; } @@ -215,7 +215,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) RtlInitUnicodeString(&string, pdo_name); if ((status = IoCreateDevice(fdo->DriverObject, sizeof(*pdo_ext), &string, 0, 0, FALSE, &child_pdo))) { - ERR( "Failed to create child PDO, status %#x.\n", io.Status ); + ERR( "Failed to create child PDO, status %#lx.\n", io.Status ); return; } fdo_ext->u.fdo.child_pdo = child_pdo; @@ -236,7 +236,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) call_minidriver( IOCTL_HID_GET_DEVICE_DESCRIPTOR, fdo, NULL, 0, &descriptor, sizeof(descriptor), &io ); if (io.Status != STATUS_SUCCESS) { - ERR("Cannot get Device Descriptor(%x)\n",status); + ERR( "Cannot get Device Descriptor, status %#lx\n", status ); IoDeleteDevice(child_pdo); return; } @@ -256,7 +256,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) descriptor.DescriptorList[i].wReportLength, &io ); if (io.Status != STATUS_SUCCESS) { - ERR("Cannot get Report Descriptor(%x)\n",status); + ERR( "Cannot get Report Descriptor, status %#lx\n", status ); free(reportDescriptor); IoDeleteDevice(child_pdo); return; @@ -290,7 +290,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) PLUGPLAY_PROPERTY_PERSISTENT, DEVPROP_TYPE_UINT32, sizeof(pdo_ext->u.pdo.rawinput_handle), &pdo_ext->u.pdo.rawinput_handle))) { - ERR("Failed to set device handle property, status %x\n", status); + ERR( "Failed to set device handle property, status %#lx\n", status ); IoDeleteDevice(child_pdo); return; } @@ -444,7 +444,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_START_DEVICE: if ((status = IoRegisterDeviceInterface(device, ext->class_guid, NULL, &ext->u.pdo.link_name))) { - ERR("Failed to register interface, status %#x.\n", status); + ERR( "Failed to register interface, status %#lx.\n", status ); break; }

1 0

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

Feb. 1, 2022

Module: wine Branch: master Commit: 679bbdf89d138dc4d70b605b97f7a2b5a2fef07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=679bbdf89d138dc4d70b605b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:03 2022 +0100 jscript: 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/jscript/array.c | 24 ++++++++++++------------ dlls/jscript/engine.c | 8 ++++---- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/jsutils.c | 5 +++++ dlls/jscript/string.c | 2 +- dlls/jscript/vbarray.c | 17 +++++++++-------- 8 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5f61f997a9b..56727f905f3 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -53,7 +53,7 @@ unsigned array_get_length(jsdisp_t *array) return array_from_jsdisp(array)->length; } -static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, DWORD *ret) +static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis, UINT32 *ret) { ArrayInstance *array; jsval_t val; @@ -314,7 +314,7 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsval_t *r) { jsdisp_t *jsthis; - DWORD length; + UINT32 length; HRESULT hres; TRACE("\n"); @@ -346,7 +346,7 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned { jsdisp_t *jsthis; jsval_t val; - DWORD length; + UINT32 length; HRESULT hres; TRACE("\n"); @@ -395,7 +395,7 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne jsval_t *r) { jsdisp_t *jsthis; - DWORD length = 0; + UINT32 length = 0; unsigned i; HRESULT hres; @@ -424,7 +424,7 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi jsval_t *r) { jsdisp_t *jsthis; - DWORD length, k, l; + UINT32 length, k, l; jsval_t v1, v2; HRESULT hres1, hres2; @@ -479,7 +479,7 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign jsval_t *r) { jsdisp_t *jsthis; - DWORD length = 0, i; + UINT32 length = 0, i; jsval_t v, ret; HRESULT hres; @@ -534,7 +534,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign { jsdisp_t *arr, *jsthis; DOUBLE range; - DWORD length, start, end, idx; + UINT32 length, start, end, idx; HRESULT hres; TRACE("\n"); @@ -656,7 +656,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne { jsdisp_t *jsthis, *cmp_func = NULL; jsval_t *vtab, **sorttab = NULL; - DWORD length; + UINT32 length; DWORD i; HRESULT hres = S_OK; @@ -800,7 +800,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - DWORD length, start=0, delete_cnt=0, i, add_args = 0; + UINT32 length, start=0, delete_cnt=0, i, add_args = 0; jsdisp_t *ret_array = NULL, *jsthis; jsval_t val; double d; @@ -1037,7 +1037,7 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned IDispatch *context_this = NULL, *callback; jsval_t callback_args[3], mapped_value; jsdisp_t *jsthis, *array; - DWORD length, k; + UINT32 length, k; HRESULT hres; TRACE("\n"); @@ -1100,7 +1100,7 @@ static HRESULT Array_reduce(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsig jsval_t callback_args[4], acc, new_acc; BOOL have_value = FALSE; jsdisp_t *jsthis; - DWORD length, k; + UINT32 length, k; HRESULT hres; TRACE("\n"); @@ -1168,7 +1168,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi { jsdisp_t *jsthis; WCHAR buf[14], *buf_end, *str; - DWORD i, length; + UINT32 i, length; jsval_t val; DISPID id; HRESULT hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 47b4e56e8e4..ae002fc56e8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -147,7 +147,7 @@ static inline HRESULT stack_pop_int(script_ctx_t *ctx, INT *r) return to_int32(ctx, stack_pop(ctx), r); } -static inline HRESULT stack_pop_uint(script_ctx_t *ctx, DWORD *r) +static inline HRESULT stack_pop_uint(script_ctx_t *ctx, UINT32 *r) { return to_uint32(ctx, stack_pop(ctx), r); } @@ -2643,7 +2643,7 @@ static HRESULT interp_neg(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.7.1 */ static HRESULT interp_lshift(script_ctx_t *ctx) { - DWORD r; + UINT32 r; INT l; HRESULT hres; @@ -2661,7 +2661,7 @@ static HRESULT interp_lshift(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.7.2 */ static HRESULT interp_rshift(script_ctx_t *ctx) { - DWORD r; + UINT32 r; INT l; HRESULT hres; @@ -2679,7 +2679,7 @@ static HRESULT interp_rshift(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.7.3 */ static HRESULT interp_rshift2(script_ctx_t *ctx) { - DWORD r, l; + UINT32 r, l; HRESULT hres; hres = stack_pop_uint(ctx, &r); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 3eef1aa2dd6..f24d53977bd 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -297,7 +297,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, unsigned *argc, jsval_t **ret) { jsval_t *argv, val; - DWORD length, i; + UINT32 length, i; HRESULT hres; hres = jsdisp_propget_name(arg_array, L"length", &val); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c192ec7c216..8ca2ea938af 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -366,6 +366,7 @@ HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,INT*) DECLSPEC_HIDDEN; +HRESULT to_long(script_ctx_t*,jsval_t,LONG*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; HRESULT to_flat_string(script_ctx_t*,jsval_t,jsstr_t**,const WCHAR**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index cb6c051176f..0dc4aa1806c 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -642,7 +642,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg, jsdisp_t **ret) { - unsigned flags = 0; + DWORD flags = 0; const WCHAR *opt = NULL; jsstr_t *src; HRESULT hres = S_OK; @@ -695,7 +695,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsv { RegExpInstance *regexp = regexp_from_jsdisp(re); match_result_t *match_result; - unsigned match_cnt, i; + DWORD match_cnt, i; const WCHAR *str; jsdisp_t *array; HRESULT hres; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3c3cd012490..d3a41facc6c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -706,6 +706,11 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) return S_OK; } +HRESULT to_long(script_ctx_t *ctx, jsval_t v, LONG *ret) +{ + return to_int32(ctx, v, (INT*)ret); +} + /* ECMA-262 3rd Edition 9.6 */ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) { diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5958216b861..cca14cbbb95 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1596,7 +1596,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WOR unsigned argc, jsval_t *argv, jsval_t *r) { WCHAR *ret_str; - DWORD i, code; + UINT32 i, code; jsstr_t *ret; HRESULT hres; diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 41faa20ed79..74b9a29fc9c 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -63,7 +63,8 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un jsval_t *r) { VBArrayInstance *vbarray; - int i, *indexes; + unsigned i; + LONG *indexes; VARIANT out; HRESULT hres; @@ -76,12 +77,12 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un if(argc < SafeArrayGetDim(vbarray->safearray)) return JS_E_SUBSCRIPT_OUT_OF_RANGE; - indexes = heap_alloc(sizeof(int)*argc); + indexes = heap_alloc(sizeof(indexes[0])*argc); if(!indexes) return E_OUTOFMEMORY; for(i=0; i<argc; i++) { - hres = to_int32(ctx, argv[i], indexes+i); + hres = to_long(ctx, argv[i], indexes + i); if(FAILED(hres)) { heap_free(indexes); return hres; @@ -106,7 +107,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns jsval_t *r) { VBArrayInstance *vbarray; - int dim; + LONG dim; HRESULT hres; TRACE("\n"); @@ -116,7 +117,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns return JS_E_VBARRAY_EXPECTED; if(argc) { - hres = to_int32(ctx, argv[0], &dim); + hres = to_long(ctx, argv[0], &dim); if(FAILED(hres)) return hres; } else @@ -140,7 +141,7 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un jsdisp_t *array; jsval_t val; VARIANT *v; - int i, size = 1, ubound, lbound; + LONG i, size = 1, ubound, lbound; HRESULT hres; TRACE("\n"); @@ -192,7 +193,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns jsval_t *r) { VBArrayInstance *vbarray; - int dim; + LONG dim; HRESULT hres; TRACE("\n"); @@ -202,7 +203,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns return JS_E_VBARRAY_EXPECTED; if(argc) { - hres = to_int32(ctx, argv[0], &dim); + hres = to_long(ctx, argv[0], &dim); if(FAILED(hres)) return hres; } else

1 0

Eric Pouech : dwrite: Use correct integral types.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 04bb4424efacee1e183e8625f886141405fb3f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04bb4424efacee1e183e8625… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 10:39:38 2022 +0300 dwrite: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 3 ++- dlls/dwrite/opentype.c | 5 +++-- dlls/dwrite/shape.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cbc0434b72d..4b32bf1e0de 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5084,7 +5084,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 struct dwrite_fontcollection *collection; WCHAR eudckeypathW[16]; HKEY eudckey; - DWORD index; + UINT32 index; BOOL exists; LONG retval; HRESULT hr; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ab53d5cb80d..26415201d91 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1515,8 +1515,9 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) { - unsigned int index = 0, value_size, name_count, max_name_count, type, data_size; + unsigned int index = 0, value_size, max_name_count; WCHAR **paths = NULL, *name, *value = NULL; + DWORD name_count, type, data_size; size_t capacity = 0, count = 0; HKEY hkey; LONG r; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 452b00240b8..5bac32f9ee7 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4607,8 +4607,8 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex next_bit = global_bit_shift + 1; for (i = 0; i < features->count; ++i) { - unsigned int bits_needed; BOOL found = FALSE; + DWORD bits_needed; feature = &features->features[i]; @@ -5077,7 +5077,8 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (format == 1) { const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); - unsigned int shift, alt_index; + DWORD shift; + unsigned int alt_index; UINT16 set_offset; coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 177ad1d06fe..bf80d686052 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -67,10 +67,10 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) free(cache); } -static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, +static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const unsigned int *scripts, unsigned int *script_index) { - static const DWORD fallback_scripts[] = + static const unsigned int fallback_scripts[] = { DWRITE_MAKE_OPENTYPE_TAG('D','F','L','T'), DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'),

1 0

Zebediah Figura : ws2_32: Return 32767 or 0 in the iMaxSockets field.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 699643c4276ad6b73a2077886ed1bef138b5cfef URL: https://source.winehq.org/git/wine.git/?a=commit;h=699643c4276ad6b73a207788… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:49 2022 -0600 ws2_32: Return 32767 or 0 in the iMaxSockets field. Depending on reported winsock version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50352 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +-- dlls/ws2_32/tests/protocol.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 565f1c89dc0..19a7d901414 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -419,7 +419,6 @@ static BOOL socket_list_remove( SOCKET socket ) return FALSE; } -#define MAX_SOCKETS_PER_PROCESS 128 /* reasonable guess */ #define MAX_UDP_DATAGRAM 1024 static INT WINAPI WSA_DefaultBlockingHook( FARPROC x ); @@ -588,7 +587,7 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) data->wHighVersion = MAKEWORD(2, 2); strcpy( data->szDescription, "WinSock 2.0" ); strcpy( data->szSystemStatus, "Running" ); - data->iMaxSockets = MAX_SOCKETS_PER_PROCESS; + data->iMaxSockets = (LOBYTE(version) == 1 ? 32767 : 0); data->iMaxUdpDg = MAX_UDP_DATAGRAM; /* don't fill lpVendorInfo */ } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index db89febff2e..a95b6e685af 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2871,7 +2871,7 @@ static void test_startup(void) 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); + 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);

1 0

Zebediah Figura : ws2_32: Cap the negotiated winsock version to 1.1 or 2.2.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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