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

Marcus Meissner : wbemprox: Free server on exit (Coverity).
by Alexandre Julliard 09 May '13

09 May '13

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

Marcus Meissner : wbemprox: Initialize desc (Coverity).
by Alexandre Julliard 09 May '13

09 May '13

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 : xmllite: Free elem in error paths (Coverity).
by Alexandre Julliard 09 May '13

09 May '13

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 : xmllite: Do not leave start uninitialized (Coverity).
by Alexandre Julliard 09 May '13

09 May '13

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

Piotr Caban : msvcp60: Fix errors in spec file.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: d6aa3d969fcdb0418169f472fcb6a01897b628e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6aa3d969fcdb0418169f472f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 9 12:43:59 2013 +0200 msvcp60: Fix errors in spec file. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 4e5a28e..937fae3 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2842,9 +2842,9 @@ @ thiscall -arch=win32 ?do_put@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@G_N(a)Z(ptr ptr long ptr ptr long long) num_put_short_do_put_bool @ cdecl -arch=win64 ?do_put@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@G_N(a)Z(ptr ptr ptr ptr long long) num_put_short_do_put_bool @ thiscall -arch=win32 ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_char_do_put -@ cdecl -arch=win64 ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_char_do_put +@ cdecl -arch=win64 ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr ptr ptr ptr long long) time_put_char_do_put @ thiscall -arch=win32 ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_do_put -@ cdecl -arch=win64 ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_do_put +@ cdecl -arch=win64 ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr ptr ptr ptr long long) time_put_wchar_do_put @ thiscall -arch=win32 ?do_scan_is@?$ctype(a)G@std@@MBEPBGFPBG0(a)Z(ptr long ptr ptr) ctype_wchar_do_scan_is @ cdecl -arch=win64 ?do_scan_is@?$ctype(a)G@std@@MEBAPEBGFPEBG0(a)Z(ptr long ptr ptr) ctype_wchar_do_scan_is @ thiscall -arch=win32 ?do_scan_not@?$ctype(a)G@std@@MBEPBGFPBG0(a)Z(ptr long ptr ptr) ctype_wchar_do_scan_not @@ -3714,9 +3714,9 @@ @ thiscall -arch=win32 ?put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@PBD3(a)Z(ptr ptr long ptr ptr ptr ptr ptr) time_put_char_put_format @ cdecl -arch=win64 ?put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@PEBD3(a)Z(ptr ptr ptr ptr ptr ptr ptr) time_put_char_put_format @ thiscall -arch=win32 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_put -@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr long ptr ptr ptr long long) time_put_wchar_put +@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@DD(a)Z(ptr ptr ptr ptr ptr long long) time_put_wchar_put @ thiscall -arch=win32 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@PBUtm@@PBG3(a)Z(ptr ptr long ptr ptr ptr ptr ptr) time_put_wchar_put_format -@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@PEBG3(a)Z(ptr ptr long ptr ptr ptr ptr ptr) time_put_wchar_put_format +@ cdecl -arch=win64 ?put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@PEBUtm@@PEBG3(a)Z(ptr ptr ptr ptr ptr ptr ptr) time_put_wchar_put_format @ thiscall -arch=win32 ?putback@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)D@Z(ptr long) basic_istream_char_putback @ cdecl -arch=win64 ?putback@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)D@Z(ptr long) basic_istream_char_putback @ thiscall -arch=win32 ?putback@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)G@Z(ptr long) basic_istream_wchar_putback

1 0

Nikolay Sivov : user32: Fix right and bottom edge sizes.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 0325dc6186f17cb214e180ccf6b7350dfb9de8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0325dc6186f17cb214e180ccf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 8 21:29:44 2013 +0400 user32: Fix right and bottom edge sizes. --- dlls/user32/uitools.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index a21ab7b..4921299 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -539,7 +539,7 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, if(uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.right-1, InnerRect.bottom-1); + LineTo(hdc, InnerRect.right, InnerRect.bottom-1); } if(uFlags & BF_RIGHT) { @@ -563,12 +563,12 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, if(uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); - LineTo(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2); + LineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-2, InnerRect.top+2-RBpenplus, NULL); - LineTo(hdc, InnerRect.right-2, InnerRect.bottom-2+RTpenplus); + MoveToEx(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL); + LineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus); } if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) )

1 0

