October 2011 - Wine-Commits

Thomas Mullaly : urlmon: Improved MapUrlToZone{Ex2} and GetSecurityId support.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 253fccc82eef1f4d10460e7a792e73a1647d7898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253fccc82eef1f4d10460e7a7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Sep 15 21:36:18 2011 -0400 urlmon: Improved MapUrlToZone{Ex2} and GetSecurityId support. --- dlls/urlmon/sec_mgr.c | 26 ++++++++++++++++++++++++-- dlls/urlmon/tests/sec_mgr.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 0c7170c..c74fbce 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -62,6 +62,15 @@ static inline BOOL is_drive_path(const WCHAR *path) return isalphaW(*path) && *(path+1) == ':'; } +/* List of schemes types Windows seems to expect to be hierarchical. */ +static inline BOOL is_hierarchical_scheme(URL_SCHEME type) { + return(type == URL_SCHEME_HTTP || type == URL_SCHEME_FTP || + type == URL_SCHEME_GOPHER || type == URL_SCHEME_NNTP || + type == URL_SCHEME_TELNET || type == URL_SCHEME_WAIS || + type == URL_SCHEME_FILE || type == URL_SCHEME_HTTPS || + type == URL_SCHEME_RES); +} + /******************************************************************** * get_string_from_reg [internal] * @@ -466,6 +475,19 @@ static HRESULT get_zone_from_domains(IUri *uri, DWORD *zone) if(FAILED(hres)) return hres; + /* Known hierarchical scheme types must have a host. If they don't Windows + * assigns URLZONE_INVALID to the zone. + */ + if((scheme_type != URL_SCHEME_UNKNOWN && scheme_type != URL_SCHEME_FILE) + && is_hierarchical_scheme(scheme_type) && !*host) { + *zone = URLZONE_INVALID; + + SysFreeString(host); + + /* The MapUrlToZone functions return S_OK when this condition occurs. */ + return S_OK; + } + hres = IUri_GetSchemeName(uri, &scheme); if(FAILED(hres)) { SysFreeString(host); @@ -695,8 +717,8 @@ static HRESULT get_security_id(LPCWSTR url, BYTE *secid, DWORD *secid_len) static const WCHAR wszFile[] = {'f','i','l','e',':'}; hres = map_url_to_zone(url, &zone, &secur_url); - if(FAILED(hres)) - return hres == 0x80041001 ? E_INVALIDARG : hres; + if(zone == URLZONE_INVALID) + return (hres == 0x80041001 || hres == S_OK) ? E_INVALIDARG : hres; /* file protocol is a special case */ if(strlenW(secur_url) >= sizeof(wszFile)/sizeof(WCHAR) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index fca17e8..869cc35 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -100,6 +100,8 @@ static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2 '.','j','p','g',0}; static const WCHAR url11[] = {'f','i','l','e',':','/','/','c',':','/','I','n','d','e','x','.','h','t','m',0}; static const WCHAR url12[] = {'f','i','l','e',':','/','/','/','c',':','/','I','n','d','e','x','.','h','t','m',0}; +static const WCHAR url13[] = {'h','t','t','p',':','g','o','o','g','l','e','.','c','o','m',0}; +static const WCHAR url14[] = {'z','i','p',':','t','e','s','t','i','n','g','.','c','o','m','/','t','e','s','t','i','n','g',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -121,6 +123,8 @@ static const BYTE secid7[] = {'f','t','p',':','z','o','n','e','3', '.','w','i','n','e','t','e','s','t',3,0,0,0}; static const BYTE secid10[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e','.','j','p','g',3,0,0,0}; +static const BYTE secid14[] = + {'z','i','p',':','t','e','s','t','i','n','g','.','c','o','m','/','t','e','s','t','i','n','g',3,0,0,0}; static const BYTE secid10_2[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e','.','j','p','g',3,0,0,0}; @@ -416,6 +420,28 @@ static void test_SecurityManager(void) "wrong secid\n"); zone = 100; + hres = IInternetSecurityManager_MapUrlToZone(secmgr, url13, &zone, 0); + ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); + ok(zone == URLZONE_INVALID || broken(zone == URLZONE_INTERNET), "zone=%d\n", zone); + + size = sizeof(buf); + memset(buf, 0xf0, sizeof(buf)); + hres = IInternetSecurityManager_GetSecurityId(secmgr, url13, buf, &size, 0); + ok(hres == E_INVALIDARG || broken(hres == S_OK), "GetSecurityId failed: %08x\n", hres); + + zone = 100; + hres = IInternetSecurityManager_MapUrlToZone(secmgr, url14, &zone, 0); + ok(hres == S_OK, "MapUrlToZone failed: %08x, expected S_OK\n", hres); + ok(zone == URLZONE_INTERNET, "zone=%d\n", zone); + + size = sizeof(buf); + memset(buf, 0xf0, sizeof(buf)); + hres = IInternetSecurityManager_GetSecurityId(secmgr, url14, buf, &size, 0); + ok(hres == S_OK, "GetSecurityId failed: %08x, expected S_OK\n", hres); + todo_wine ok(size == sizeof(secid14), "size=%d\n", size); + todo_wine ok(!memcmp(buf, secid14, size), "wrong secid\n"); + + zone = 100; hres = IInternetSecurityManager_MapUrlToZone(secmgr, NULL, &zone, 0); ok(hres == E_INVALIDARG, "MapUrlToZone failed: %08x, expected E_INVALIDARG\n", hres); ok(zone == 100 || zone == -1, "zone=%d\n", zone); @@ -1734,7 +1760,9 @@ static const struct { {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET}, {"/file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, {"zip://testing.com/",0,0,URLZONE_INTERNET}, - {"zip:testing.com",0,0,URLZONE_INTERNET} + {"zip:testing.com",0,0,URLZONE_INTERNET}, + {"http:google.com",0,S_OK,URLZONE_INVALID}, + {"http:/google.com",0,S_OK,URLZONE_INVALID} }; static void test_SecurityManagerEx2(void)

1 0

Andrew Talbot : jscript: Add breaks to some switch statements.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: e67aaab27a67affc21178ce66483be222d6d3319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67aaab27a67affc21178ce66… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 20:10:24 2011 +0100 jscript: Add breaks to some switch statements. --- dlls/jscript/regexp.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 0fa13ff..e38e6ea 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -4037,9 +4037,10 @@ static HRESULT RegExpConstr_leftContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; + break; } case DISPATCH_PROPERTYPUT: - return S_OK; + break; default: FIXME("unsupported flags\n"); return E_NOTIMPL; @@ -4063,9 +4064,10 @@ static HRESULT RegExpConstr_rightContext(script_ctx_t *ctx, vdisp_t *jsthis, WOR V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; + break; } case DISPATCH_PROPERTYPUT: - return S_OK; + break; default: FIXME("unsupported flags\n"); return E_NOTIMPL;

1 0

Alexander Nicolaysen Sørnes : version: Return the user to the version page after managing notes
by Alexander Nicolaysen Sørnes Oct. 9, 2011

Oct. 9, 2011

Module: appdb Branch: master Commit: cb1b2d21850e6dd8dceb592f6aa34c5b8712c996 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=cb1b2d21850e6dd8dceb592f… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Oct 9 15:12:53 2011 +0200 version: Return the user to the version page after managing notes --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index 8286c5b..8f02b24 100644 --- a/include/version.php +++ b/include/version.php @@ -1011,7 +1011,7 @@ class version { echo $shAdd.'" />'; echo "\t".'<input type="submit" value="Add note/how-to" class="button">'."\n"; echo '</form>'."\n"; - echo '<form method="post" action="'.BASE.'objectManager.php?sClass=tagNoteVersionAssignMgr&sAction=edit&iId='.$this->iVersionId.'">'; + echo '<form method="post" action="'.BASE.'objectManager.php?sClass=tagNoteVersionAssignMgr&sAction=edit&iId='.$this->iVersionId.'&sReturnTo='.urlencode($this->objectMakeUrl()).'">'; echo '<input type="submit" value="Manage notes" />'; echo '</form>'; echo "</td></tr>";

1 0

Alexander Nicolaysen Sørnes : objectManager: use value instead of innerHTML when adding common replies to the e-mail text field
by Alexander Nicolaysen Sørnes Oct. 9, 2011

Oct. 9, 2011

Module: appdb Branch: master Commit: 28df9c104dbead0bac8a119c4611fe49e21f073e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=28df9c104dbead0bac8a119c… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Oct 9 14:47:35 2011 +0200 objectManager: use value instead of innerHTML when adding common replies to the e-mail text field --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 00c7251..d6be2aa 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -452,7 +452,7 @@ class ObjectManager { $sReply = $oReply->getReply(); echo '<tr valign=top><td class="color0"></td>',"\n"; - echo '<td class="color0"><a onClick="document.forms[\'sQform\'][\'sReplyText\'].innerHTML += \''.$sReply.' \';">'.$sReply.'</a></td>',"\n"; + echo '<td class="color0"><a onClick="document.forms[\'sQform\'][\'sReplyText\'].value += \''.$sReply.' \';">'.$sReply.'</a></td>',"\n"; echo '</tr>',"\n"; } // end output radio buttons for common responses

1 0

Peter Schellenbach : comctl32/statusbar: Fixed missing icon in owner draw panels.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: 9751a946e353bb95d7c183bc87d1cd9c3b681939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9751a946e353bb95d7c183bc8… Author: Peter Schellenbach <pjs(a)asent.com> Date: Wed Sep 14 18:58:00 2011 -0700 comctl32/statusbar: Fixed missing icon in owner draw panels. --- dlls/comctl32/status.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 1cb69eb..43b65aa 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -207,6 +207,7 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART UINT border = BDR_SUNKENOUTER; HTHEME theme = GetWindowTheme (infoPtr->Self); int themePart = SP_PANE; + int x = 0; TRACE("part bound %s\n", wine_dbgstr_rect(&r)); if (part->style & SBT_POPOUT) @@ -224,6 +225,12 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART else DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST); + if (part->hIcon) { + INT cy = r.bottom - r.top; + DrawIconEx (hdc, r.left + 2, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL); + x = 2 + cy; + } + if (part->style & SBT_OWNERDRAW) { DRAWITEMSTRUCT dis; @@ -233,15 +240,9 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART dis.hDC = hdc; dis.rcItem = r; dis.itemData = (ULONG_PTR)part->text; - SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); + SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else { - if (part->hIcon) { - INT cy = r.bottom - r.top; - - r.left += 2; - DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL); - r.left += cy; - } + r.left += x; DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); } }

