May 2013 - Wine-Commits - list.winehq.org

Marcus Meissner : xmllite: Do not leave start uninitialized (Coverity).
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: e8e485d448db4a8c9481c40be6662ef6db354c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e485d448db4a8c9481c40be… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 11:03:22 2013 +0200 xmllite: Do not leave start uninitialized (Coverity). --- dlls/xmllite/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 72e9836..ed4f97e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1036,7 +1036,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); ptr = reader_get_cur(reader); TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); - val.str = start; + val.str = val.start = start; val.len = ptr-start; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW))

1 0

Andrew Eikum : oleaut32: COM cleanup for internal loading structures.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 8897f6034c384ccac5273af77cef6a0f748c12e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8897f6034c384ccac5273af77… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 8 15:12:49 2013 -0500 oleaut32: COM cleanup for internal loading structures. --- dlls/oleaut32/typelib.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c6d2189..f13024e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2458,7 +2458,7 @@ static CRITICAL_SECTION cache_section = { &cache_section_debug, -1, 0, 0, 0, 0 } typedef struct TLB_PEFile { - const IUnknownVtbl *lpvtbl; + IUnknown IUnknown_iface; LONG refs; HMODULE dll; HRSRC typelib_resource; @@ -2515,7 +2515,7 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p if (!This) return E_OUTOFMEMORY; - This->lpvtbl = &TLB_PEFile_Vtable; + This->IUnknown_iface.lpVtbl = &TLB_PEFile_Vtable; This->refs = 1; This->dll = NULL; This->typelib_resource = NULL; @@ -2540,7 +2540,7 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p { *pdwTLBLength = SizeofResource(This->dll, This->typelib_resource); *ppBase = This->typelib_base; - *ppFile = (IUnknown *)&This->lpvtbl; + *ppFile = &This->IUnknown_iface; return S_OK; } } @@ -2550,13 +2550,13 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p hr = E_FAIL; } - TLB_PEFile_Release((IUnknown *)&This->lpvtbl); + TLB_PEFile_Release(&This->IUnknown_iface); return hr; } typedef struct TLB_NEFile { - const IUnknownVtbl *lpvtbl; + IUnknown IUnknown_iface; LONG refs; LPVOID typelib_base; } TLB_NEFile; @@ -2738,7 +2738,7 @@ static HRESULT TLB_NEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p This = heap_alloc(sizeof(TLB_NEFile)); if (!This) return E_OUTOFMEMORY; - This->lpvtbl = &TLB_NEFile_Vtable; + This->IUnknown_iface.lpVtbl = &TLB_NEFile_Vtable; This->refs = 1; This->typelib_base = NULL; @@ -2758,20 +2758,20 @@ static HRESULT TLB_NEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p LZClose( lzfd ); *ppBase = This->typelib_base; *pdwTLBLength = reslen; - *ppFile = (IUnknown *)&This->lpvtbl; + *ppFile = &This->IUnknown_iface; return S_OK; } } } if( lzfd >= 0) LZClose( lzfd ); - TLB_NEFile_Release((IUnknown *)&This->lpvtbl); + TLB_NEFile_Release(&This->IUnknown_iface); return hr; } typedef struct TLB_Mapping { - const IUnknownVtbl *lpvtbl; + IUnknown IUnknown_iface; LONG refs; HANDLE file; HANDLE mapping; @@ -2828,7 +2828,7 @@ static HRESULT TLB_Mapping_Open(LPCWSTR path, LPVOID *ppBase, DWORD *pdwTLBLengt if (!This) return E_OUTOFMEMORY; - This->lpvtbl = &TLB_Mapping_Vtable; + This->IUnknown_iface.lpVtbl = &TLB_Mapping_Vtable; This->refs = 1; This->file = INVALID_HANDLE_VALUE; This->mapping = NULL; @@ -2846,13 +2846,13 @@ static HRESULT TLB_Mapping_Open(LPCWSTR path, LPVOID *ppBase, DWORD *pdwTLBLengt /* retrieve file size */ *pdwTLBLength = GetFileSize(This->file, NULL); *ppBase = This->typelib_base; - *ppFile = (IUnknown *)&This->lpvtbl; + *ppFile = &This->IUnknown_iface; return S_OK; } } } - IUnknown_Release((IUnknown *)&This->lpvtbl); + IUnknown_Release(&This->IUnknown_iface); return TYPE_E_CANTLOADLIBRARY; }

