July 2010 - Wine-Commits - list.winehq.org

David Hedberg : shell32: Implement SHGetItemFromObject.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 2f5b53e7d71d5216dc509496fa707486905b9144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5b53e7d71d5216dc509496f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 25 19:08:14 2010 +0200 shell32: Implement SHGetItemFromObject. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellitem.c | 15 ++++++++ dlls/shell32/tests/shlfolder.c | 78 ++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 1 + 4 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index c11f20e..ed61f0b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -362,6 +362,7 @@ @ stdcall SHGetIDListFromObject(ptr ptr) @ stdcall SHGetInstanceExplorer(long) @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) +@ stdcall SHGetItemFromObject(ptr ptr ptr) @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) @ stdcall SHGetNameFromIDList(ptr long ptr) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 6abc02c..27b2d53 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -535,3 +535,18 @@ HRESULT WINAPI SHGetItemFromDataObject(IDataObject *pdtobj, return ret; } + +HRESULT WINAPI SHGetItemFromObject(IUnknown *punk, REFIID riid, void **ppv) +{ + LPITEMIDLIST pidl; + HRESULT ret; + + ret = SHGetIDListFromObject(punk, &pidl); + if(SUCCEEDED(ret)) + { + ret = SHCreateItemFromIDList(pidl, riid, ppv); + ILFree(pidl); + } + + return ret; +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cf7150e..4a81b95 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -64,6 +64,7 @@ static LPITEMIDLIST (WINAPI *pSHSimpleIDListFromPathAW)(LPCVOID); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); +static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static void init_function_pointers(void) { @@ -88,6 +89,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetNameFromIDList); MAKEFUNC(SHGetItemFromDataObject); MAKEFUNC(SHGetIDListFromObject); + MAKEFUNC(SHGetItemFromObject); #undef MAKEFUNC #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) @@ -2627,6 +2629,81 @@ static void test_SHGetIDListFromObject(void) pILFree(pidl_desktop); } +static void test_SHGetItemFromObject(void) +{ + IUnknownImpl *punkimpl; + IShellFolder *psfdesktop; + LPITEMIDLIST pidl; + IShellItem *psi; + IUnknown *punk; + HRESULT hres; + struct if_count ifaces[] = + { {&IID_IPersistIDList, 0}, + {&IID_IPersistFolder2, 0}, + {&IID_IDataObject, 0}, + {&IID_IParentAndItem, 0}, + {&IID_IFolderView, 0}, + {NULL, 0} }; + + if(!pSHGetItemFromObject) + { + skip("No SHGetItemFromObject.\n"); + return; + } + + SHGetDesktopFolder(&psfdesktop); + + if(0) + { + /* Crashes with Windows 7 */ + hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IUnknown, (void**)NULL); + hres = pSHGetItemFromObject(NULL, &IID_IUnknown, (void**)NULL); + hres = pSHGetItemFromObject((IUnknown*)psfdesktop, NULL, (void**)&punk); + } + + hres = pSHGetItemFromObject(NULL, &IID_IUnknown, (void**)&punk); + ok(hres == E_NOINTERFACE, "Got 0x%08x\n", hres); + + punkimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(IUnknownImpl)); + punkimpl->lpVtbl = &vt_IUnknown; + punkimpl->ifaces = ifaces; + punkimpl->unknown = 0; + + /* The same as SHGetIDListFromObject */ + hres = pSHGetIDListFromObject((IUnknown*)punkimpl, &pidl); + ok(hres == E_NOINTERFACE, "Got %x\n", hres); + ok(ifaces[0].count, "interface not requested.\n"); + ok(ifaces[1].count, "interface not requested.\n"); + ok(ifaces[2].count, "interface not requested.\n"); + todo_wine + ok(ifaces[3].count || broken(!ifaces[3].count /*vista*/), + "interface not requested.\n"); + ok(ifaces[4].count || broken(!ifaces[4].count /*vista*/), + "interface not requested.\n"); + + ok(!punkimpl->unknown, "Got %d unknown.\n", punkimpl->unknown); + HeapFree(GetProcessHeap(), 0, punkimpl); + + /* Test IShellItem */ + hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IShellItem, (void**)&psi); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) + { + IShellItem *psi2; + hres = pSHGetItemFromObject((IUnknown*)psi, &IID_IShellItem, (void**)&psi2); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) + { + todo_wine + ok(psi == psi2, "Different instances (%p != %p).\n", psi, psi2); + IShellItem_Release(psi2); + } + IShellItem_Release(psi); + } + + IShellFolder_Release(psfdesktop); +} + static void test_SHParseDisplayName(void) { LPITEMIDLIST pidl1, pidl2; @@ -3135,6 +3212,7 @@ START_TEST(shlfolder) test_SHGetNameFromIDList(); test_SHGetItemFromDataObject(); test_SHGetIDListFromObject(); + test_SHGetItemFromObject(); OleUninitialize(); } diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 43a2672..8a90f64 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -509,6 +509,7 @@ cpp_quote("HRESULT WINAPI SHCreateItemFromParsingName(PCWSTR pszPath, IBindCtx * cpp_quote("HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv);") cpp_quote("HRESULT WINAPI SHGetItemFromDataObject(IDataObject *pdtobj, DATAOBJ_GET_ITEM_FLAGS dwFlags, REFIID riid, void **ppv);") cpp_quote("HRESULT WINAPI SHGetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl);") +cpp_quote("HRESULT WINAPI SHGetItemFromObject(IUnknown *punk, REFIID riid, void **ppv);") /***************************************************************************** * IShellItemFilter interface

