October 2011 - Wine-Commits

Michael Stefaniuc : shell32: Basic COM cleanup for the IEnumIDList iface.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: b8638ef9ef0615bf2c8c75b00c131875aa3d9542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8638ef9ef0615bf2c8c75b00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:53:53 2011 +0200 shell32: Basic COM cleanup for the IEnumIDList iface. --- dlls/shell32/enumidlist.c | 72 ++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 2eb0ff8..02868db 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -45,7 +45,7 @@ typedef struct tagENUMLIST typedef struct { - const IEnumIDListVtbl *lpVtbl; + IEnumIDList IEnumIDList_iface; LONG ref; LPENUMLIST mpFirst; LPENUMLIST mpLast; @@ -180,6 +180,11 @@ static BOOL DeleteList(IEnumIDListImpl *This) return TRUE; } +static inline IEnumIDListImpl *impl_from_IEnumIDList(IEnumIDList *iface) +{ + return CONTAINING_RECORD(iface, IEnumIDListImpl, IEnumIDList_iface); +} + /************************************************************************** * IEnumIDList_Folder_Constructor * @@ -193,22 +198,22 @@ IEnumIDList * IEnumIDList_Constructor(void) if (lpeidl) { lpeidl->ref = 1; - lpeidl->lpVtbl = &eidlvt; + lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; } + else + return NULL; + TRACE("-- (%p)->()\n",lpeidl); - return (IEnumIDList*)lpeidl; + return &lpeidl->IEnumIDList_iface; } /************************************************************************** - * EnumIDList_QueryInterface + * IEnumIDList::QueryInterface */ -static HRESULT WINAPI IEnumIDList_fnQueryInterface( - IEnumIDList * iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI IEnumIDList_fnQueryInterface(IEnumIDList *iface, REFIID riid, void **ppvObj) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -232,12 +237,11 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface( } /****************************************************************************** - * IEnumIDList_fnAddRef + * IEnumIDList::AddRef */ -static ULONG WINAPI IEnumIDList_fnAddRef( - IEnumIDList * iface) +static ULONG WINAPI IEnumIDList_fnAddRef(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount - 1); @@ -245,12 +249,11 @@ static ULONG WINAPI IEnumIDList_fnAddRef( return refCount; } /****************************************************************************** - * IEnumIDList_fnRelease + * IEnumIDList::Release */ -static ULONG WINAPI IEnumIDList_fnRelease( - IEnumIDList * iface) +static ULONG WINAPI IEnumIDList_fnRelease(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount + 1); @@ -264,16 +267,13 @@ static ULONG WINAPI IEnumIDList_fnRelease( } /************************************************************************** - * IEnumIDList_fnNext + * IEnumIDList::Next */ -static HRESULT WINAPI IEnumIDList_fnNext( - IEnumIDList * iface, - ULONG celt, - LPITEMIDLIST * rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI IEnumIDList_fnNext(IEnumIDList *iface, ULONG celt, LPITEMIDLIST *rgelt, + ULONG *pceltFetched) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG i; HRESULT hr = S_OK; @@ -313,12 +313,11 @@ static HRESULT WINAPI IEnumIDList_fnNext( } /************************************************************************** -* IEnumIDList_fnSkip +* IEnumIDList::Skip */ -static HRESULT WINAPI IEnumIDList_fnSkip( - IEnumIDList * iface,ULONG celt) +static HRESULT WINAPI IEnumIDList_fnSkip(IEnumIDList *iface, ULONG celt) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); DWORD dwIndex; HRESULT hr = S_OK; @@ -335,32 +334,27 @@ static HRESULT WINAPI IEnumIDList_fnSkip( return hr; } /************************************************************************** -* IEnumIDList_fnReset +* IEnumIDList::Reset */ -static HRESULT WINAPI IEnumIDList_fnReset( - IEnumIDList * iface) +static HRESULT WINAPI IEnumIDList_fnReset(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)\n",This); This->mpCurrent = This->mpFirst; return S_OK; } /************************************************************************** -* IEnumIDList_fnClone +* IEnumIDList::Clone */ -static HRESULT WINAPI IEnumIDList_fnClone( - IEnumIDList * iface,LPENUMIDLIST * ppenum) +static HRESULT WINAPI IEnumIDList_fnClone(IEnumIDList *iface, IEnumIDList **ppenum) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum); return E_NOTIMPL; } -/************************************************************************** - * IEnumIDList_fnVTable - */ static const IEnumIDListVtbl eidlvt = { IEnumIDList_fnQueryInterface,

1 0

Alistair Leslie-Hughes : mpr: Remove DllCanUnloadNow and DllGetClassObject.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 81b67c5b1520f85a9085c248a09a916cab252c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b67c5b1520f85a9085c248a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 8 21:06:02 2011 +1100 mpr: Remove DllCanUnloadNow and DllGetClassObject. --- dlls/mpr/mpr.spec | 2 -- dlls/mpr/mpr_main.c | 8 -------- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index 5346615..2f93acc 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -23,8 +23,6 @@ 24 stdcall @(ptr) MPR_Free 25 stdcall @(ptr long) _MPR_25 -@ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject @ stdcall MultinetGetConnectionPerformanceA(ptr ptr) @ stdcall MultinetGetConnectionPerformanceW(ptr ptr) @ stdcall MultinetGetErrorTextA(long ptr long) diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c index 5ec6b22..7998bff 100644 --- a/dlls/mpr/mpr_main.c +++ b/dlls/mpr/mpr_main.c @@ -74,14 +74,6 @@ BOOL WINAPI _MPR_25( LPBYTE lpMem, INT len ) } /***************************************************************** - * DllCanUnloadNow [MPR.@] - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_OK; -} - -/***************************************************************** * DllMain [MPR.init] */ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Andrew Talbot : jscript: Mark a fall-through in a switch statement.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 30cab39056cedfe9112439cb693f1ec9b014b9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cab39056cedfe9112439cb6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 20:10:15 2011 +0100 jscript: Mark a fall-through in a switch statement. --- dlls/jscript/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0d584f0..e40f370 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -664,6 +664,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc switch(wFlags) { case DISPATCH_METHOD|DISPATCH_PROPERTYGET: wFlags = DISPATCH_METHOD; + /* fall through */ case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: hres = invoke_prop_func(This, This, prop, wFlags, pdp, pvarRes, &jsexcept, pspCaller);

1 0

Charles Davis : server: Use syscall(2) instead of inline assembly on Mac OS , too.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: a51aaf898cc95bc226f68b1d5a31137e87a3344b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51aaf898cc95bc226f68b1d5… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Oct 8 12:08:18 2011 -0600 server: Use syscall(2) instead of inline assembly on Mac OS, too. --- server/mach.c | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-) diff --git a/server/mach.c b/server/mach.c index f890321..03c88ec 100644 --- a/server/mach.c +++ b/server/mach.c @@ -29,6 +29,9 @@ #include <stdarg.h> #include <sys/types.h> #include <unistd.h> +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -47,21 +50,6 @@ #include <mach/thread_act.h> #include <servers/bootstrap.h> -#if defined(__APPLE__) && defined(__i386__) -extern int pthread_kill_syscall( mach_port_t, int ); -__ASM_GLOBAL_FUNC( pthread_kill_syscall, - "movl $328,%eax\n\t" /* SYS___pthread_kill */ - "int $0x80\n\t" - "jae 1f\n\t" - "negl %eax\n" - "1:\tret" ) -#else -static inline int pthread_kill_syscall( mach_port_t, int ) -{ - return -ENOSYS; -} -#endif - static mach_port_t server_mach_port; void sigchld_callback(void) @@ -268,11 +256,7 @@ int send_thread_signal( struct thread *thread, int sig ) if (!mach_port_extract_right( process_port, thread->unix_tid, MACH_MSG_TYPE_COPY_SEND, &port, &type )) { - if ((ret = pthread_kill_syscall( port, sig )) < 0) - { - errno = -ret; - ret = -1; - } + ret = syscall( SYS___pthread_kill, port, sig ); mach_port_deallocate( mach_task_self(), port ); } else errno = ESRCH;