1 0

Nikolay Sivov : comctl32: Paint item as selected if it' s TVIS_SELECTED and also focused.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 6f15ca3e4714bafc2578fcb5f8b7b692a2e7f4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f15ca3e4714bafc2578fcb5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 9 20:39:22 2013 +0400 comctl32: Paint item as selected if it's TVIS_SELECTED and also focused. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 46ef751..c3ce406 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2526,7 +2526,7 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) * - Otherwise - use background color */ if ((item->state & TVIS_DROPHILITED) || ((item == infoPtr->focusedItem) && !(item->state & TVIS_SELECTED)) || - ((item->state & TVIS_SELECTED) && (!infoPtr->focusedItem) && + ((item->state & TVIS_SELECTED) && (!infoPtr->focusedItem || item == infoPtr->focusedItem) && (inFocus || (infoPtr->dwStyle & TVS_SHOWSELALWAYS)))) { if ((item->state & TVIS_DROPHILITED) || inFocus)

1 0

Marcus Meissner : xmllite: Free elem in error paths (Coverity).
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 51d96dac70bcf7ce2363b1e61ce9508300811f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d96dac70bcf7ce2363b1e61… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 10:59:43 2013 +0200 xmllite: Free elem in error paths (Coverity). --- dlls/xmllite/reader.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 3d0b4a8..72e9836 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -379,12 +379,18 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) if (!elem) return E_OUTOFMEMORY; hr = reader_strvaldup(reader, qname, &elem->qname); - if (FAILED(hr)) return hr; + if (FAILED(hr)) { + reader_free(reader, elem); + return hr; + } if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); - if (FAILED(hr)) return hr; + if (FAILED(hr)) { + reader_free(reader, elem); + return hr; + } } list_add_head(&reader->elements, &elem->entry);

1 0

Marcus Meissner : wbemprox: Initialize desc (Coverity).
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: af18f3e059dccc687b9c7cd7714eecbf6ead3c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af18f3e059dccc687b9c7cd77… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 10:50:28 2013 +0200 wbemprox: Initialize desc (Coverity). --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3266bd2..fe3fb98 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1407,7 +1407,7 @@ static void fill_videocontroller( struct table *table ) const WCHAR *name = videocontroller_deviceidW; if (!(table->data = heap_alloc( sizeof(*rec) ))) return; - + memset (&desc, 0, sizeof(desc)); hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); if (FAILED(hr)) goto done;

1 0