1 0

David Hedberg : shell32: Implement IShellItem::Compare.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: caffc9f55759718c04299cd169c1b82751f2bb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=caffc9f55759718c04299cd16… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 25 19:08:15 2010 +0200 shell32: Implement IShellItem::Compare. --- dlls/shell32/shellitem.c | 46 ++++++++- dlls/shell32/tests/shlfolder.c | 227 ++++++++++++++++++++++++++++++++++++++++ include/shobjidl.idl | 7 ++ 3 files changed, 278 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=caffc9f55759718c04299…

1 0

Max TenEyck Woodbury : ntdll: Setting FileAllInformation is not allowed.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: a17c7f0bd016f73989d92ad007c5dce0a156b14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17c7f0bd016f73989d92ad00… Author: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> Date: Sun Jul 25 16:13:37 2010 -0400 ntdll: Setting FileAllInformation is not allowed. --- dlls/ntdll/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0a6ee55..3dc5358 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2148,6 +2148,10 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, io->u.Status = STATUS_INVALID_PARAMETER_3; break; + case FileAllInformation: + io->u.Status = STATUS_INVALID_INFO_CLASS; + break; + default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED;

1 0

David Hedberg : include: Add CLSID_NamespaceTreeControl, CLSID_FileOpenDialog and CLSID_FileSaveDialog.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: d3846bb3adcca682c711666b012fe5990b9584db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3846bb3adcca682c711666b0… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jul 25 17:55:00 2010 +0200 include: Add CLSID_NamespaceTreeControl, CLSID_FileOpenDialog and CLSID_FileSaveDialog. --- include/shlguid.h | 2 -- include/shobjidl.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index bd75cc3..190d55e 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -165,8 +165,6 @@ DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); /* IExplorerBrowser */ -DEFINE_GUID(CLSID_ExplorerBrowser, 0x71F96385, 0xDDD6, 0x48D3, 0xA0, 0xC1, 0xAE, 0x06, 0xE8, 0xB0, 0x55, 0xFB); - DEFINE_GUID(EP_NavPane, 0xCB316B22, 0x25F7, 0x42B8, 0x8A, 0x09, 0x54, 0x0D, 0x23, 0xA4, 0x3C, 0x2F); DEFINE_GUID(EP_Commands,0xD9745868, 0xCA5F, 0x4A76, 0x91, 0xCD, 0xF5, 0xA1, 0x29, 0xFB, 0xB0, 0x76); DEFINE_GUID(EP_Commands_Organize, 0x72E81700, 0xE3EC, 0x4660, 0xBF, 0x24, 0x3C, 0x3B, 0x7B, 0x64, 0x88, 0x06); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 19dcd28..43a2672 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2801,3 +2801,46 @@ interface IFileDialogControlEvents : IUnknown [in] IFileDialogCustomize *pfdc, [in] DWORD dwIDCtl); } + +/***************************************************************************** + * ShellObjects typelibrary + */ +[ + uuid(50A7E9B1-70EF-11D1-B75A-00A0C90564FE), + lcid(0x0000), + version(1.0) +] +library ShellObjects +{ + [ + uuid(71F96385-DDD6-48D3-A0C1-AE06E8B055FB) + ] + coclass ExplorerBrowser + { + interface IExplorerBrowser; + } + + [ + uuid(DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7) + ] + coclass FileOpenDialog + { + interface IFileOpenDialog; + } + + [ + uuid(C0B4E2F3-BA21-4773-8DBA-335EC946EB8B) + ] + coclass FileSaveDialog + { + interface IFileSaveDialog; + } + + [ + uuid(AE054212-3535-4430-83ED-D501AA6680E6) + ] + coclass NamespaceTreeControl + { + interface INameSpaceTreeControl2; + } +}

