November 2010 - Wine-commits

Jacek Caban : mshtml: Use IUriBuilder for IURI::SetQuery implementation.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 98f5bc384b485ef19d6fdb2ff353c64122f0521b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f5bc384b485ef19d6fdb2ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 12:31:41 2010 +0100 mshtml: Use IUriBuilder for IURI::SetQuery implementation. --- dlls/mshtml/nsio.c | 137 +++++++++++++++++++++++++++++---------------------- 1 files changed, 78 insertions(+), 59 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 578f1b5..91a4659 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -63,8 +63,9 @@ struct nsWineURI { NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; - LPWSTR wine_url; + BSTR wine_url; IUri *uri; + IUriBuilder *uri_builder; BOOL is_doc_uri; }; @@ -248,12 +249,12 @@ HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) TRACE("(%p)->(%s)\n", This, debugstr_w(url)); if(url) { - WCHAR *new_url; + BSTR new_url; - new_url = heap_strdupW(url); + new_url = SysAllocString(url); if(!new_url) return E_OUTOFMEMORY; - heap_free(This->wine_url); + SysFreeString(This->wine_url); This->wine_url = new_url; }else { heap_free(This->wine_url); @@ -1529,19 +1530,74 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { static BOOL ensure_uri(nsWineURI *This) { - if(!This->uri) { + HRESULT hres; + + if(This->uri) + return TRUE; + + if(This->uri_builder) { + hres = IUriBuilder_CreateUriSimple(This->uri_builder, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUriSimple failed: %08x\n", hres); + return FALSE; + } + + return TRUE; + } + + hres = CreateUri(This->wine_url, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return FALSE; + } + + return TRUE; +} + +static void invalidate_uri(nsWineURI *This) +{ + if(This->uri) { + IUri_Release(This->uri); + This->uri = NULL; + } +} + +static BOOL ensure_uri_builder(nsWineURI *This) +{ + if(!This->uri_builder) { HRESULT hres; - hres = CreateUri(This->wine_url, 0, 0, &This->uri); + if(!ensure_uri(This)) + return FALSE; + + hres = CreateIUriBuilder(This->uri, 0, 0, &This->uri_builder); if(FAILED(hres)) { - WARN("CreateUri failed: %08x\n", hres); + WARN("CreateIUriBulder failed: %08x\n", hres); return FALSE; } } + invalidate_uri(This); return TRUE; } +/* Temporary helper */ +static void sync_wine_url(nsWineURI *This) +{ + BSTR new_url; + HRESULT hres; + + if(!ensure_uri(This)) + return; + + hres = IUri_GetDisplayUri(This->uri, &new_url); + if(FAILED(hres)) + return; + + SysFreeString(This->wine_url); + This->wine_url = new_url; +} + static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *ret) { char *vala; @@ -1568,14 +1624,6 @@ static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *r return NS_OK; } -static void invalidate_uri(nsWineURI *This) -{ - if(This->uri) { - IUri_Release(This->uri); - This->uri = NULL; - } -} - #define NSURI_THIS(iface) DEFINE_THIS(nsWineURI, IURL, iface) static nsresult NSAPI nsURI_QueryInterface(nsIURL *iface, nsIIDRef riid, void **result) @@ -1635,7 +1683,7 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) nsIURI_Release(This->nsuri); if(This->uri) IUri_Release(This->uri); - heap_free(This->wine_url); + SysFreeString(This->wine_url); heap_free(This); } @@ -2189,55 +2237,26 @@ static nsresult NSAPI nsURL_GetQuery(nsIURL *iface, nsACString *aQuery) static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) { nsWineURI *This = NSURI_THIS(iface); - const WCHAR *ptr1, *ptr2; - const char *query; - WCHAR *new_url, *ptr; - DWORD len, size; + const char *querya; + WCHAR *query; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aQuery)); - invalidate_uri(This); - - if(This->nsurl) - nsIURL_SetQuery(This->nsurl, aQuery); - - if(!This->wine_url) - return NS_OK; - - nsACString_GetData(aQuery, &query); - size = len = MultiByteToWideChar(CP_ACP, 0, query, -1, NULL, 0); - ptr1 = strchrW(This->wine_url, '?'); - if(ptr1) { - size += ptr1-This->wine_url; - ptr2 = strchrW(ptr1, '#'); - if(ptr2) - size += strlenW(ptr2); - }else { - ptr1 = This->wine_url + strlenW(This->wine_url); - ptr2 = NULL; - size += strlenW(This->wine_url); - } - - if(*query) - size++; + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - new_url = heap_alloc(size*sizeof(WCHAR)); - memcpy(new_url, This->wine_url, (ptr1-This->wine_url)*sizeof(WCHAR)); - ptr = new_url + (ptr1-This->wine_url); - if(*query) { - *ptr++ = '?'; - MultiByteToWideChar(CP_ACP, 0, query, -1, ptr, len); - ptr += len-1; - } - if(ptr2) - strcpyW(ptr, ptr2); - else - *ptr = 0; + nsACString_GetData(aQuery, &querya); + query = heap_strdupAtoW(querya); + if(!query) + return NS_ERROR_OUT_OF_MEMORY; - TRACE("setting %s\n", debugstr_w(new_url)); + hres = IUriBuilder_SetQuery(This->uri_builder, query); + heap_free(query); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; - heap_free(This->wine_url); - This->wine_url = new_url; + sync_wine_url(This); return NS_OK; }

1 0

Alexandre Julliard : atl: Move atliface.idl to the global includes.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 32ad286d06998b3dfa09bb7a5bc2be21d9c633b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ad286d06998b3dfa09bb7a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 11:47:19 2010 +0100 atl: Move atliface.idl to the global includes. --- .gitignore | 2 +- dlls/atl/Makefile.in | 3 --- include/Makefile.in | 1 + {dlls/atl => include}/atliface.idl | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a340baf..6085e68 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,6 @@ dlls/actxprxy/actxprxy_urlhist.h dlls/actxprxy/actxprxy_urlhist_p.c dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c -dlls/atl/atliface.h dlls/d3dcompiler_43/asmshader.tab.c dlls/d3dcompiler_43/asmshader.tab.h dlls/d3dcompiler_43/asmshader.yy.c @@ -150,6 +149,7 @@ include/activscp.h include/amstream.h include/amvideo.h include/asptlb.h +include/atliface.h include/audioclient.h include/audiopolicy.h include/austream.h diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 05de265..a631ed8 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -9,7 +9,4 @@ C_SRCS = \ RC_SRCS = rsrc.rc -IDL_H_SRCS = \ - atliface.idl - @MAKE_DLL_RULES@ diff --git a/include/Makefile.in b/include/Makefile.in index 3f4f9de..e7c75ee 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -9,6 +9,7 @@ PUBLIC_IDL_H_SRCS = \ amstream.idl \ amvideo.idl \ asptlb.idl \ + atliface.idl \ audioclient.idl \ audiopolicy.idl \ austream.idl \ diff --git a/dlls/atl/atliface.idl b/include/atliface.idl similarity index 98% rename from dlls/atl/atliface.idl rename to include/atliface.idl index ef3e5e5..f71bc3a 100644 --- a/dlls/atl/atliface.idl +++ b/include/atliface.idl @@ -19,7 +19,7 @@ import "ocidl.idl"; cpp_quote("#ifdef ATL_INITGUID") -cpp_quote("#include \"initguid.h\"") +cpp_quote("#include <initguid.h>") cpp_quote("#endif") [

1 0

Alexandre Julliard : atl: Fix the name of the Registrar class id.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 9c4432f69d91007d02c52c50ba565ca795f44765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4432f69d91007d02c52c50b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 11:49:44 2010 +0100 atl: Fix the name of the Registrar class id. --- dlls/atl/atl.rgs | 4 ++-- dlls/atl/registrar.c | 10 +++++----- include/atliface.idl | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl.rgs b/dlls/atl/atl.rgs index 8b1d476..ee43249 100644 --- a/dlls/atl/atl.rgs +++ b/dlls/atl/atl.rgs @@ -2,10 +2,10 @@ HKCR { ATL.Registrar = s 'Registrar Class' { - CLSID = s '%CLSID_ATLRegistrar%' + CLSID = s '%CLSID_Registrar%' } NoRemove CLSID { - ForceRemove '%CLSID_ATLRegistrar%' = s 'Registrar Class' + ForceRemove '%CLSID_Registrar%' = s 'Registrar Class' { ProgID = s 'ATL.Registrar' InprocServer32 = s '%MODULE%' diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 7076e35..a54860f 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -743,7 +743,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) { TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); - if(IsEqualGUID(&CLSID_ATLRegistrar, clsid)) { + if(IsEqualGUID(&CLSID_Registrar, clsid)) { *ppvObject = &RegistrarCF; return S_OK; } @@ -787,14 +787,14 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, static HRESULT do_register_server(BOOL do_register) { - static const WCHAR CLSID_ATLRegistrarW[] = - {'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0}; + static const WCHAR CLSID_RegistrarW[] = + {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0}; static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; WCHAR clsid_str[40]; - const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_ATLRegistrarW, clsid_str}, {NULL,NULL}}; + const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}}; - StringFromGUID2(&CLSID_ATLRegistrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); + StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); } diff --git a/include/atliface.idl b/include/atliface.idl index f71bc3a..887338f 100644 --- a/include/atliface.idl +++ b/include/atliface.idl @@ -68,7 +68,7 @@ interface IRegistrar : IUnknown [in] LPCOLESTR szType); } -cpp_quote("DEFINE_GUID(CLSID_ATLRegistrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);") +cpp_quote("DEFINE_GUID(CLSID_Registrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);") cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);") cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);")

1 0

Alexandre Julliard : atl: Fix the Registrar class factory implementation.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 696b83259f3fdf0e767d8da2c204537028cf7992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696b83259f3fdf0e767d8da2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 11:55:28 2010 +0100 atl: Fix the Registrar class factory implementation. --- dlls/atl/registrar.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index a54860f..c9d7e6c 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -687,8 +687,9 @@ static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID ri { TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IRegistrar, riid)) { + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { *ppvObject = iface; + IClassFactory_AddRef( iface ); return S_OK; } @@ -743,10 +744,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) { TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); - if(IsEqualGUID(&CLSID_Registrar, clsid)) { - *ppvObject = &RegistrarCF; - return S_OK; - } + if(IsEqualGUID(&CLSID_Registrar, clsid)) + return IClassFactory_QueryInterface( &RegistrarCF, riid, ppvObject ); FIXME("Not supported class %s\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE;

1 0

André Hentschel : d3d9: Improve CheckDeviceState stub to run Firefox 4 Beta 7.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: ce0e1f07dc597fd157b914baa70588423b7eb6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0e1f07dc597fd157b914baa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 11 20:35:20 2010 +0100 d3d9: Improve CheckDeviceState stub to run Firefox 4 Beta 7. --- dlls/d3d9/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b097ece..1c2aa99 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2790,9 +2790,14 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDev static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) { - FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); + static int i; - return WINED3DERR_INVALIDCALL; + TRACE("iface %p, dst_window %p stub!\n", iface, dst_window); + + if (!i++) + FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); + + return WINED3D_OK; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevice9Ex *iface,

1 0

Andrew Bogott : shdocvw: Implement UniformResourceLocatorW_InvokeCommand and UniformResourceLocatorA_InvokeCommand for the default verb .
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 44f929fc25ade04e0f38203fa7c8f6c9ca8f0de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f929fc25ade04e0f38203fa… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Thu Nov 4 17:25:09 2010 -0500 shdocvw: Implement UniformResourceLocatorW_InvokeCommand and UniformResourceLocatorA_InvokeCommand for the default verb. --- dlls/shdocvw/intshcut.c | 67 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 8c17873..2f1cad8 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -32,6 +32,8 @@ #include "objidl.h" #include "shobjidl.h" #include "intshcut.h" +#include "shellapi.h" +#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -237,8 +239,47 @@ static HRESULT WINAPI UniformResourceLocatorW_GetUrl(IUniformResourceLocatorW *u static HRESULT WINAPI UniformResourceLocatorW_InvokeCommand(IUniformResourceLocatorW *url, PURLINVOKECOMMANDINFOW pCommandInfo) { - FIXME("(%p, %p): stub\n", url, pCommandInfo); - return E_NOTIMPL; + InternetShortcut *This = impl_from_IUniformResourceLocatorW(url); + WCHAR app[64]; + HKEY hkey; + static const WCHAR wszURLProtocol[] = {'U','R','L',' ','P','r','o','t','o','c','o','l',0}; + SHELLEXECUTEINFOW sei; + DWORD res, type; + HRESULT hres; + + TRACE("%p %p\n", This, pCommandInfo ); + + if (pCommandInfo->dwcbSize < sizeof (URLINVOKECOMMANDINFOW)) + return E_INVALIDARG; + + if (pCommandInfo->dwFlags != IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB) + { + FIXME("(%p, %p): non-default verbs not implemented\n", url, pCommandInfo); + return E_NOTIMPL; + } + + hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, app, sizeof(app)/sizeof(WCHAR), NULL, 0); + if(FAILED(hres)) + return E_FAIL; + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, app, &hkey); + if(res != ERROR_SUCCESS) + return E_FAIL; + + res = RegQueryValueExW(hkey, wszURLProtocol, NULL, &type, NULL, NULL); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) + return E_FAIL; + + memset(&sei, 0, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.lpFile = This->url; + sei.nShow = SW_SHOW; + + if( ShellExecuteExW(&sei) ) + return S_OK; + else + return E_FAIL; } static HRESULT WINAPI UniformResourceLocatorA_QueryInterface(IUniformResourceLocatorA *url, REFIID riid, PVOID *ppvObject) @@ -299,8 +340,26 @@ static HRESULT WINAPI UniformResourceLocatorA_GetUrl(IUniformResourceLocatorA *u static HRESULT WINAPI UniformResourceLocatorA_InvokeCommand(IUniformResourceLocatorA *url, PURLINVOKECOMMANDINFOA pCommandInfo) { - FIXME("(%p, %p): stub\n", url, pCommandInfo); - return E_NOTIMPL; + URLINVOKECOMMANDINFOW wideCommandInfo; + int len; + WCHAR *wideVerb; + HRESULT res; + InternetShortcut *This = impl_from_IUniformResourceLocatorA(url); + + wideCommandInfo.dwcbSize = sizeof wideCommandInfo; + wideCommandInfo.dwFlags = pCommandInfo->dwFlags; + wideCommandInfo.hwndParent = pCommandInfo->hwndParent; + + len = MultiByteToWideChar(CP_ACP, 0, pCommandInfo->pcszVerb, -1, NULL, 0); + wideVerb = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pCommandInfo->pcszVerb, -1, wideVerb, len); + + wideCommandInfo.pcszVerb = wideVerb; + + res = UniformResourceLocatorW_InvokeCommand(&This->uniformResourceLocatorW, &wideCommandInfo); + heap_free(wideVerb); + + return res; } static HRESULT WINAPI PersistFile_QueryInterface(IPersistFile *pFile, REFIID riid, PVOID *ppvObject)

1 0

Andrew Bogott : shdocvw: Move OpenURL() from shdocvw_main.c into intshcut.c , and implement it.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: be01cdb6bf6306119cf3cde93316374cd8a1059e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be01cdb6bf6306119cf3cde93… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Thu Nov 4 17:26:34 2010 -0500 shdocvw: Move OpenURL() from shdocvw_main.c into intshcut.c, and implement it. --- dlls/shdocvw/intshcut.c | 62 +++++++++++++++++++++++++++++++++++++++--- dlls/shdocvw/shdocvw_main.c | 8 ----- 2 files changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 2f1cad8..202a523 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -27,6 +27,9 @@ * The installer for the Zuma Deluxe Popcap game is good for testing. */ +#include <stdarg.h> +#include <stdio.h> + #include "wine/debug.h" #include "shdocvw.h" #include "objidl.h" @@ -34,6 +37,7 @@ #include "intshcut.h" #include "shellapi.h" #include "winreg.h" +#include "shlwapi.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -565,6 +569,22 @@ static const IPersistFileVtbl persistFileVtbl = { PersistFile_GetCurFile }; +static InternetShortcut *create_shortcut(void) +{ + InternetShortcut *newshortcut; + + newshortcut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(InternetShortcut)); + if (newshortcut) + { + newshortcut->uniformResourceLocatorA.lpVtbl = &uniformResourceLocatorAVtbl; + newshortcut->uniformResourceLocatorW.lpVtbl = &uniformResourceLocatorWVtbl; + newshortcut->persistFile.lpVtbl = &persistFileVtbl; + newshortcut->refCount = 0; + } + + return newshortcut; +} + HRESULT InternetShortcut_Create(IUnknown *pOuter, REFIID riid, void **ppv) { InternetShortcut *This; @@ -577,13 +597,9 @@ HRESULT InternetShortcut_Create(IUnknown *pOuter, REFIID riid, void **ppv) if(pOuter) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(InternetShortcut)); + This = create_shortcut(); if (This) { - This->uniformResourceLocatorA.lpVtbl = &uniformResourceLocatorAVtbl; - This->uniformResourceLocatorW.lpVtbl = &uniformResourceLocatorWVtbl; - This->persistFile.lpVtbl = &persistFileVtbl; - This->refCount = 0; hr = Unknown_QueryInterface(This, riid, ppv); if (SUCCEEDED(hr)) SHDOCVW_LockModule(); @@ -594,3 +610,39 @@ HRESULT InternetShortcut_Create(IUnknown *pOuter, REFIID riid, void **ppv) else return E_OUTOFMEMORY; } + + +/********************************************************************** + * OpenURL (SHDOCVW.@) + */ +void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) +{ + InternetShortcut *shortcut; + WCHAR* urlfilepath = NULL; + shortcut = create_shortcut(); + + if (shortcut) + { + int len; + + len = MultiByteToWideChar(CP_ACP, 0, lpcstrUrl, -1, NULL, 0); + urlfilepath = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpcstrUrl, -1, urlfilepath, len); + + if(SUCCEEDED(IPersistFile_Load(&shortcut->persistFile, urlfilepath, 0))) + { + URLINVOKECOMMANDINFOW ici; + + memset( &ici, 0, sizeof ici ); + ici.dwcbSize = sizeof ici; + ici.dwFlags = IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB; + ici.hwndParent = hWnd; + + if FAILED(UniformResourceLocatorW_InvokeCommand(&shortcut->uniformResourceLocatorW, (PURLINVOKECOMMANDINFOW) &ici)) + TRACE("failed to open URL: %s\n.",debugstr_a(lpcstrUrl)); + } + + heap_free(shortcut); + heap_free(urlfilepath); + } +} diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index f0fa0f6..a0070b4 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -219,14 +219,6 @@ DWORD WINAPI SetQueryNetSessionCount(DWORD arg) } /********************************************************************** - * OpenURL (SHDOCVW.@) - */ -void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) -{ - FIXME("%p %p %s %d\n", hWnd, hInst, debugstr_a(lpcstrUrl), nShowCmd); -} - -/********************************************************************** * Some forwards (by ordinal) to SHLWAPI */

1 0

Eric Pouech : msvcrt: Use macro for parameters validation itoa_s ( and update the tests as well).
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 9df3f06cb94617474532d99e3e5aa4d665a615c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df3f06cb94617474532d99e3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 11 22:30:25 2010 +0100 msvcrt: Use macro for parameters validation itoa_s (and update the tests as well). --- dlls/msvcr90/tests/msvcr90.c | 105 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/string.c | 10 ++-- dlls/msvcrt/tests/string.c | 16 ++++++ 3 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 5a60871..6b0363f 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -63,6 +63,7 @@ static char **p_sys_errlist; static char** (__cdecl *p__sys_errlist)(void); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); +static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); static void* (WINAPI *pEncodePointer)(void *); @@ -282,6 +283,108 @@ static void test__strtoi64(void) ok(errno == 0xdeadbeef, "errno = %x\n", errno); } +static void test__itoa_s(void) +{ + errno_t ret; + char buffer[33]; + + if (!p_itoa_s) + { + win_skip("Skipping _itoa_s tests\n"); + return; + } + + if(!p_set_invalid_parameter_handler) { + win_skip("_set_invalid_parameter_handler not found\n"); + return; + } + + /* _itoa_s (on msvcr90) doesn't set errno (in case of errors) while msvcrt does + * as we always set errno in our msvcrt implementation, don't test here that errno + * isn't changed + */ + SET_EXPECT(invalid_parameter_handler); + ret = p_itoa_s(0, NULL, 0, 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + memset(buffer, 'X', sizeof(buffer)); + SET_EXPECT(invalid_parameter_handler); + ret = p_itoa_s(0, buffer, 0, 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(buffer[0] == 'X', "Expected the output buffer to be untouched\n"); + CHECK_CALLED(invalid_parameter_handler); + + memset(buffer, 'X', sizeof(buffer)); + SET_EXPECT(invalid_parameter_handler); + ret = p_itoa_s(0, buffer, sizeof(buffer), 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + CHECK_CALLED(invalid_parameter_handler); + + memset(buffer, 'X', sizeof(buffer)); + SET_EXPECT(invalid_parameter_handler); + ret = p_itoa_s(0, buffer, sizeof(buffer), 64); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + CHECK_CALLED(invalid_parameter_handler); + + memset(buffer, 'X', sizeof(buffer)); + SET_EXPECT(invalid_parameter_handler); + ret = p_itoa_s(12345678, buffer, 4, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(!memcmp(buffer, "\000765", 4), + "Expected the output buffer to be null terminated with truncated output\n"); + CHECK_CALLED(invalid_parameter_handler); + + memset(buffer, 'X', sizeof(buffer)); + SET_EXPECT(invalid_parameter_handler); + ret = p_itoa_s(12345678, buffer, 8, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(!memcmp(buffer, "\0007654321", 8), + "Expected the output buffer to be null terminated with truncated output\n"); + CHECK_CALLED(invalid_parameter_handler); + + memset(buffer, 'X', sizeof(buffer)); + SET_EXPECT(invalid_parameter_handler); + ret = p_itoa_s(-12345678, buffer, 9, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(!memcmp(buffer, "\00087654321", 9), + "Expected the output buffer to be null terminated with truncated output\n"); + CHECK_CALLED(invalid_parameter_handler); + + ret = p_itoa_s(12345678, buffer, 9, 10); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "12345678"), + "Expected output buffer string to be \"12345678\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(43690, buffer, sizeof(buffer), 2); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "1010101010101010"), + "Expected output buffer string to be \"1010101010101010\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(1092009, buffer, sizeof(buffer), 36); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "nell"), + "Expected output buffer string to be \"nell\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(5704, buffer, sizeof(buffer), 18); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "hag"), + "Expected output buffer string to be \"hag\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(-12345678, buffer, sizeof(buffer), 10); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "-12345678"), + "Expected output buffer string to be \"-12345678\", got \"%s\"\n", + buffer); +} + + /* ########## */ START_TEST(msvcr90) @@ -311,6 +414,7 @@ START_TEST(msvcr90) p__sys_errlist = (void *) GetProcAddress(hcrt, "__sys_errlist"); p_strtoi64 = (void *) GetProcAddress(hcrt, "_strtoi64"); p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); + p_itoa_s = (void *)GetProcAddress(hcrt, "_itoa_s"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -319,4 +423,5 @@ START_TEST(msvcr90) test__encode_pointer(); test_error_messages(); test__strtoi64(); + test__itoa_s(); } diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3c4b53c..ea3ca1b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -680,7 +680,8 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) char buffer[33], *pos; size_t len; - if (!str || !size || radix < 2 || radix > 36) + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix >= 2) || !MSVCRT_CHECK_PMT(radix <= 36)) { if (str && size) str[0] = '\0'; @@ -737,6 +738,7 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) *p++ = *pos--; str[0] = '\0'; + MSVCRT_INVALID_PMT("str[size] is too small"); *MSVCRT__errno() = MSVCRT_ERANGE; return MSVCRT_ERANGE; } @@ -831,8 +833,8 @@ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, char buffer[65], *pos; int digit; - if(!str || radix<2 || radix>36) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix>=2) || !MSVCRT_CHECK_PMT(radix<=36)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -851,7 +853,7 @@ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, }while(value != 0); if(buffer-pos+65 > size) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + MSVCRT_INVALID_PMT("str[size] is too small"); *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ab647db..aa57b31 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -43,6 +43,13 @@ static char *buf_to_string(const unsigned char *bin, int len, int nr) return buf[nr]; } +static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, + const wchar_t *function, const wchar_t *file, + unsigned line, uintptr_t arg) +{ + /* we just ignore handler calls */ +} + #define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } #define expect_bin(buf, value, len) { ok(memcmp((buf), value, len) == 0, "Binary buffer mismatch - expected %s, got %s\n", buf_to_string((unsigned char *)value, len, 1), buf_to_string((buf), len, 0)); } @@ -66,6 +73,7 @@ static errno_t (__cdecl *p_strlwr_s)(char*,size_t); static errno_t (__cdecl *p_ultoa_s)(__msvcrt_ulong,char*,size_t,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; +static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1293,6 +1301,10 @@ static void test__itoa_s(void) return; } + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + errno = EBADF; ret = p_itoa_s(0, NULL, 0, 0); ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); @@ -1372,6 +1384,9 @@ static void test__itoa_s(void) ok(!strcmp(buffer, "-12345678"), "Expected output buffer string to be \"-12345678\", got \"%s\"\n", buffer); + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); } static void test__strlwr_s(void) @@ -1705,6 +1720,7 @@ START_TEST(string) p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); p_strlwr_s = (void *)GetProcAddress(hMsvcrt, "_strlwr_s"); p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); + p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Maarten Lankhorst : winegstreamer: Bump buffers to 2 in transform filter.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 34d4b5a22746b0bb7dbc7f60dcf23d8428a06b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d4b5a22746b0bb7dbc7f60d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 23:22:58 2010 +0100 winegstreamer: Bump buffers to 2 in transform filter. --- dlls/winegstreamer/gsttffilter.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index d3b2922..a304cc1 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -141,8 +141,8 @@ static HRESULT WINAPI Gstreamer_transform_DecideBufferSize(TransformFilter *tf, ppropInputRequest->cbBuffer = This->cbBuffer; - if (!ppropInputRequest->cBuffers) - ppropInputRequest->cBuffers = 1; + if (ppropInputRequest->cBuffers < 2) + ppropInputRequest->cBuffers = 2; return IMemAllocator_SetProperties(pAlloc, ppropInputRequest, &actual); }

1 0

Nikolay Sivov : msxml3: Don't include assert.h where it's not used.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 5240bae30892453e8a8e6c3503041f37363451e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5240bae30892453e8a8e6c350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 11 23:44:14 2010 +0300 msxml3: Don't include assert.h where it's not used. --- dlls/msxml3/bsc.c | 1 - dlls/msxml3/dispex.c | 1 - dlls/msxml3/node.c | 1 - dlls/msxml3/parseerror.c | 1 - dlls/msxml3/saxreader.c | 1 - dlls/msxml3/schema.c | 1 - 6 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index cd3d456..020a6e5 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -22,7 +22,6 @@ #include "config.h" #include <stdarg.h> -#include <assert.h> #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 4afcc99..6afbb70 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -21,7 +21,6 @@ #include "config.h" #include <stdarg.h> -#include <assert.h> #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 221abc2..5ed2573 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -23,7 +23,6 @@ #define COBJMACROS #include <stdarg.h> -#include <assert.h> #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 5193216..d5e4cde 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -24,7 +24,6 @@ #include "config.h" #include <stdarg.h> -#include <assert.h> #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4f88ffb..5a98c82 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -23,7 +23,6 @@ #include "config.h" #include <stdarg.h> -#include <assert.h> #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 1ff4566..c9016ce 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -24,7 +24,6 @@ #include "config.h" #include <stdarg.h> -#include <assert.h> #include "windef.h" #include "winbase.h" #include "winuser.h"

1 0