Marcus Meissner : wbemprox: Free server on exit (Coverity).
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 9d593b11833244a72e0ac5a8003f305618a4e1ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d593b11833244a72e0ac5a80… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 10:30:44 2013 +0200 wbemprox: Free server on exit (Coverity). --- dlls/wbemprox/wbemlocator.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 0034983..e869a6a 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -193,6 +193,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer( hr = WbemServices_create( NULL, namespace, (void **)ppNamespace ); heap_free( namespace ); + heap_free( server ); if (SUCCEEDED( hr )) return WBEM_NO_ERROR;

1 0

Andrew Eikum : oleaut32: COM cleanup for ITypeLib object.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 19f3bbc9034a8fcb19db27810f48597f716bdda5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f3bbc9034a8fcb19db27810… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 8 15:12:41 2013 -0500 oleaut32: COM cleanup for ITypeLib object. --- dlls/oleaut32/typelib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6d37bd4..e62fa84 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -984,7 +984,7 @@ typedef struct tagTLBImpLib typedef struct tagITypeLibImpl { ITypeLib2 ITypeLib2_iface; - const ITypeCompVtbl *lpVtblTypeComp; + ITypeComp ITypeComp_iface; LONG ref; TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */ LCID lcid; @@ -1020,7 +1020,7 @@ static const ITypeCompVtbl tlbtcvt; static inline ITypeLibImpl *impl_from_ITypeComp( ITypeComp *iface ) { - return (ITypeLibImpl *)((char*)iface - FIELD_OFFSET(ITypeLibImpl, lpVtblTypeComp)); + return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeComp_iface); } /* ITypeLib methods */ @@ -2988,7 +2988,7 @@ static ITypeLibImpl* TypeLibImpl_Constructor(void) if (!pTypeLibImpl) return NULL; pTypeLibImpl->ITypeLib2_iface.lpVtbl = &tlbvt; - pTypeLibImpl->lpVtblTypeComp = &tlbtcvt; + pTypeLibImpl->ITypeComp_iface.lpVtbl = &tlbtcvt; pTypeLibImpl->ref = 1; list_init(&pTypeLibImpl->implib_list); @@ -4438,7 +4438,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeComp( ITypeLibImpl *This = impl_from_ITypeLib2(iface); TRACE("(%p)->(%p)\n",This,ppTComp); - *ppTComp = (ITypeComp *)&This->lpVtblTypeComp; + *ppTComp = &This->ITypeComp_iface; ITypeComp_AddRef(*ppTComp); return S_OK;

1 0

Andrew Eikum : oleaut32: COM cleanup for ITypeInfo object.
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: ddcd368b281e0c7fb1a1fb7b890bab7cbd7bfdea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcd368b281e0c7fb1a1fb7b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 8 15:12:45 2013 -0500 oleaut32: COM cleanup for ITypeInfo object. --- dlls/oleaut32/typelib.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e62fa84..c6d2189 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1094,8 +1094,8 @@ typedef struct tagTLBImplType /* internal TypeInfo data */ typedef struct tagITypeInfoImpl { - const ITypeInfo2Vtbl *lpVtbl; - const ITypeCompVtbl *lpVtblTypeComp; + ITypeInfo2 ITypeInfo2_iface; + ITypeComp ITypeComp_iface; LONG ref; BOOL not_attached_to_typelib; TYPEATTR TypeAttr ; /* _lots_ of type information. */ @@ -1125,7 +1125,7 @@ typedef struct tagITypeInfoImpl static inline ITypeInfoImpl *info_impl_from_ITypeComp( ITypeComp *iface ) { - return (ITypeInfoImpl *)((char*)iface - FIELD_OFFSET(ITypeInfoImpl, lpVtblTypeComp)); + return CONTAINING_RECORD(iface, ITypeInfoImpl, ITypeComp_iface); } static const ITypeInfo2Vtbl tinfvt; @@ -4884,7 +4884,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( if (pTypeInfo->Name && !strcmpW(pTypeInfo->Name, szName)) { *pDescKind = DESCKIND_TYPECOMP; - pBindPtr->lptcomp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + pBindPtr->lptcomp = &pTypeInfo->ITypeComp_iface; ITypeComp_AddRef(pBindPtr->lptcomp); TRACE("module or enum: %s\n", debugstr_w(szName)); return S_OK; @@ -4894,7 +4894,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( if ((pTypeInfo->TypeAttr.typekind == TKIND_MODULE) || (pTypeInfo->TypeAttr.typekind == TKIND_ENUM)) { - ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + ITypeComp *pSubTypeComp = &pTypeInfo->ITypeComp_iface; HRESULT hr; hr = ITypeComp_Bind(pSubTypeComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr); @@ -4910,7 +4910,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( if ((pTypeInfo->TypeAttr.typekind == TKIND_COCLASS) && (pTypeInfo->TypeAttr.wTypeFlags & TYPEFLAG_FAPPOBJECT)) { - ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + ITypeComp *pSubTypeComp = &pTypeInfo->ITypeComp_iface; HRESULT hr; ITypeInfo *subtypeinfo; BINDPTR subbindptr; @@ -5013,9 +5013,9 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( if (pTypeInfo->Name && !strcmpiW(pTypeInfo->Name, szName)) { TRACE("returning %p\n", pTypeInfo); - *ppTInfo = (ITypeInfo *)&pTypeInfo->lpVtbl; + *ppTInfo = (ITypeInfo *)&pTypeInfo->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); - *ppTComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + *ppTComp = &pTypeInfo->ITypeComp_iface; ITypeComp_AddRef(*ppTComp); return S_OK; } @@ -5046,8 +5046,8 @@ static ITypeInfoImpl* ITypeInfoImpl_Constructor(void) pTypeInfoImpl = heap_alloc_zero(sizeof(ITypeInfoImpl)); if (pTypeInfoImpl) { - pTypeInfoImpl->lpVtbl = &tinfvt; - pTypeInfoImpl->lpVtblTypeComp = &tcompvt; + pTypeInfoImpl->ITypeInfo2_iface.lpVtbl = &tinfvt; + pTypeInfoImpl->ITypeComp_iface.lpVtbl = &tcompvt; pTypeInfoImpl->ref = 0; pTypeInfoImpl->hreftype = -1; pTypeInfoImpl->TypeAttr.memidConstructor = MEMBERID_NIL; @@ -5238,7 +5238,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeComp( ITypeInfo2 *iface, TRACE("(%p)->(%p)\n", This, ppTComp); - *ppTComp = (ITypeComp *)&This->lpVtblTypeComp; + *ppTComp = &This->ITypeComp_iface; ITypeComp_AddRef(*ppTComp); return S_OK; } @@ -6999,7 +6999,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if ((This->hreftype != -1) && (This->hreftype == hRefType)) { - *ppTInfo = (ITypeInfo *)&This->lpVtbl; + *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); result = S_OK; } @@ -7913,7 +7913,7 @@ static HRESULT WINAPI ITypeComp_fnBind( if (FAILED(hr)) return hr; *pDescKind = DESCKIND_FUNCDESC; - *ppTInfo = (ITypeInfo *)&This->lpVtbl; + *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { @@ -7923,7 +7923,7 @@ static HRESULT WINAPI ITypeComp_fnBind( if (FAILED(hr)) return hr; *pDescKind = DESCKIND_VARDESC; - *ppTInfo = (ITypeInfo *)&This->lpVtbl; + *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } @@ -7934,7 +7934,7 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfo *pTInfo; ITypeComp *pTComp; HRESULT hr; - hr=ITypeInfo_GetRefTypeInfo((ITypeInfo *)&This->lpVtbl, This->impltypes[0].hRef, &pTInfo); + hr=ITypeInfo2_GetRefTypeInfo(&This->ITypeInfo2_iface, This->impltypes[0].hRef, &pTInfo); if (SUCCEEDED(hr)) { hr = ITypeInfo_GetTypeComp(pTInfo,&pTComp);

1 0

Marcus Meissner : mshtml: Specify correct variable in TRACE (Coverity).
by Alexandre Julliard May 9, 2013

May 9, 2013

Module: wine Branch: master Commit: 423a8ccce8ff6b2d97ea0a1b6573135ae46dc107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423a8ccce8ff6b2d97ea0a1b6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 10:22:06 2013 +0200 mshtml: Specify correct variable in TRACE (Coverity). --- dlls/mshtml/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d70ae2d..54154aa 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -267,7 +267,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN info->prop_vt = desc->elemdescFunc.tdesc.vt; if(info->prop_vt != VT_VOID && !is_arg_type_supported(info->prop_vt)) { - TRACE("%s: return type %d\n", debugstr_w(info->name), info->arg_types[i]); + TRACE("%s: return type %d\n", debugstr_w(info->name), info->prop_vt); return; /* Fallback to ITypeInfo::Invoke */ }

1 0

Daniel Lehman : wininet: Accept ProxyBypass from environment or registry.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 73895b3279266cb0951b4059e48226d3b5f09619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73895b3279266cb0951b4059e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 3 17:11:48 2013 -0700 wininet: Accept ProxyBypass from environment or registry. --- dlls/wininet/internet.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dc0c89c..b9f3e98 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -116,6 +116,7 @@ static const WCHAR szInternetSettings[] = 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0 }; static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 }; static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l','e', 0 }; +static const WCHAR szProxyOverride[] = { 'P','r','o','x','y','O','v','e','r','r','i','d','e', 0 }; void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t size) { @@ -610,9 +611,49 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); } - RegCloseKey( key ); lpwpi->proxyBypass = NULL; + if (lpwpi->proxyEnabled) + { + if (!(envproxy = getenv( "no_proxy" ))) + { + /* figure out how much memory the proxy setting takes */ + if (!RegQueryValueExW( key, szProxyOverride, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) + { + LPWSTR szProxy; + + if (!(szProxy = heap_alloc(len))) + { + RegCloseKey( key ); + return ERROR_OUTOFMEMORY; + } + RegQueryValueExW( key, szProxyOverride, NULL, &type, (BYTE*)szProxy, &len ); + + lpwpi->proxyBypass = szProxy; + + TRACE("http proxy bypass = %s\n", debugstr_w(lpwpi->proxyBypass)); + } + else + { + TRACE("No proxy bypass server settings in registry.\n"); + } + } + else if (envproxy) + { + WCHAR *envproxyW; + + len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); + if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + return ERROR_OUTOFMEMORY; + MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + + lpwpi->proxyBypass = envproxyW; + + TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); + } + } + + RegCloseKey( key ); return ERROR_SUCCESS; }

1 0