April 2015 - Wine-commits - list.winehq.org

Jacek Caban : msxml3: Create unknode object only for node types supported by msxml.
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: 20b2e1bdb58b2b0d88b94fb9af7c3254cdd9ba2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b2e1bdb58b2b0d88b94fb9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 16 12:32:17 2015 +0200 msxml3: Create unknode object only for node types supported by msxml. --- dlls/msxml3/node.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 0f591b4..7119a43 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2038,9 +2038,11 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_doc_fragment( node ); break; case XML_DTD_NODE: + case XML_DOCUMENT_TYPE_NODE: pUnk = create_doc_type( node ); break; - default: { + case XML_ENTITY_NODE: + case XML_NOTATION_NODE: { unknode *new_node; FIXME("only creating basic node for type %d\n", node->type); @@ -2054,6 +2056,9 @@ IXMLDOMNode *create_node( xmlNodePtr node ) init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; } + default: + ERR("Called for unsupported node type %d\n", node->type); + return NULL; } hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret);

1 0

Jacek Caban : mshtml: Use NS_Alloc and NS_Free directly instead of via nsIMemory.
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: ba00e8e0e1159047e52469008ef41fe1f2d6b276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba00e8e0e1159047e52469008… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 16 12:37:11 2015 +0200 mshtml: Use NS_Alloc and NS_Free directly instead of via nsIMemory. --- dlls/mshtml/nsembed.c | 18 ++++++------------ dlls/mshtml/nsiface.idl | 15 --------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f4d14bc..ac33015 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -42,7 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" -#define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1" #define NS_COMMANDPARAMS_CONTRACTID "@mozilla.org/embedcomp/command-params;1" #define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" @@ -69,13 +68,14 @@ static nsresult (CDECL *NS_CStringSetData)(nsACString*,const char*,PRUint32); static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,cpp_bool,nsIFile**); static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,cpp_bool*); static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,cpp_bool*); +static void* (CDECL *NS_Alloc)(SIZE_T); +static void (CDECL *NS_Free)(void*); static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; static nsICategoryManager *cat_mgr; -static nsIMemory *nsmem = NULL; static nsIFile *profile_directory, *plugin_directory; static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e','r',0}; @@ -516,6 +516,8 @@ static BOOL load_xul(const PRUnichar *gre_path) NS_DLSYM(NS_NewLocalFile); NS_DLSYM(NS_StringGetData); NS_DLSYM(NS_CStringGetData); + NS_DLSYM(NS_Alloc); + NS_DLSYM(NS_Free); #undef NS_DLSYM @@ -733,11 +735,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) init_mutation(pCompMgr); set_preferences(); - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID, - NULL, &IID_nsIMemory, (void**)&nsmem); - if(NS_FAILED(nsres)) - ERR("Could not get nsIMemory: %08x\n", nsres); - nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_CATEGORYMANAGER_CONTRACTID, &IID_nsICategoryManager, (void**)&cat_mgr); if(NS_FAILED(nsres)) @@ -796,12 +793,12 @@ BOOL load_gecko(void) void *nsalloc(size_t size) { - return nsIMemory_Alloc(nsmem, size); + return NS_Alloc(size); } void nsfree(void *mem) { - nsIMemory_Free(nsmem, mem); + NS_Free(mem); } static BOOL nsACString_Init(nsACString *str, const char *data) @@ -1118,9 +1115,6 @@ void close_gecko(void) if(cat_mgr) nsICategoryManager_Release(cat_mgr); - if(nsmem) - nsIMemory_Release(nsmem); - /* Gecko doesn't really support being unloaded */ /* if (hXPCOM) FreeLibrary(hXPCOM); */ diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7989e9a..7cc898c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -227,21 +227,6 @@ interface nsIFactory : nsISupports [ object, - uuid(6aef11c4-8615-44a6-9711-98f43805693d), - local -] -interface nsIMemory : nsISupports -{ - void *Alloc(/*size_t*/ int size); - void *Realloc(void *_ptr, /*size_t*/ int newSize); - void Free(void *_ptr); - nsresult HeapMinimize(bool immediate); - nsresult IsLowMemory(bool *_retval); - nsresult IsLowMemoryPlatform(bool *_retval); -} - -[ - object, uuid(9188bc85-f92e-11d2-81ef-0060083a0bcf), local ]