1 0

Marcus Meissner : ddraw: Tighten up checks in DuplicateSurface (Coverity).
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: a58f31dd27654400eb75242912a2067f64bc6984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58f31dd27654400eb7524291… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jul 25 20:13:02 2010 +0200 ddraw: Tighten up checks in DuplicateSurface (Coverity). --- dlls/ddraw/ddraw.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e55ac5b..502cc84 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4052,11 +4052,11 @@ static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); - - src7 = src ? (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src) : NULL; + src7 = (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src); hr = ddraw7_DuplicateSurface((IDirectDraw7 *)ddraw_from_ddraw3(iface), src7, &dst7); - *dst = dst7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl : NULL; - + if (!SUCCEEDED(hr)) + return hr; + *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; return hr; } @@ -4067,11 +4067,11 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); - - src7 = src ? (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src) : NULL; + src7 = (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src); hr = ddraw7_DuplicateSurface((IDirectDraw7 *)ddraw_from_ddraw2(iface), src7, &dst7); - *dst = dst7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl : NULL; - + if (!SUCCEEDED(hr)) + return hr; + *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; return hr; } @@ -4082,11 +4082,11 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); - - src7 = src ? (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src) : NULL; + src7 = (IDirectDrawSurface7 *)surface_from_surface3((IDirectDrawSurface3 *)src); hr = ddraw7_DuplicateSurface((IDirectDraw7 *)ddraw_from_ddraw1(iface), src7, &dst7); - *dst = dst7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl : NULL; - + if (!SUCCEEDED(hr)) + return hr; + *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; return hr; }

1 0