1 0

Thomas Mullaly : urlmon: Added custom security manager support to MapUrlToZoneEx2.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 8fc8823d5c651e82acc5342aff19d8aeb6e04a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc8823d5c651e82acc5342af… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Sep 8 17:59:59 2011 -0400 urlmon: Added custom security manager support to MapUrlToZoneEx2. --- dlls/urlmon/sec_mgr.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 314605e..0c7170c 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1070,6 +1070,30 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2 TRACE("(%p)->(%p %p %08x %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); + if(This->custom_manager) { + HRESULT hres; + IInternetSecurityManagerEx2 *sec_mgr2; + + hres = IInternetSecurityManager_QueryInterface(This->custom_manager, &IID_IInternetSecurityManagerEx2, + (void**)&sec_mgr2); + if(SUCCEEDED(hres)) { + hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); + IInternetSecurityManagerEx2_Release(sec_mgr2); + } else { + BSTR url; + + hres = IUri_GetDisplayUri(pUri, &url); + if(FAILED(hres)) + return hres; + + hres = IInternetSecurityManager_MapUrlToZone(This->custom_manager, url, pdwZone, dwFlags); + SysFreeString(url); + } + + if(hres != INET_E_DEFAULT_ACTION) + return hres; + } + if(!pdwZone) return E_INVALIDARG;

1 0

Charles Davis : winemenubuilder: Don't define crc16() on Mac OS.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: db7383d969806b4259a683c5eedc915fcd2f5c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7383d969806b4259a683c5e… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Oct 8 14:34:17 2011 -0600 winemenubuilder: Don't define crc16() on Mac OS. --- programs/winemenubuilder/winemenubuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index b983a8d..755e0b2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -199,6 +199,7 @@ static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); /* Utility routines */ +#ifndef __APPLE__ static unsigned short crc16(const char* string) { unsigned short crc = 0; @@ -217,6 +218,7 @@ static unsigned short crc16(const char* string) } return crc; } +#endif static char *strdupA( const char *str ) {