1 0

Jacek Caban : textstor.idl: Added missing GXFPF_* constants.
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: 86adba0651701c60e1d19cb13d2d75b942a1d802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86adba0651701c60e1d19cb13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 15:24:27 2015 +0200 textstor.idl: Added missing GXFPF_* constants. --- include/textstor.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/textstor.idl b/include/textstor.idl index 7bd5289..e79443d 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -66,6 +66,9 @@ const DWORD TS_IAS_QUERYONLY = 0x2; const DWORD TS_ST_CORRECTION = 0x1; +const DWORD GXFPF_ROUND_NEAREST = 0x1; +const DWORD GXFPF_NEAREST = 0x2; + typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID;

1 0

Nikolay Sivov : rpcss: Fix a protseq string leak (Valgrind).
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: d0c8654d10ef8a7826f01ee92e572b5c5a26bae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c8654d10ef8a7826f01ee92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 07:35:57 2015 +0300 rpcss: Fix a protseq string leak (Valgrind). --- programs/rpcss/epmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index cebde56..2eb6039 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -252,6 +252,8 @@ void __cdecl ept_map(handle_t h, } LeaveCriticalSection(&csEpm); + + I_RpcFree(protseq); } void __cdecl ept_lookup_handle_free(handle_t h,

1 0

Nikolay Sivov : wshom.ocx/tests: Fix a BSTR leak (Valgrind).
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: f44707cb110404e02be2e55a8fe41d675ef656f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44707cb110404e02be2e55a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 07:44:19 2015 +0300 wshom.ocx/tests: Fix a BSTR leak (Valgrind). --- dlls/wshom.ocx/tests/wshom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index ad0e0be..9591c5c 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -406,6 +406,7 @@ static void test_registry(void) hr = IWshShell3_RegRead(sh3, name, &value); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); + SysFreeString(name); dim = SafeArrayGetDim(V_ARRAY(&value)); ok(dim == 1, "got %u\n", dim);

1 0

Nikolay Sivov : usp10/tests: Fix some leaks on error path (Valgrind).
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: c7b5a2f8510bba50922d33a0aa4d2a6466a2bf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b5a2f8510bba50922d33a0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 15 07:48:34 2015 +0300 usp10/tests: Fix some leaks on error path (Valgrind). --- dlls/usp10/tests/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7c26c51..39240f5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -756,7 +756,7 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, else if (hr != S_OK) winetest_trace("ScriptShapeOpenType failed (%x)\n",hr); if (FAILED(hr)) - return; + goto cleanup; for (x = 0; x < cchString; x++) { @@ -808,6 +808,7 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); } +cleanup: HeapFree(GetProcessHeap(),0,logclust); HeapFree(GetProcessHeap(),0,charProp); HeapFree(GetProcessHeap(),0,glyphs);

1 0