Nikolay Sivov : comctl32: Fix disabled thumb painting, for TBS_BOTH use edged rectangle.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 2248cfbb6b24bcbb75369028d838ab1166eda539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2248cfbb6b24bcbb75369028d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 9 14:07:26 2013 +0400 comctl32: Fix disabled thumb painting, for TBS_BOTH use edged rectangle. --- dlls/comctl32/trackbar.c | 72 +++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 99fde1b..f65297c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -613,18 +613,11 @@ TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc) } static void -TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) -{ - HBRUSH oldbr; - HPEN oldpen; - RECT thumb = infoPtr->rcThumb; - int BlackUntil = 3; - int PointCount = 6; - POINT points[6]; - int fillClr; - int PointDepth; +TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc) +{ HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); - + HBRUSH brush; + if (theme) { int partId; @@ -645,32 +638,42 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) else stateId = TUS_NORMAL; - DrawThemeBackground (theme, hdc, partId, stateId, &thumb, 0); + DrawThemeBackground (theme, hdc, partId, stateId, &infoPtr->rcThumb, NULL); return; } - fillClr = infoPtr->flags & TB_DRAG_MODE ? COLOR_BTNHILIGHT : COLOR_BTNFACE; - oldbr = SelectObject (hdc, GetSysColorBrush(fillClr)); - SetPolyFillMode (hdc, WINDING); + if (infoPtr->dwStyle & WS_DISABLED) + { + if (comctl32_color.clr3dHilight == comctl32_color.clrWindow) + brush = COMCTL32_hPattern55AABrush; + else + brush = GetSysColorBrush(COLOR_SCROLLBAR); + + SetTextColor(hdc, comctl32_color.clr3dFace); + SetBkColor(hdc, comctl32_color.clr3dHilight); + } + else + brush = GetSysColorBrush(infoPtr->flags & TB_DRAG_MODE ? COLOR_BTNHILIGHT : COLOR_BTNFACE); if (infoPtr->dwStyle & TBS_BOTH) { - points[0].x=thumb.right; - points[0].y=thumb.top; - points[1].x=thumb.right; - points[1].y=thumb.bottom; - points[2].x=thumb.left; - points[2].y=thumb.bottom; - points[3].x=thumb.left; - points[3].y=thumb.top; - points[4].x=points[0].x; - points[4].y=points[0].y; - PointCount = 5; - BlackUntil = 3; + FillRect(hdc, &infoPtr->rcThumb, brush); + DrawEdge(hdc, &infoPtr->rcThumb, EDGE_RAISED, BF_RECT | BF_SOFT); + return; } else { + HBRUSH oldbr = SelectObject(hdc, brush); + RECT thumb = infoPtr->rcThumb; + int BlackUntil = 3; + int PointCount = 6; + POINT points[6]; + int PointDepth; + HPEN oldpen; + + SetPolyFillMode (hdc, WINDING); + if (infoPtr->dwStyle & TBS_VERT) { PointDepth = (thumb.bottom - thumb.top) / 2; @@ -742,16 +745,15 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) } } + /* Draw the thumb now */ + Polygon (hdc, points, PointCount); + oldpen = SelectObject(hdc, GetStockObject(BLACK_PEN)); + Polyline(hdc,points, BlackUntil); + SelectObject(hdc, GetStockObject(WHITE_PEN)); + Polyline(hdc, &points[BlackUntil-1], PointCount+1-BlackUntil); + SelectObject(hdc, oldpen); + SelectObject(hdc, oldbr); } - - /* Draw the thumb now */ - Polygon (hdc, points, PointCount); - oldpen = SelectObject(hdc, GetStockObject(BLACK_PEN)); - Polyline(hdc,points, BlackUntil); - SelectObject(hdc, GetStockObject(WHITE_PEN)); - Polyline(hdc, &points[BlackUntil-1], PointCount+1-BlackUntil); - SelectObject(hdc, oldpen); - SelectObject(hdc, oldbr); }

1 0

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

09 May '13

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

Hans Leidekker : shell32: Implement ASSOCSTR_SHELLEXTENSION.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 661bbbd06892dac3991d894ef4ffbbc8aeb3e58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=661bbbd06892dac3991d894ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 9 16:42:07 2013 +0200 shell32: Implement ASSOCSTR_SHELLEXTENSION. --- dlls/shell32/assoc.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index e565591..6681a63 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -429,7 +429,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( HRESULT hr; WCHAR path[MAX_PATH]; - TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, str, + TRACE("(%p,0x%08x,%u,%s,%p,%p)\n", This, cfFlags, str, debugstr_w(pszExtra), pszOut, pcchOut); if (cfFlags & cfUnimplemented) @@ -616,6 +616,30 @@ get_friendly_name_fail: HeapFree(GetProcessHeap(), 0, pszFileType); return hr; } + case ASSOCSTR_SHELLEXTENSION: + { + static const WCHAR shellexW[] = {'S','h','e','l','l','E','x','\\',0}; + WCHAR keypath[sizeof(shellexW) / sizeof(shellexW[0]) + 39], guid[39]; + CLSID clsid; + HKEY hkey; + DWORD size; + LONG ret; + + hr = CLSIDFromString(pszExtra, &clsid); + if (FAILED(hr)) return hr; + + strcpyW(keypath, shellexW); + strcatW(keypath, pszExtra); + ret = RegOpenKeyExW(This->hkeySource, keypath, 0, KEY_READ, &hkey); + if (ret) return HRESULT_FROM_WIN32(ret); + + size = sizeof(guid); + ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, NULL, guid, &size); + RegCloseKey(hkey); + if (ret) return HRESULT_FROM_WIN32(ret); + + return ASSOC_ReturnString(pszOut, pcchOut, guid, size / sizeof(WCHAR)); + } default: FIXME("assocstr %d unimplemented!\n", str);

1 0

Daniel Lehman : wininet: Copy and pass along proxyBypass in INTERNET_ConfigureProxy.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 438be70838dabd23717a7d6b4d3cae27af1cf100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438be70838dabd23717a7d6b4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 10:09:27 2013 -0700 wininet: Copy and pass along proxyBypass in INTERNET_ConfigureProxy. --- dlls/wininet/internet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f8c36f7..12e4096 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -697,13 +697,14 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; lpwai->proxy = heap_strdupW(proxyurl); + lpwai->proxyBypass = heap_strdupW(wpi.proxyBypass); if (UrlComponents.dwUserNameLength) { lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName); lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword); } - TRACE("http proxy = %s\n", debugstr_w(lpwai->proxy)); + TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); return TRUE; } else

1 0