1 0

Andrew Talbot : dsound: Remove unneeded address-of operator from function name.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 1f1a97a9b539753664f90ef014afec3a615982d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1a97a9b539753664f90ef01… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 8 21:15:37 2011 +0100 dsound: Remove unneeded address-of operator from function name. --- dlls/dsound/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 77dffe6..77ce7b6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1048,7 +1048,7 @@ static HRESULT DirectSoundCaptureDevice_Initialize( } IAudioClient_Release(client); - device->timerID = DSOUND_create_timer(&DSOUND_capture_timer, (DWORD_PTR)device); + device->timerID = DSOUND_create_timer(DSOUND_capture_timer, (DWORD_PTR)device); list_add_tail(&DSOUND_capturers, &device->entry);

1 0

Thomas Mullaly : urlmon: Added basic GetSecurityIdEx2 implementation.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 269fe5a4d433aae10a815b32fa7e5e8dd2b23d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269fe5a4d433aae10a815b32f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 12 22:01:02 2011 -0400 urlmon: Added basic GetSecurityIdEx2 implementation. --- dlls/urlmon/sec_mgr.c | 160 ++++++++++++++++++++++++++++++------------ dlls/urlmon/tests/sec_mgr.c | 43 ++++++------ 2 files changed, 137 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=269fe5a4d433aae10a815…

1 0