Bruno Jesus : include: Add a missing field to IP_ADAPTER_ADDRESSES_LH.
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: f17826bd34a2390cce1e9362aa945bc9907a1007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17826bd34a2390cce1e9362a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:23:04 2015 -0300 include: Add a missing field to IP_ADAPTER_ADDRESSES_LH. --- include/iptypes.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/iptypes.h b/include/iptypes.h index fc9f860..cda879d 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -188,6 +188,11 @@ typedef struct _IP_ADAPTER_GATEWAY_ADDRESS_LH { typedef IP_ADAPTER_GATEWAY_ADDRESS_LH IP_ADAPTER_GATEWAY_ADDRESS; typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; +typedef struct _IP_ADAPTER_DNS_SUFFIX { + struct _IP_ADAPTER_DNS_SUFFIX *Next; + WCHAR String[MAX_DNS_SUFFIX_STRING_LENGTH]; +} IP_ADAPTER_DNS_SUFFIX, *PIP_ADAPTER_DNS_SUFFIX; + #define IP_ADAPTER_DDNS_ENABLED 0x1 #define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX 0x2 #define IP_ADAPTER_DHCP_ENABLED 0x4 @@ -241,6 +246,7 @@ typedef struct _IP_ADAPTER_ADDRESSES_LH { BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; ULONG Dhcpv6ClientDuidLength; ULONG Dhcpv6Iaid; + PIP_ADAPTER_DNS_SUFFIX FirstDnsSuffix; } IP_ADAPTER_ADDRESSES_LH, *PIP_ADAPTER_ADDRESSES_LH; typedef struct _IP_ADAPTER_ADDRESSES_XP {

1 0

Bruno Jesus : iphlpapi/tests: Add more test_GetAdaptersAddresses tests.
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: a49668e8bc0c07a8ac4cf05c1dc54b028e82d94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49668e8bc0c07a8ac4cf05c1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:23:26 2015 -0300 iphlpapi/tests: Add more test_GetAdaptersAddresses tests. --- dlls/iphlpapi/tests/iphlpapi.c | 90 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 14bbc5d..5160063 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -129,6 +129,16 @@ static const char *ntoa( DWORD ip ) return buffer; } +static inline const char* debugstr_longlong(ULONGLONG ll) +{ + static char string[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(string, "%lx", (unsigned long)ll); + return string; +} + /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -1298,7 +1308,7 @@ static void testWin2KFunctions(void) static void test_GetAdaptersAddresses(void) { - ULONG ret, size; + ULONG ret, size, osize, i; IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; @@ -1320,16 +1330,29 @@ static void test_GetAdaptersAddresses(void) ptr = HeapAlloc(GetProcessHeap(), 0, size); ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + HeapFree(GetProcessHeap(), 0, ptr); + + /* higher size must not be changed to lower size */ + size *= 2; + osize = size; + ptr = HeapAlloc(GetProcessHeap(), 0, osize); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); +todo_wine + ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next) { + char temp[128]; + + ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || + S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), + "Unknown structure size of %u bytes\n", S(U(*aa)).Length); ok(aa->DnsSuffix != NULL, "DnsSuffix is not a valid pointer\n"); ok(aa->Description != NULL, "Description is not a valid pointer\n"); ok(aa->FriendlyName != NULL, "FriendlyName is not a valid pointer\n"); - if (winetest_debug <= 1) - continue; - + trace("\n"); trace("Length: %u\n", S(U(*aa)).Length); trace("IfIndex: %u\n", S(U(*aa)).IfIndex); trace("Next: %p\n", aa->Next); @@ -1338,6 +1361,24 @@ static void test_GetAdaptersAddresses(void) ua = aa->FirstUnicastAddress; while (ua) { +todo_wine + ok(ua->PrefixOrigin != IpPrefixOriginOther, + "bad address config value %d\n", ua->PrefixOrigin); +todo_wine + ok(ua->SuffixOrigin != IpSuffixOriginOther, + "bad address config value %d\n", ua->PrefixOrigin); + /* Address configured manually or from DHCP server? */ + if (ua->PrefixOrigin == IpPrefixOriginManual || + ua->PrefixOrigin == IpPrefixOriginDhcp) + { + ok(ua->ValidLifetime, "expected non-zero value\n"); + ok(ua->PreferredLifetime, "expected non-zero value\n"); + ok(ua->LeaseLifetime, "expected non-zero\n"); + } + /* Is the address ok in the network (not duplicated)? */ +todo_wine + ok(ua->DadState != IpDadStateInvalid && ua->DadState != IpDadStateDuplicate, + "bad address duplication value %d\n", ua->DadState); trace("\tLength: %u\n", S(U(*ua)).Length); trace("\tFlags: 0x%08x\n", S(U(*ua)).Flags); trace("\tNext: %p\n", ua->Next); @@ -1346,24 +1387,51 @@ static void test_GetAdaptersAddresses(void) trace("\tPrefixOrigin: %u\n", ua->PrefixOrigin); trace("\tSuffixOrigin: %u\n", ua->SuffixOrigin); trace("\tDadState: %u\n", ua->DadState); - trace("\tValidLifetime: 0x%08x\n", ua->ValidLifetime); - trace("\tPreferredLifetime: 0x%08x\n", ua->PreferredLifetime); - trace("\tLeaseLifetime: 0x%08x\n", ua->LeaseLifetime); + trace("\tValidLifetime: %u seconds\n", ua->ValidLifetime); + trace("\tPreferredLifetime: %u seconds\n", ua->PreferredLifetime); + trace("\tLeaseLifetime: %u seconds\n", ua->LeaseLifetime); trace("\n"); ua = ua->Next; } trace("FirstAnycastAddress: %p\n", aa->FirstAnycastAddress); trace("FirstMulticastAddress: %p\n", aa->FirstMulticastAddress); trace("FirstDnsServerAddress: %p\n", aa->FirstDnsServerAddress); - trace("DnsSuffix: %p\n", aa->DnsSuffix); - trace("Description: %p\n", aa->Description); - trace("FriendlyName: %p\n", aa->FriendlyName); - trace("PhysicalAddress: %02x\n", aa->PhysicalAddress[0]); + trace("DnsSuffix: %s %p\n", wine_dbgstr_w(aa->DnsSuffix), aa->DnsSuffix); + trace("Description: %s %p\n", wine_dbgstr_w(aa->Description), aa->Description); + trace("FriendlyName: %s %p\n", wine_dbgstr_w(aa->FriendlyName), aa->FriendlyName); trace("PhysicalAddressLength: %u\n", aa->PhysicalAddressLength); + for (i = 0; i < aa->PhysicalAddressLength; i++) + sprintf(temp + i * 3, "%02X-", aa->PhysicalAddress[i]); + temp[i ? i * 3 - 1 : 0] = '\0'; + trace("PhysicalAddress: %s\n", temp); trace("Flags: 0x%08x\n", aa->Flags); trace("Mtu: %u\n", aa->Mtu); trace("IfType: %u\n", aa->IfType); trace("OperStatus: %u\n", aa->OperStatus); + trace("Ipv6IfIndex: %u\n", aa->Ipv6IfIndex); + for (i = 0, temp[0] = '\0'; i < sizeof(aa->ZoneIndices) / sizeof(aa->ZoneIndices[0]); i++) + sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); + trace("ZoneIndices: %s\n", temp); + trace("FirstPrefix: %p\n", aa->FirstPrefix); + + if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; + trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed)); + trace("ReceiveLinkSpeed: %s\n", debugstr_longlong(aa->ReceiveLinkSpeed)); + trace("FirstWinsServerAddress:%p\n", aa->FirstWinsServerAddress); + trace("FirstGatewayAddress: %p\n", aa->FirstGatewayAddress); + trace("Ipv4Metric: %u\n", aa->Ipv4Metric); + trace("Ipv6Metric: %u\n", aa->Ipv6Metric); + trace("Luid: %p\n", &aa->Luid); + trace("Dhcpv4Server: %p\n", &aa->Dhcpv4Server); + trace("CompartmentId: %u\n", aa->CompartmentId); + trace("NetworkGuid: %s\n", wine_dbgstr_guid((GUID*) &aa->NetworkGuid)); + trace("ConnectionType: %u\n", aa->ConnectionType); + trace("TunnelType: %u\n", aa->TunnelType); + trace("Dhcpv6Server: %p\n", &aa->Dhcpv6Server); + trace("Dhcpv6ClientDuidLength:%u\n", aa->Dhcpv6ClientDuidLength); + trace("Dhcpv6ClientDuid: %p\n", aa->Dhcpv6ClientDuid); + trace("Dhcpv6Iaid: %u\n", aa->Dhcpv6Iaid); + trace("FirstDnsSuffix: %p\n", aa->FirstDnsSuffix); trace("\n"); } HeapFree(GetProcessHeap(), 0, ptr);