1 0

Aric Stewart : usp10: Handle the SSA_PASSWORD flag in ScriptStringAnalyse.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: 95ca444692ee97dc165101c8f29a55b5b514dc75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ca444692ee97dc165101c8f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 6 15:23:45 2011 -0500 usp10: Handle the SSA_PASSWORD flag in ScriptStringAnalyse. --- dlls/usp10/usp10.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 14f523f..5a8a468 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -914,6 +914,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_STATE sState; int i, num_items = 255; BYTE *BidiLevel; + WCHAR *iString = NULL; TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, @@ -945,6 +946,14 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, else memset(&sControl, 0, sizeof(SCRIPT_CONTROL)); + if (dwFlags & SSA_PASSWORD) + { + iString = heap_alloc(sizeof(WCHAR)*cString); + for (i = 0; i < cString; i++) + iString[i] = *((const WCHAR *)pString); + pString = iString; + } + hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); @@ -1026,9 +1035,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, heap_free(BidiLevel); *pssa = analysis; + heap_free(iString); return S_OK; error: + heap_free(iString); heap_free(analysis->glyphs); heap_free(analysis->logattrs); heap_free(analysis->pItem);

1 0

Louis Lenders : dwmapi: Add stub for DwmRegisterThumbnail.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: 09dfda553c6afb26f2ac063d4549885f181620b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dfda553c6afb26f2ac063d4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 30 12:30:10 2011 +0200 dwmapi: Add stub for DwmRegisterThumbnail. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 10 ++++++++++ include/dwmapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 8e01cac..8f8f7a3 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -36,7 +36,7 @@ @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize -@ stub DwmRegisterThumbnail +@ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration @ stub DwmSetPresentParameters @ stdcall DwmSetWindowAttribute(long long ptr long) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1bc000..39a9918 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -198,3 +198,13 @@ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attrib return E_NOTIMPL; } + +/********************************************************************** + * DwmRegisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_id) +{ + FIXME("(%p %p %p) stub\n", dest, src, thumbnail_id); + + return E_NOTIMPL; +} diff --git a/include/dwmapi.h b/include/dwmapi.h index ecc515c..b2546ae 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -30,6 +30,7 @@ extern "C" { #endif DECLARE_HANDLE(HTHUMBNAIL); +typedef HTHUMBNAIL *PHTHUMBNAIL; typedef struct _MilMatrix3x2D { @@ -60,6 +61,7 @@ DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmIsCompositionEnabled(BOOL*); +DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL);

1 0

André Hentschel : tools: Upgrade the config.guess/ config.sub scripts.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: 2843d4f831aac681cdd42ee8fad950b93bce6875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2843d4f831aac681cdd42ee8f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 30 16:24:34 2011 +0200 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 223 +++++++++++++++++++++++++++------------------------- tools/config.sub | 122 ++++++++++++++++++----------- 2 files changed, 192 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2843d4f831aac681cdd42…

1 0

Andrew Talbot : ntdll: Mark some fall-throughs in a switch statement.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: c228ecba3918a2e6fd3a27c2e7a8c4296467729c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c228ecba3918a2e6fd3a27c2e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 17:51:42 2011 +0100 ntdll: Mark some fall-throughs in a switch statement. --- dlls/ntdll/sec.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index c8e8a4d..5e27730 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -166,12 +166,19 @@ NTSTATUS WINAPI RtlAllocateAndInitializeSid ( switch( nSubAuthorityCount ) { case 8: tmp_sid->SubAuthority[7]= nSubAuthority7; + /* fall through */ case 7: tmp_sid->SubAuthority[6]= nSubAuthority6; + /* fall through */ case 6: tmp_sid->SubAuthority[5]= nSubAuthority5; + /* fall through */ case 5: tmp_sid->SubAuthority[4]= nSubAuthority4; + /* fall through */ case 4: tmp_sid->SubAuthority[3]= nSubAuthority3; + /* fall through */ case 3: tmp_sid->SubAuthority[2]= nSubAuthority2; + /* fall through */ case 2: tmp_sid->SubAuthority[1]= nSubAuthority1; + /* fall through */ case 1: tmp_sid->SubAuthority[0]= nSubAuthority0; break; }

1 0

Andrew Talbot : oleaut32: Mark some fall-throughs in a switch statement.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: c9a8d3bd8906932130cd98b667574031895f83f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a8d3bd8906932130cd98b66… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 17:51:45 2011 +0100 oleaut32: Mark some fall-throughs in a switch statement. --- dlls/oleaut32/typelib2.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index d761491..fd4e547 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -899,11 +899,13 @@ static HRESULT ctl2_encode_variant( mask = 0x3ffffff; if(V_UI4(&v)>0x3ffffff) break; + /* fall through */ case VT_I1: case VT_UI1: case VT_BOOL: - if(!mask) - mask = 0xff; + if(!mask) + mask = 0xff; + /* fall through */ case VT_I2: case VT_UI2: if(!mask)

1 0