Thomas Mullaly : urlmon/tests: Added tests for GetSecurityIdEx2.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 714941f8a8af3118a4ac2749d472c556965a20d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714941f8a8af3118a4ac2749d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 12 18:38:45 2011 -0400 urlmon/tests: Added tests for GetSecurityIdEx2. --- dlls/urlmon/tests/sec_mgr.c | 97 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 86 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 869cc35..54b01cd 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -102,6 +102,7 @@ static const WCHAR url11[] = {'f','i','l','e',':','/','/','c',':','/','I','n','d 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 url15[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','c','o','m','.','u','k',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -116,6 +117,7 @@ static const char *szZoneMapDomainsKey = "Software\\Microsoft\\Windows\\CurrentV static const char *szInternetSettingsKey = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; +static const BYTE secid2[] = {'*',':','i','n','d','e','x','.','h','t','m',3,0,0,0}; static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', '.','w','i','n','e','t','e','s','t',3,0,0,0}; static const BYTE secid6[] = {'a','b','o','u','t',':','b','l','a','n','k',3,0,0,0}; @@ -127,6 +129,8 @@ 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}; +static const BYTE secid13[] = {'h','t','t','p',':','c','o','m','.','u','k',3,0,0,0}; +static const BYTE secid13_2[] = {'h','t','t','p',':','g','o','o','g','l','e','.','c','o','m','.','u','k',3,0,0,0}; static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; @@ -1745,34 +1749,45 @@ static void test_InternetGetSecurityUrlEx_Pluggable(void) if(uri) IUri_Release(uri); } +static const BYTE secidex2_1[] = {'z','i','p',':','/','/','t','e','s','t','i','n','g','.','c','o','m','/',3,0,0,0}; +static const BYTE secidex2_2[] = {'z','i','p',':','t','e','s','t','i','n','g','.','c','o','m',3,0,0,0}; + static const struct { const char *uri; DWORD create_flags; HRESULT map_hres; DWORD zone; BOOL map_todo; + const BYTE *secid; + DWORD secid_size; + HRESULT secid_hres; + BOOL secid_todo; } sec_mgr_ex2_tests[] = { - {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE}, - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, - {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE}, - {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET}, - {"about:blank",0,0,URLZONE_INTERNET}, - {"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}, - {"http:google.com",0,S_OK,URLZONE_INVALID}, - {"http:/google.com",0,S_OK,URLZONE_INVALID} + {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE,FALSE,secid1,sizeof(secid1),S_OK,TRUE}, + {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,FALSE,secid2,sizeof(secid2),S_OK,TRUE}, + {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE,FALSE,secid1,sizeof(secid1),S_OK,TRUE}, + {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET,FALSE,secid5,sizeof(secid5),S_OK,TRUE}, + {"about:blank",0,0,URLZONE_INTERNET,FALSE,secid6,sizeof(secid6),S_OK,TRUE}, + {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET,FALSE,secid7,sizeof(secid7),S_OK,TRUE}, + {"/file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,FALSE,NULL,0,E_INVALIDARG,TRUE}, + {"zip://testing.com/",0,0,URLZONE_INTERNET,FALSE,secidex2_1,sizeof(secidex2_1),S_OK,TRUE}, + {"zip:testing.com",0,0,URLZONE_INTERNET,FALSE,secidex2_2,sizeof(secidex2_2),S_OK,TRUE}, + {"http:google.com",0,S_OK,URLZONE_INVALID,FALSE,NULL,0,E_INVALIDARG,TRUE}, + {"http:/google.com",0,S_OK,URLZONE_INVALID,FALSE,NULL,0,E_INVALIDARG,TRUE} }; static void test_SecurityManagerEx2(void) { HRESULT hres; DWORD i, zone; + BYTE buf[512]; + DWORD buf_size = sizeof(buf); IInternetSecurityManager *sec_mgr; IInternetSecurityManagerEx2 *sec_mgr2; IUri *uri = NULL; + static const WCHAR domainW[] = {'c','o','m','.','u','k',0}; + if(!pCreateUri) { win_skip("Skipping SecurityManagerEx2, IE is too old\n"); return; @@ -1792,12 +1807,24 @@ static void test_SecurityManagerEx2(void) ok(hres == E_INVALIDARG, "MapUrlToZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); ok(zone == URLZONE_INVALID, "zone was %d\n", zone); + hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, NULL, buf, &buf_size, 0); + todo_wine ok(hres == E_INVALIDARG, "GetSecurityIdEx2 returned %08x, expected E_INVALIDARG\n", hres); + ok(buf_size == sizeof(buf), "buf_size was %d\n", buf_size); + hres = pCreateUri(url5, 0, 0, &uri); ok(hres == S_OK, "CreateUri failed: %08x\n", hres); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, NULL, 0, NULL, NULL); ok(hres == E_INVALIDARG, "MapToUrlZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + buf_size = sizeof(buf); + hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, NULL, &buf_size, 0); + todo_wine ok(hres == E_INVALIDARG || broken(hres == S_OK), "GetSecurityIdEx2 failed: %08x\n", hres); + ok(buf_size == sizeof(buf), "bug_size was %d\n", buf_size); + + hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, NULL, 0); + todo_wine ok(hres == E_INVALIDARG, "GetSecurityIdEx2 returned %08x, expected E_INVALIDARG\n", hres); + IUri_Release(uri); for(i = 0; i < sizeof(sec_mgr_ex2_tests)/sizeof(sec_mgr_ex2_tests[0]); ++i) { @@ -1824,10 +1851,58 @@ static void test_SecurityManagerEx2(void) zone, sec_mgr_ex2_tests[i].uri); } + buf_size = sizeof(buf); + memset(buf, 0xf0, buf_size); + + hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0); + if(sec_mgr_ex2_tests[i].secid_todo) { + todo_wine + ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", + hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); + if(sec_mgr_ex2_tests[i].secid) { + todo_wine { + ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n", + buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri); + ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n", + sec_mgr_ex2_tests[i].uri); + } + } + } else { + ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", + hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); + if(sec_mgr_ex2_tests[i].secid) { + ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n", + buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri); + ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n", + sec_mgr_ex2_tests[i].uri); + } + } + heap_free(uriW); IUri_Release(uri); } + hres = pCreateUri(url15, 0, 0, &uri); + ok(hres == S_OK, "CreateUri failed: %08x\n", hres); + + buf_size = sizeof(buf); + memset(buf, 0xf0, buf_size); + + hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, (DWORD_PTR)domainW); + todo_wine ok(hres == S_OK, "GetSecurityIdEx2 failed: %08x\n", hres); + todo_wine ok(buf_size == sizeof(secid13), "buf_size was %d\n", buf_size); + todo_wine ok(!memcmp(buf, secid13, sizeof(secid13)), "Got wrong secid\n"); + + buf_size = sizeof(buf); + memset(buf, 0xf0, buf_size); + + hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0); + todo_wine ok(hres == S_OK, "GetSecurityIdEx2 failed: %08x\n", hres); + todo_wine ok(buf_size == sizeof(secid13_2), "buf_size was %d\n", buf_size); + todo_wine ok(!memcmp(buf, secid13_2, sizeof(secid13_2)), "Got wrong secid\n"); + + IUri_Release(uri); + IInternetSecurityManagerEx2_Release(sec_mgr2); IInternetSecurityManager_Release(sec_mgr); }

1 0

Thomas Mullaly : urlmon: Improved IUri support for wildcard URLs.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 2784e1acedf31506fc402dd71daf0b455718d2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2784e1acedf31506fc402dd71… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 24 17:56:22 2011 -0400 urlmon: Improved IUri support for wildcard URLs. --- dlls/urlmon/tests/uri.c | 25 +++++++++++++++++++++++++ dlls/urlmon/uri.c | 18 ++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index d08dd5b..3483878 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4291,6 +4291,31 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_JAVASCRIPT,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "*://google.com", 0, S_OK, FALSE, + { + {"*:google.com/",S_OK,FALSE}, + {"google.com",S_OK}, + {"*:google.com/",S_OK,FALSE}, + {"google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,FALSE}, + {"/",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"*://google.com",S_OK,FALSE}, + {"*",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_WILDCARD,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 5dfa8b8..2b0b9ad 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -155,6 +155,7 @@ typedef struct { BOOL has_implicit_scheme; BOOL has_implicit_ip; UINT implicit_ipv4; + BOOL must_have_path; const WCHAR *scheme; DWORD scheme_len; @@ -1938,10 +1939,7 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; if(is_path_delim(**ptr)) { - if(data->scheme_type == URL_SCHEME_WILDCARD) { - /* Wildcard schemes don't get a '/' attached if their path is - * empty. - */ + if(data->scheme_type == URL_SCHEME_WILDCARD && !data->must_have_path) { data->path = NULL; data->path_len = 0; } else if(!(flags & Uri_CREATE_NO_CANONICALIZE)) { @@ -2068,6 +2066,8 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { const WCHAR *start = *ptr; + data->must_have_path = FALSE; + /* For javascript: URIs, simply set everything as a path */ if(data->scheme_type == URL_SCHEME_JAVASCRIPT) { data->path = *ptr; @@ -2087,6 +2087,13 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { TRACE("(%p %p %x): Treating URI as an hierarchical URI.\n", ptr, data, flags); data->is_opaque = FALSE; + if(data->scheme_type == URL_SCHEME_WILDCARD && !data->has_implicit_scheme) { + if(**ptr == '/' && *(*ptr+1) == '/') { + data->must_have_path = TRUE; + *ptr += 2; + } + } + /* TODO: Handle hierarchical URI's, parse authority then parse the path. */ if(!parse_authority(ptr, data, flags)) return FALSE; @@ -3184,6 +3191,9 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, */ if((data->is_relative && (data->host || data->has_port)) || (!data->is_relative && data->scheme_type != URL_SCHEME_WILDCARD)) { + if(data->scheme_type == URL_SCHEME_WILDCARD) + FIXME("Here\n"); + if(!computeOnly) { INT pos = uri->canon_len;

1 0