1 0

Bruno Jesus : iphlpapi: Update the buffer size only if required in GetAdaptersAddresses.
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: 708ab4ca12079a8d35e8e537119e6b33240f3292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708ab4ca12079a8d35e8e5371… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:23:50 2015 -0300 iphlpapi: Update the buffer size only if required in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 4 +++- dlls/iphlpapi/tests/iphlpapi.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d2f36fe..513cbce 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1382,8 +1382,10 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P ret = ERROR_SUCCESS; } else + { ret = ERROR_BUFFER_OVERFLOW; - *buflen = total_size; + *buflen = total_size; + } TRACE("num adapters %u\n", table->numIndexes); HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 5160063..377aadf 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1338,7 +1338,6 @@ static void test_GetAdaptersAddresses(void) ptr = HeapAlloc(GetProcessHeap(), 0, osize); ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); -todo_wine ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next)

1 0

Bruno Jesus : iphlpapi: Stub more IP_ADAPTER_UNICAST_ADDRESS fields in GetAdaptersAddresses.
by Alexandre Julliard 16 Apr '15

16 Apr '15

Module: wine Branch: master Commit: 9c20f9bca6996acc2ee1ddd4eece36123da498cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c20f9bca6996acc2ee1ddd4e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 16 01:25:44 2015 -0300 iphlpapi: Stub more IP_ADAPTER_UNICAST_ADDRESS fields in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 40 ++++++++++++++++++++++++++++++++++------ dlls/iphlpapi/tests/iphlpapi.c | 3 --- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 513cbce..3eaefab 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -784,6 +784,31 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } +static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) +{ + /* Actually this information should be read somewhere from the system + * but it doesn't matter much for the bugs found so far. + * This information is required for DirectPlay8 games. */ + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) + { + ua->PrefixOrigin = IpPrefixOriginDhcp; + ua->SuffixOrigin = IpSuffixOriginDhcp; + } + else + { + ua->PrefixOrigin = IpPrefixOriginManual; + ua->SuffixOrigin = IpSuffixOriginManual; + } + + /* The address is not duplicated in the network */ + ua->DadState = IpDadStatePreferred; + + /* Some address life time values, required even for non-dhcp addresses */ + ua->ValidLifetime = 60000; + ua->PreferredLifetime = 60000; + ua->LeaseLifetime = 60000; +} + static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { @@ -884,6 +909,13 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs); + + buflen = MAX_INTERFACE_PHYSADDR; + getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); + aa->PhysicalAddressLength = buflen; + aa->IfType = typeFromMibType(type); + aa->ConnectionType = connectionTypeFromMibType(type); + if (num_v4_gateways) { PMIB_IPFORWARDROW adapterRow; @@ -930,6 +962,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index sa->sin_port = 0; TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); + fill_unicast_addr_data(aa, ua); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1) @@ -967,6 +1000,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); TRACE("IPv6 %d/%d: %s\n", i + 1, num_v6addrs, debugstr_ipv6(sa, addr_buf)); + fill_unicast_addr_data(aa, ua); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v6addrs - 1) @@ -1071,12 +1105,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } } - buflen = MAX_INTERFACE_PHYSADDR; - getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); - aa->PhysicalAddressLength = buflen; - aa->IfType = typeFromMibType(type); - aa->ConnectionType = connectionTypeFromMibType(type); - getInterfaceMtuByName(name, &aa->Mtu); getInterfaceStatusByName(name, &status); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 377aadf..58fb843 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1360,10 +1360,8 @@ static void test_GetAdaptersAddresses(void) ua = aa->FirstUnicastAddress; while (ua) { -todo_wine ok(ua->PrefixOrigin != IpPrefixOriginOther, "bad address config value %d\n", ua->PrefixOrigin); -todo_wine ok(ua->SuffixOrigin != IpSuffixOriginOther, "bad address config value %d\n", ua->PrefixOrigin); /* Address configured manually or from DHCP server? */ @@ -1375,7 +1373,6 @@ todo_wine ok(ua->LeaseLifetime, "expected non-zero\n"); } /* Is the address ok in the network (not duplicated)? */ -todo_wine ok(ua->DadState != IpDadStateInvalid && ua->DadState != IpDadStateDuplicate, "bad address duplication value %d\n", ua->DadState); trace("\tLength: %u\n", S(U(*ua)).Length);

1 0