Harry Jeffery : Fixed various spelling mistakes.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 4faf80280c5d62a0d5cc131af31940b6617ee1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4faf80280c5d62a0d5cc131af… Author: Harry Jeffery <harry101jeffery(a)googlemail.com> Date: Sun Jul 25 02:21:26 2010 +0100 Fixed various spelling mistakes. --- dlls/advapi32/tests/lsa.c | 2 +- dlls/gdiplus/graphicspath.c | 2 +- dlls/hhctrl.ocx/index.c | 2 +- dlls/kernel32/path.c | 2 +- dlls/msctf/context.c | 2 +- dlls/quartz/avisplit.c | 2 +- include/xinput.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index efb75bb..f26bdb1 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -249,7 +249,7 @@ static void test_LsaLookupNames2(void) if (!pLsaLookupNames2) { - win_skip("LsaLookupNames2 not avaliable\n"); + win_skip("LsaLookupNames2 not available\n"); return; } diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 60ddda1..02b5d9b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -364,7 +364,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *po } /* points [len_pt-2] and [0] are calculated - separetely to connect splines properly */ + separately to connect splines properly */ pts[0] = points[count-1]; pts[1] = points[0]; /* equals to start and end of a resulting path */ pts[2] = points[1]; diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index e9385c3..f119bbc 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -89,7 +89,7 @@ static void parse_index_obj_node_param(IndexItem *item, const char *text) }else if(!item->keyword && !strncasecmp("name", ptr, len)) { /* Some HTML Help index files use an additional "name" parameter * rather than the "keyword" parameter. In this case, the first - * occurance of the "name" parameter is the keyword. + * occurrence of the "name" parameter is the keyword. */ param = &item->keyword; }else if(!strncasecmp("name", ptr, len)) { diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 81467cb..294ea1c 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -162,7 +162,7 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) if (NtCreateKey( &Reboot, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) { - WARN("Error creating key for reboot managment [%s]\n", + WARN("Error creating key for reboot management [%s]\n", "SYSTEM\\CurrentControlSet\\Control\\Session Manager"); RtlFreeUnicodeString( &source_name ); RtlFreeUnicodeString( &dest_name ); diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 1b4e3cf..fbd7229 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -262,7 +262,7 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, if (!This->pITextStoreACP) { - FIXME("No ITextStoreACP avaliable\n"); + FIXME("No ITextStoreACP available\n"); *phrSession = E_FAIL; return E_FAIL; } diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6107880..5b0c7e0 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -899,7 +899,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) nMax = This->oldindex->cb / sizeof(This->oldindex->aIndex[0]); - /* Ok, maybe this is more of an excercise to see if I interpret everything correctly or not, but that is useful for now. */ + /* Ok, maybe this is more of an exercise to see if I interpret everything correctly or not, but that is useful for now. */ for (n = 0; n < nMax; ++n) { DWORD streamId = StreamFromFOURCC(This->oldindex->aIndex[n].dwChunkId); diff --git a/include/xinput.h b/include/xinput.h index 24fbdb3..426dfac 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -105,7 +105,7 @@ /* * Defines what type of abilities the type of joystick has - * DEVTYPE_GAMEPAD is avaliable for all joysticks, however + * DEVTYPE_GAMEPAD is available for all joysticks, however * there may be more specfic identifiers for other joysticks * which are being used. */

1 0

Thomas Mullaly : urlmon: Implemented canonicalization for reg-names.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 36d5856471bfe9acccd547f1f6e2b85d18f8f0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d5856471bfe9acccd547f1f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Jul 10 15:12:27 2010 -0400 urlmon: Implemented canonicalization for reg-names. --- dlls/urlmon/tests/uri.c | 74 +++++++++++++------------- dlls/urlmon/uri.c | 137 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 160 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36d5856471bfe9acccd54…

1 0

Thomas Mullaly : urlmon/tests: Added more test URIs for IPv6 canonicalization.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: ffe9f1aed0773ba7678230f72f589057aebb663e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe9f1aed0773ba7678230f72… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 8 16:42:12 2010 -0400 urlmon/tests: Added more test URIs for IPv6 canonicalization. --- dlls/urlmon/tests/uri.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fc5e5da..be4d464 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -2043,6 +2043,126 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* IPv4 addresses attached to IPv6 can be included in elisions. */ + { "http://[1:2:3:4:5:6:0.0.0.0]", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://[1:2:3:4:5:6::]/",S_OK,TRUE}, + {"[1:2:3:4:5:6::]",S_OK,TRUE}, + {"http://[1:2:3:4:5:6::]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"1:2:3:4:5:6::",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://[1:2:3:4:5:6:0.0.0.0]",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + }, + { + {Uri_HOST_IPV6,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* IPv4 addresses get normalized. */ + { "http://[::001.002.003.000]", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://[::1.2.3.0]/",S_OK,TRUE}, + {"[::1.2.3.0]",S_OK,TRUE}, + {"http://[::1.2.3.0]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"::1.2.3.0",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://[::001.002.003.000]",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + }, + { + {Uri_HOST_IPV6,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Windows doesn't do anything to IPv6's in unknown schemes. */ + { "zip://[0001:0:000:0004:0005:0006:001.002.003.000]", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"zip://[0001:0:000:0004:0005:0006:001.002.003.000]/",S_OK,TRUE}, + {"[0001:0:000:0004:0005:0006:001.002.003.000]",S_OK,TRUE}, + {"zip://[0001:0:000:0004:0005:0006:001.002.003.000]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"0001:0:000:0004:0005:0006:001.002.003.000",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"zip://[0001:0:000:0004:0005:0006:001.002.003.000]",S_OK,FALSE}, + {"zip",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + }, + { + {Uri_HOST_IPV6,S_OK,TRUE}, + {0,S_FALSE,TRUE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* IPv4 address is converted into 2 h16 components. */ + { "http://[ffff::192.222.111.32]", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME| + Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://[ffff::c0de:6f20]/",S_OK,TRUE}, + {"[ffff::c0de:6f20]",S_OK,TRUE}, + {"http://[ffff::c0de:6f20]/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"ffff::c0de:6f20",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,TRUE}, + {"/",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"http://[ffff::192.222.111.32]",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + }, + { + {Uri_HOST_IPV6,S_OK,TRUE}, + {80,S_OK,TRUE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } };

1 0

Thomas Mullaly : urlmon: Implemented canonicalization for IPv6 addresses.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: a0b27ab3e467f01dd83b95c16237223d4cecf26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b27ab3e467f01dd83b95c16… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Jul 3 11:52:59 2010 -0400 urlmon: Implemented canonicalization for IPv6 addresses. --- dlls/urlmon/tests/uri.c | 14 +- dlls/urlmon/uri.c | 319 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 325 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0b27ab3e467f01dd83b9…

1 0

Thomas Mullaly : urlmon/tests: Added more URI test cases.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 30824611b521eda98432906e07b2aeaf6b07e74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30824611b521eda98432906e0… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jun 30 21:31:22 2010 -0400 urlmon/tests: Added more URI test cases. --- dlls/urlmon/tests/uri.c | 498 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 498 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30824611b521eda984329…

1 0