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

Jacek Caban : mshtml: Get rid of no longer needed nsIComponentRegistrar:: AutoRegister call.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 69637dbed646a78f60024fc24139ceb854ed0ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69637dbed646a78f60024fc24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 20:25:06 2010 +0200 mshtml: Get rid of no longer needed nsIComponentRegistrar::AutoRegister call. --- dlls/mshtml/nsembed.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index efc129b..78aab5b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -546,15 +546,10 @@ static BOOL init_xpcom(const PRUnichar *gre_path) ERR("Could not get nsIComponentManager: %08x\n", nsres); nsres = NS_GetComponentRegistrar(&registrar); - if(NS_SUCCEEDED(nsres)) { - nsres = nsIComponentRegistrar_AutoRegister(registrar, NULL); - if(NS_FAILED(nsres)) - ERR("AutoRegister(NULL) failed: %08x\n", nsres); - + if(NS_SUCCEEDED(nsres)) init_nsio(pCompMgr, registrar); - }else { + else ERR("NS_GetComponentRegistrar failed: %08x\n", nsres); - } nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID, NULL, &IID_nsIObserver, (void**)&pStartNotif);

1 0

Jacek Caban : mshtml: Use IActiveScriptSiteDebug64 instead of IActiveScriptSiteDebug32 on win64.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 4f16b73fa4b67716624a2f9aa17ef1a1b07e308d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f16b73fa4b67716624a2f9aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 20:20:29 2010 +0200 mshtml: Use IActiveScriptSiteDebug64 instead of IActiveScriptSiteDebug32 on win64. --- dlls/mshtml/script.c | 73 ++++++++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 1d21da9..0b78e17 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -36,6 +36,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#ifdef _WIN64 +#define CTXARG_T DWORDLONG +#define IActiveScriptSiteDebugVtbl IActiveScriptSiteDebug64Vtbl +#else +#define CTXARG_T DWORD +#define IActiveScriptSiteDebugVtbl IActiveScriptSiteDebug32Vtbl +#endif + static const WCHAR windowW[] = {'w','i','n','d','o','w',0}; static const WCHAR emptyW[] = {0}; @@ -46,7 +54,7 @@ struct ScriptHost { const IActiveScriptSiteVtbl *lpIActiveScriptSiteVtbl; const IActiveScriptSiteInterruptPollVtbl *lpIActiveScriptSiteInterruptPollVtbl; const IActiveScriptSiteWindowVtbl *lpIActiveScriptSiteWindowVtbl; - const IActiveScriptSiteDebug32Vtbl *lpIActiveScriptSiteDebug32Vtbl; + const IActiveScriptSiteDebugVtbl *lpIActiveScriptSiteDebugVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; LONG ref; @@ -66,7 +74,7 @@ struct ScriptHost { #define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpIActiveScriptSiteVtbl) #define ACTSCPPOLL(x) (&(x)->lpIActiveScriptSiteInterruptPollVtbl) #define ACTSCPWIN(x) (&(x)->lpIActiveScriptSiteWindowVtbl) -#define ACTSCPDBG32(x) (&(x)->lpIActiveScriptSiteDebug32Vtbl) +#define ACTSCPDBG(x) (&(x)->lpIActiveScriptSiteDebugVtbl) static void set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *val) { @@ -237,9 +245,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); *ppv = ACTSCPWIN(This); - }else if(IsEqualGUID(&IID_IActiveScriptSiteDebug32, riid)) { - TRACE("(%p)->(IID_IActiveScriptSiteDebug32 %p)\n", This, ppv); - *ppv = ACTSCPDBG32(This); + }else if(IsEqualGUID(&IID_IActiveScriptSiteDebug, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteDebug %p)\n", This, ppv); + *ppv = ACTSCPDBG(This); }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = SERVPROV(This); @@ -469,68 +477,69 @@ static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { ActiveScriptSiteWindow_EnableModeless }; -#define ACTSCPDBG32_THIS(iface) DEFINE_THIS(ScriptHost, IActiveScriptSiteDebug32, iface) +#define ACTSCPDBG_THIS(iface) DEFINE_THIS(ScriptHost, IActiveScriptSiteDebug, iface) -static HRESULT WINAPI ActiveScriptSiteDebug32_QueryInterface(IActiveScriptSiteDebug32 *iface, +static HRESULT WINAPI ActiveScriptSiteDebug_QueryInterface(IActiveScriptSiteDebug *iface, REFIID riid, void **ppv) { - ScriptHost *This = ACTSCPDBG32_THIS(iface); + ScriptHost *This = ACTSCPDBG_THIS(iface); return IActiveScriptSite_QueryInterface(ACTSCPSITE(This), riid, ppv); } -static ULONG WINAPI ActiveScriptSiteDebug32_AddRef(IActiveScriptSiteDebug32 *iface) +static ULONG WINAPI ActiveScriptSiteDebug_AddRef(IActiveScriptSiteDebug *iface) { - ScriptHost *This = ACTSCPDBG32_THIS(iface); + ScriptHost *This = ACTSCPDBG_THIS(iface); return IActiveScriptSite_AddRef(ACTSCPSITE(This)); } -static ULONG WINAPI ActiveScriptSiteDebug32_Release(IActiveScriptSiteDebug32 *iface) +static ULONG WINAPI ActiveScriptSiteDebug_Release(IActiveScriptSiteDebug *iface) { - ScriptHost *This = ACTSCPDBG32_THIS(iface); + ScriptHost *This = ACTSCPDBG_THIS(iface); return IActiveScriptSite_Release(ACTSCPSITE(This)); } -static HRESULT WINAPI ActiveScriptSiteDebug32_GetDocumentContextFromPosition(IActiveScriptSiteDebug32 *iface, - DWORD dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, IDebugDocumentContext **ppsc) +static HRESULT WINAPI ActiveScriptSiteDebug_GetDocumentContextFromPosition(IActiveScriptSiteDebug *iface, + CTXARG_T dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, IDebugDocumentContext **ppsc) { - ScriptHost *This = ACTSCPDBG32_THIS(iface); - FIXME("(%p)->(%x %u %u %p)\n", This, dwSourceContext, uCharacterOffset, uNumChars, ppsc); + ScriptHost *This = ACTSCPDBG_THIS(iface); + FIXME("(%p)->(%s %u %u %p)\n", This, wine_dbgstr_longlong(dwSourceContext), uCharacterOffset, + uNumChars, ppsc); return E_NOTIMPL; } -static HRESULT WINAPI ActiveScriptSiteDebug32_GetApplication(IActiveScriptSiteDebug32 *iface, IDebugApplication32 **ppda) +static HRESULT WINAPI ActiveScriptSiteDebug_GetApplication(IActiveScriptSiteDebug *iface, IDebugApplication **ppda) { - ScriptHost *This = ACTSCPDBG32_THIS(iface); + ScriptHost *This = ACTSCPDBG_THIS(iface); FIXME("(%p)->(%p)\n", This, ppda); return E_NOTIMPL; } -static HRESULT WINAPI ActiveScriptSiteDebug32_GetRootApplicationNode(IActiveScriptSiteDebug32 *iface, +static HRESULT WINAPI ActiveScriptSiteDebug_GetRootApplicationNode(IActiveScriptSiteDebug *iface, IDebugApplicationNode **ppdanRoot) { - ScriptHost *This = ACTSCPDBG32_THIS(iface); + ScriptHost *This = ACTSCPDBG_THIS(iface); FIXME("(%p)->(%p)\n", This, ppdanRoot); return E_NOTIMPL; } -static HRESULT WINAPI ActiveScriptSiteDebug32_OnScriptErrorDebug(IActiveScriptSiteDebug32 *iface, +static HRESULT WINAPI ActiveScriptSiteDebug_OnScriptErrorDebug(IActiveScriptSiteDebug *iface, IActiveScriptErrorDebug *pErrorDebug, BOOL *pfEnterDebugger, BOOL *pfCallOnScriptErrorWhenContinuing) { - ScriptHost *This = ACTSCPDBG32_THIS(iface); + ScriptHost *This = ACTSCPDBG_THIS(iface); FIXME("(%p)->(%p %p %p)\n", This, pErrorDebug, pfEnterDebugger, pfCallOnScriptErrorWhenContinuing); return E_NOTIMPL; } -#undef ACTSCPDBG32_THIS +#undef ACTSCPDBG_THIS -static const IActiveScriptSiteDebug32Vtbl ActiveScriptSiteDebug32Vtbl = { - ActiveScriptSiteDebug32_QueryInterface, - ActiveScriptSiteDebug32_AddRef, - ActiveScriptSiteDebug32_Release, - ActiveScriptSiteDebug32_GetDocumentContextFromPosition, - ActiveScriptSiteDebug32_GetApplication, - ActiveScriptSiteDebug32_GetRootApplicationNode, - ActiveScriptSiteDebug32_OnScriptErrorDebug +static const IActiveScriptSiteDebugVtbl ActiveScriptSiteDebugVtbl = { + ActiveScriptSiteDebug_QueryInterface, + ActiveScriptSiteDebug_AddRef, + ActiveScriptSiteDebug_Release, + ActiveScriptSiteDebug_GetDocumentContextFromPosition, + ActiveScriptSiteDebug_GetApplication, + ActiveScriptSiteDebug_GetRootApplicationNode, + ActiveScriptSiteDebug_OnScriptErrorDebug }; #define SERVPROV_THIS(iface) DEFINE_THIS(ScriptHost, ServiceProvider, iface) @@ -589,7 +598,7 @@ static ScriptHost *create_script_host(HTMLWindow *window, const GUID *guid) ret->lpIActiveScriptSiteVtbl = &ActiveScriptSiteVtbl; ret->lpIActiveScriptSiteInterruptPollVtbl = &ActiveScriptSiteInterruptPollVtbl; ret->lpIActiveScriptSiteWindowVtbl = &ActiveScriptSiteWindowVtbl; - ret->lpIActiveScriptSiteDebug32Vtbl = &ActiveScriptSiteDebug32Vtbl; + ret->lpIActiveScriptSiteDebugVtbl = &ActiveScriptSiteDebugVtbl; ret->lpServiceProviderVtbl = &ASServiceProviderVtbl; ret->ref = 1; ret->window = window;

1 0

Alexandre Julliard : oleaut32: Add tests for DispCallFunc and fix a number of corner cases.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: a0a4667fde59023da2f338e060732df9f1108a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a4667fde59023da2f338e06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 12:22:20 2010 +0200 oleaut32: Add tests for DispCallFunc and fix a number of corner cases. --- dlls/oleaut32/tests/typelib.c | 192 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 165 +++++++++++++++++++++-------------- 2 files changed, 288 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0a4667fde59023da2f33…

1 0

David Hedberg : shell32: Add ICommDlgBrowser3 stub to the ExplorerBrowser control.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 59965f9c80f1c112a59e48b307e88e328ca411b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59965f9c80f1c112a59e48b30… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 25 15:24:34 2010 +0200 shell32: Add ICommDlgBrowser3 stub to the ExplorerBrowser control. --- dlls/shell32/ebrowser.c | 128 +++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/ebrowser.c | 6 +- 2 files changed, 131 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index e753a79..d53d08e 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -51,6 +51,7 @@ typedef struct _travellog_entry { typedef struct _ExplorerBrowserImpl { const IExplorerBrowserVtbl *lpVtbl; const IShellBrowserVtbl *lpsbVtbl; + const ICommDlgBrowser3Vtbl *lpcdb3Vtbl; LONG ref; BOOL destroyed; @@ -382,6 +383,12 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface, { *ppvObject = &This->lpsbVtbl; } + else if(IsEqualIID(riid, &IID_ICommDlgBrowser) || + IsEqualIID(riid, &IID_ICommDlgBrowser2) || + IsEqualIID(riid, &IID_ICommDlgBrowser3)) + { + *ppvObject = &This->lpcdb3Vtbl; + } if(*ppvObject) { @@ -1039,6 +1046,126 @@ static const IShellBrowserVtbl vt_IShellBrowser = { IShellBrowser_fnSetToolbarItems }; +/************************************************************************** + * ICommDlgBrowser3 Implementation + */ + +static inline ExplorerBrowserImpl *impl_from_ICommDlgBrowser3(ICommDlgBrowser3 *iface) +{ + return (ExplorerBrowserImpl *)((char*)iface - FIELD_OFFSET(ExplorerBrowserImpl, lpcdb3Vtbl)); +} + +static HRESULT WINAPI ICommDlgBrowser3_fnQueryInterface(ICommDlgBrowser3 *iface, + REFIID riid, + void **ppvObject) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IUnknown_QueryInterface((IUnknown*) This, riid, ppvObject); +} + +static ULONG WINAPI ICommDlgBrowser3_fnAddRef(ICommDlgBrowser3 *iface) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IUnknown_AddRef((IUnknown*) This); +} + +static ULONG WINAPI ICommDlgBrowser3_fnRelease(ICommDlgBrowser3 *iface) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IUnknown_Release((IUnknown*) This); +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnDefaultCommand(ICommDlgBrowser3 *iface, + IShellView *shv) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p)\n", This, shv); + return E_NOTIMPL; +} +static HRESULT WINAPI ICommDlgBrowser3_fnOnStateChange(ICommDlgBrowser3 *iface, + IShellView *shv, ULONG uChange) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p, %d)\n", This, shv, uChange); + return E_NOTIMPL; +} +static HRESULT WINAPI ICommDlgBrowser3_fnIncludeObject(ICommDlgBrowser3 *iface, + IShellView *pshv, LPCITEMIDLIST pidl) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p, %p)\n", This, pshv, pidl); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnNotify(ICommDlgBrowser3 *iface, + IShellView *pshv, + DWORD dwNotifyType) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p, 0x%x)\n", This, pshv, dwNotifyType); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetDefaultMenuText(ICommDlgBrowser3 *iface, + IShellView *pshv, + LPWSTR pszText, int cchMax) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p, %s, %d)\n", This, pshv, debugstr_w(pszText), cchMax); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetViewFlags(ICommDlgBrowser3 *iface, + DWORD *pdwFlags) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p)\n", This, pdwFlags); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnColumnClicked(ICommDlgBrowser3 *iface, + IShellView *pshv, int iColumn) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p, %d)\n", This, pshv, iColumn); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetCurrentFilter(ICommDlgBrowser3 *iface, + LPWSTR pszFileSpec, + int cchFileSpec) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%s, %d)\n", This, debugstr_w(pszFileSpec), cchFileSpec); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnPreviewCreated(ICommDlgBrowser3 *iface, + IShellView *pshv) +{ + ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("stub, %p (%p)\n", This, pshv); + return S_OK; +} + +static const ICommDlgBrowser3Vtbl vt_ICommDlgBrowser3 = { + ICommDlgBrowser3_fnQueryInterface, + ICommDlgBrowser3_fnAddRef, + ICommDlgBrowser3_fnRelease, + ICommDlgBrowser3_fnOnDefaultCommand, + ICommDlgBrowser3_fnOnStateChange, + ICommDlgBrowser3_fnIncludeObject, + ICommDlgBrowser3_fnNotify, + ICommDlgBrowser3_fnGetDefaultMenuText, + ICommDlgBrowser3_fnGetViewFlags, + ICommDlgBrowser3_fnOnColumnClicked, + ICommDlgBrowser3_fnGetCurrentFilter, + ICommDlgBrowser3_fnOnPreviewCreated +}; + HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { ExplorerBrowserImpl *eb; @@ -1055,6 +1182,7 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi eb->ref = 1; eb->lpVtbl = &vt_IExplorerBrowser; eb->lpsbVtbl = &vt_IShellBrowser; + eb->lpcdb3Vtbl = &vt_ICommDlgBrowser3; list_init(&eb->event_clients); list_init(&eb->travellog); diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 809a7fc..1dd866d 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -167,9 +167,9 @@ static void test_QueryInterface(void) test_qinterface(IID_IExplorerBrowser, S_OK); test_qinterface(IID_IShellBrowser, S_OK); todo_wine test_qinterface(IID_IOleWindow, S_OK); - todo_wine test_qinterface(IID_ICommDlgBrowser, S_OK); - todo_wine test_qinterface(IID_ICommDlgBrowser2, S_OK); - todo_wine test_qinterface(IID_ICommDlgBrowser3, S_OK); + test_qinterface(IID_ICommDlgBrowser, S_OK); + test_qinterface(IID_ICommDlgBrowser2, S_OK); + test_qinterface(IID_ICommDlgBrowser3, S_OK); todo_wine test_qinterface(IID_IServiceProvider, S_OK); todo_wine test_qinterface(IID_IObjectWithSite, S_OK); todo_wine test_qinterface(IID_IConnectionPointContainer, S_OK);

1 0

David Hedberg : shell32: Add a travellog to the ExplorerBrowser control.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: fdccbd91af671a022b2e0b6f2d11c25c1b9cc906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdccbd91af671a022b2e0b6f2… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 25 15:24:33 2010 +0200 shell32: Add a travellog to the ExplorerBrowser control. --- dlls/shell32/ebrowser.c | 138 +++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/ebrowser.c | 24 +++++++- 2 files changed, 156 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 0d11d13..e753a79 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -43,6 +43,11 @@ typedef struct _event_client { DWORD cookie; } event_client; +typedef struct _travellog_entry { + struct list entry; + LPITEMIDLIST pidl; +} travellog_entry; + typedef struct _ExplorerBrowserImpl { const IExplorerBrowserVtbl *lpVtbl; const IShellBrowserVtbl *lpsbVtbl; @@ -57,6 +62,9 @@ typedef struct _ExplorerBrowserImpl { struct list event_clients; DWORD events_next_cookie; + struct list travellog; + travellog_entry *travellog_cursor; + int travellog_count; IShellView *psv; RECT sv_rc; @@ -140,6 +148,99 @@ static void events_ViewCreated(ExplorerBrowserImpl *This, IShellView *psv) } /************************************************************************** + * Travellog functions. + */ +static void travellog_remove_entry(ExplorerBrowserImpl *This, travellog_entry *entry) +{ + TRACE("Removing %p\n", entry); + + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); + This->travellog_count--; +} + +static void travellog_remove_all_entries(ExplorerBrowserImpl *This) +{ + travellog_entry *cursor, *cursor2; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->travellog, travellog_entry, entry) + travellog_remove_entry(This, cursor); + + This->travellog_cursor = NULL; +} + +static void travellog_add_entry(ExplorerBrowserImpl *This, LPITEMIDLIST pidl) +{ + travellog_entry *new, *cursor, *cursor2; + TRACE("%p (old count %d)\n", pidl, This->travellog_count); + + /* Replace the old tail, if any, with the new entry */ + if(This->travellog_cursor) + { + LIST_FOR_EACH_ENTRY_SAFE_REV(cursor, cursor2, &This->travellog, travellog_entry, entry) + { + if(cursor == This->travellog_cursor) + break; + travellog_remove_entry(This, cursor); + } + } + + /* Create and add the new entry */ + new = HeapAlloc(GetProcessHeap(), 0, sizeof(travellog_entry)); + new->pidl = ILClone(pidl); + list_add_tail(&This->travellog, &new->entry); + This->travellog_cursor = new; + This->travellog_count++; + + /* Remove the first few entries if the size limit is reached. */ + if(This->travellog_count > 200) + { + UINT i = 0; + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->travellog, travellog_entry, entry) + { + if(i++ > 10) + break; + travellog_remove_entry(This, cursor); + } + } +} + +static LPCITEMIDLIST travellog_go_back(ExplorerBrowserImpl *This) +{ + travellog_entry *prev; + TRACE("%p, %p\n", This, This->travellog_cursor); + + if(!This->travellog_cursor) + return NULL; + + prev = LIST_ENTRY(list_prev(&This->travellog, &This->travellog_cursor->entry), + travellog_entry, entry); + if(!prev) + return NULL; + + This->travellog_cursor = prev; + return prev->pidl; +} + +static LPCITEMIDLIST travellog_go_forward(ExplorerBrowserImpl *This) +{ + travellog_entry *next; + TRACE("%p, %p\n", This, This->travellog_cursor); + + if(!This->travellog_cursor) + return NULL; + + next = LIST_ENTRY(list_next(&This->travellog, &This->travellog_cursor->entry), + travellog_entry, entry); + if(!next) + return NULL; + + This->travellog_cursor = next; + return next->pidl; +} + +/************************************************************************** * Helper functions */ static void update_layout(ExplorerBrowserImpl *This) @@ -386,6 +487,7 @@ static HRESULT WINAPI IExplorerBrowser_fnDestroy(IExplorerBrowser *iface) } events_unadvise_all(This); + travellog_remove_all_entries(This); ILFree(This->current_pidl); This->current_pidl = NULL; @@ -520,9 +622,6 @@ static HRESULT WINAPI IExplorerBrowser_fnGetOptions(IExplorerBrowser *iface, return S_OK; } -static const UINT unsupported_browse_flags = - SBSP_NAVIGATEBACK | SBSP_NAVIGATEFORWARD | SBSP_NEWBROWSER | - EBF_SELECTFROMDATAOBJECT | EBF_NODROPTARGET; static HRESULT WINAPI IExplorerBrowser_fnBrowseToIDList(IExplorerBrowser *iface, PCUIDLIST_RELATIVE pidl, UINT uFlags) @@ -530,6 +629,8 @@ static HRESULT WINAPI IExplorerBrowser_fnBrowseToIDList(IExplorerBrowser *iface, ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; LPITEMIDLIST absolute_pidl = NULL; HRESULT hr; + static const UINT unsupported_browse_flags = + SBSP_NEWBROWSER | EBF_SELECTFROMDATAOBJECT | EBF_NODROPTARGET; TRACE("%p (%p, 0x%x)\n", This, pidl, uFlags); if(!This->hwnd_main) @@ -547,7 +648,27 @@ static HRESULT WINAPI IExplorerBrowser_fnBrowseToIDList(IExplorerBrowser *iface, if(uFlags & unsupported_browse_flags) FIXME("Argument 0x%x contains unsupported flags.\n", uFlags); - if(uFlags & SBSP_PARENT) + if(uFlags & SBSP_NAVIGATEBACK) + { + TRACE("SBSP_NAVIGATEBACK\n"); + absolute_pidl = ILClone(travellog_go_back(This)); + if(!absolute_pidl && !This->current_pidl) + return E_FAIL; + else if(!absolute_pidl) + return S_OK; + + } + else if(uFlags & SBSP_NAVIGATEFORWARD) + { + TRACE("SBSP_NAVIGATEFORWARD\n"); + absolute_pidl = ILClone(travellog_go_forward(This)); + if(!absolute_pidl && !This->current_pidl) + return E_FAIL; + else if(!absolute_pidl) + return S_OK; + + } + else if(uFlags & SBSP_PARENT) { if(This->current_pidl) { @@ -618,6 +739,14 @@ static HRESULT WINAPI IExplorerBrowser_fnBrowseToIDList(IExplorerBrowser *iface, IShellItem_Release(psi); return E_FAIL; } + + /* Add to travellog */ + if( !(This->eb_options & EBO_NOTRAVELLOG) && + !(uFlags & (SBSP_NAVIGATEFORWARD|SBSP_NAVIGATEBACK)) ) + { + travellog_add_entry(This, absolute_pidl); + } + IShellItem_Release(psi); } } @@ -928,6 +1057,7 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, voi eb->lpsbVtbl = &vt_IShellBrowser; list_init(&eb->event_clients); + list_init(&eb->travellog); ret = IExplorerBrowser_QueryInterface((IExplorerBrowser*)eb, riid, ppv); IExplorerBrowser_Release((IExplorerBrowser*)eb); diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 442d8dc..809a7fc 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -811,14 +811,34 @@ static void test_navigation(void) test_browse_pidl_sb(peb2, &ebev, 0, SBSP_RELATIVE, E_FAIL, 0, 0, 0, 0); test_browse_pidl(peb, &ebev, 0, SBSP_PARENT, E_FAIL, 0, 0, 0, 0); test_browse_pidl_sb(peb2, &ebev, 0, SBSP_PARENT, E_FAIL, 0, 0, 0, 0); + test_browse_pidl(peb, &ebev, 0, SBSP_NAVIGATEFORWARD, E_FAIL, 0, 0, 0, 0); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_NAVIGATEFORWARD, E_FAIL, 0, 0, 0, 0); + test_browse_pidl(peb, &ebev, 0, SBSP_NAVIGATEBACK, E_FAIL, 0, 0, 0, 0); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_NAVIGATEBACK, E_FAIL, 0, 0, 0, 0); /* "The first browse is synchronous" */ test_browse_pidl(peb, &ebev, pidl_child, SBSP_ABSOLUTE, S_OK, 1, 1, 0, 1); test_browse_pidl_sb(peb2, &ebev, pidl_child, SBSP_ABSOLUTE, S_OK, 1, 1, 0, 1); + /* Navigate empty history */ + test_browse_pidl(peb, &ebev, 0, SBSP_NAVIGATEFORWARD, S_OK, 0, 0, 0, 0); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_NAVIGATEFORWARD, S_OK, 0, 0, 0, 0); + test_browse_pidl(peb, &ebev, 0, SBSP_NAVIGATEBACK, S_OK, 0, 0, 0, 0); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_NAVIGATEBACK, S_OK, 0, 0, 0, 0); + + /* Navigate history */ + test_browse_pidl(peb, &ebev, 0, SBSP_PARENT, S_OK, 1, 1, 0, 1); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_PARENT, S_OK, 1, 1, 0, 1); + test_browse_pidl(peb, &ebev, 0, SBSP_NAVIGATEBACK, S_OK, 1, 1, 0, 1); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_NAVIGATEBACK, S_OK, 1, 1, 0, 1); + test_browse_pidl(peb, &ebev, 0, SBSP_NAVIGATEFORWARD, S_OK, 1, 1, 0, 1); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_NAVIGATEFORWARD, S_OK, 1, 1, 0, 1); + test_browse_pidl(peb, &ebev, 0, SBSP_ABSOLUTE, S_OK, 0, 0, 0, 0); + test_browse_pidl_sb(peb2, &ebev, 0, SBSP_ABSOLUTE, S_OK, 0, 0, 0, 0); + /* Relative navigation */ - test_browse_pidl(peb, &ebev, pidl_current, SBSP_ABSOLUTE, S_OK, 1, 1, 0, 1); - test_browse_pidl_sb(peb2, &ebev, pidl_current, SBSP_ABSOLUTE, S_OK, 1, 1, 0, 1); + test_browse_pidl(peb, &ebev, pidl_current, SBSP_ABSOLUTE, S_OK, 1, 0, 0, 1); + test_browse_pidl_sb(peb2, &ebev, pidl_current, SBSP_ABSOLUTE, S_OK, 1, 0, 0, 1); hr = IExplorerBrowser_GetCurrentView(peb, &IID_IFolderView, (void**)&pfv); ok(hr == S_OK, "Got 0x%08x\n", hr);

1 0

David Hedberg : shell32: Implement IExplorerBrowser::BrowseToObject.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 00889f17230474556a0f38be3c23da2a1f8b27d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00889f17230474556a0f38be3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 25 15:24:32 2010 +0200 shell32: Implement IExplorerBrowser::BrowseToObject. --- dlls/shell32/ebrowser.c | 16 ++++++++++++++-- dlls/shell32/tests/ebrowser.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index daf5d4a..0d11d13 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -633,9 +633,21 @@ static HRESULT WINAPI IExplorerBrowser_fnBrowseToObject(IExplorerBrowser *iface, IUnknown *punk, UINT uFlags) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (%p, 0x%x)\n", This, punk, uFlags); + LPITEMIDLIST pidl; + HRESULT hr; + TRACE("%p (%p, 0x%x)\n", This, punk, uFlags); - return E_NOTIMPL; + if(!punk) + return IExplorerBrowser_fnBrowseToIDList(iface, NULL, uFlags); + + hr = SHGetIDListFromObject(punk, &pidl); + if(SUCCEEDED(hr)) + { + hr = IExplorerBrowser_BrowseToIDList(iface, pidl, uFlags); + ILFree(pidl); + } + + return hr; } static HRESULT WINAPI IExplorerBrowser_fnFillFromObject(IExplorerBrowser *iface, diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 60472a4..442d8dc 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -760,6 +760,7 @@ static void test_navigation(void) { IExplorerBrowser *peb, *peb2; IFolderView *pfv; + IShellItem *psi; IShellFolder *psf; LPITEMIDLIST pidl_current, pidl_child; DWORD cookie, cookie2; @@ -920,6 +921,38 @@ static void test_navigation(void) lres = IExplorerBrowser_Release(peb); ok(lres == 0, "Got lres %d\n", lres); + /* BrowseToObject tests */ + ebrowser_instantiate(&peb); + ebrowser_initialize(peb); + + /* Browse to the desktop by passing an IShellFolder */ + hr = SHGetDesktopFolder(&psf); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IExplorerBrowser_BrowseToObject(peb, (IUnknown*)psf, SBSP_DEFBROWSER); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if(hr == S_OK) process_msgs(); + + IShellFolder_Release(psf); + } + + /* Browse to the current directory by passing a ShellItem */ + hr = pSHCreateShellItem(NULL, NULL, pidl_current, &psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IExplorerBrowser_BrowseToObject(peb, (IUnknown*)psi, SBSP_DEFBROWSER); + ok(hr == S_OK, "got (0x%08x)\n", hr); + process_msgs(); + + IShellItem_Release(psi); + } + + IExplorerBrowser_Destroy(peb); + lres = IExplorerBrowser_Release(peb); + ok(lres == 0, "Got lres %d\n", lres); + /* Cleanup */ RemoveDirectoryW(child_path); ILFree(pidl_current);

1 0

David Hedberg : shell32: Implement CommDlgBrowser:: OnDefaultCommand in the ExplorerBrowser control.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: f118c64d6241edf5c5ee2e442973e2fd23bc29ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f118c64d6241edf5c5ee2e442… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 25 15:24:35 2010 +0200 shell32: Implement CommDlgBrowser::OnDefaultCommand in the ExplorerBrowser control. --- dlls/shell32/ebrowser.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index d53d08e..3ba15b9 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -1082,8 +1082,46 @@ static HRESULT WINAPI ICommDlgBrowser3_fnOnDefaultCommand(ICommDlgBrowser3 *ifac IShellView *shv) { ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); - FIXME("stub, %p (%p)\n", This, shv); - return E_NOTIMPL; + IDataObject *pdo; + HRESULT hr; + HRESULT ret = S_FALSE; + + TRACE("%p (%p)\n", This, shv); + + hr = IShellView_GetItemObject(shv, SVGIO_SELECTION, &IID_IDataObject, (void**)&pdo); + if(SUCCEEDED(hr)) + { + FORMATETC fmt; + STGMEDIUM medium; + + fmt.cfFormat = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + + hr = IDataObject_GetData(pdo, &fmt ,&medium); + IDataObject_Release(pdo); + if(SUCCEEDED(hr)) + { + LPIDA pida = GlobalLock(medium.u.hGlobal); + LPCITEMIDLIST pidl_child = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[1]); + + /* Handle folders by browsing to them. */ + if(_ILIsFolder(pidl_child) || _ILIsDrive(pidl_child) || _ILIsSpecialFolder(pidl_child)) + { + IExplorerBrowser_BrowseToIDList((IExplorerBrowser*)This, pidl_child, SBSP_RELATIVE); + ret = S_OK; + } + GlobalUnlock(medium.u.hGlobal); + GlobalFree(medium.u.hGlobal); + } + else + ERR("Failed to get data from IDataObject.\n"); + } else + ERR("Failed to get IDataObject.\n"); + + return ret; } static HRESULT WINAPI ICommDlgBrowser3_fnOnStateChange(ICommDlgBrowser3 *iface, IShellView *shv, ULONG uChange)

1 0

David Hedberg : shell32: Add IObjectWithSite implementation to the ExplorerBrowser control.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 56b8d5d38429097a7e0c62f74e9d56e09c05d315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b8d5d38429097a7e0c62f74… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 25 15:24:36 2010 +0200 shell32: Add IObjectWithSite implementation to the ExplorerBrowser control. --- dlls/shell32/ebrowser.c | 104 +++++++++++++++ dlls/shell32/tests/ebrowser.c | 283 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 386 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56b8d5d38429097a7e0c6…

1 0

Louis Lenders : mscoree: Improve GetCORSytemDirectory.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 127af150e0c8e307efb9980dc29640df3aa0e0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=127af150e0c8e307efb9980dc… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 25 14:53:05 2010 +0200 mscoree: Improve GetCORSytemDirectory. --- dlls/mscoree/mscoree_main.c | 51 +++++++++++++++++++++++++++++++++++++++-- dlls/mscoree/tests/mscoree.c | 4 +- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index d1f035c..e64f9b0 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -79,6 +79,28 @@ static BOOL get_mono_path(LPWSTR path) return TRUE; } +static BOOL get_install_root(LPWSTR install_dir) +{ + const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; + const WCHAR install_root[] = {'I','n','s','t','a','l','l','R','o','o','t',0}; + + DWORD len; + HKEY key; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) + return FALSE; + + len = MAX_PATH; + if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) + { + RegCloseKey(key); + return FALSE; + } + RegCloseKey(key); + + return TRUE; +} + static CRITICAL_SECTION mono_lib_cs; static CRITICAL_SECTION_DEBUG mono_lib_cs_debug = { @@ -336,12 +358,35 @@ HRESULT WINAPI _CorValidateImage(PVOID* imageBase, LPCWSTR imageName) HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { - FIXME("(%p, %d, %p): stub!\n", pbuffer, cchBuffer, dwLength); + static const WCHAR slash[] = {'\\',0}; + WCHAR system_dir[MAX_PATH]; + WCHAR version[MAX_PATH]; + + FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength); if (!dwLength) return E_POINTER; - *dwLength = 0; + if (!pbuffer) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + if (!get_install_root(system_dir)) + { + ERR("error reading registry key for installroot, returning empty path\n"); + *dwLength = 0; + } + else + { + GetCORVersion(version, MAX_PATH, dwLength); + lstrcatW(system_dir, version); + lstrcatW(system_dir, slash); + *dwLength = lstrlenW(system_dir) + 1; + + if (cchBuffer < *dwLength) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + lstrcpyW(pbuffer, system_dir); + } return S_OK; } @@ -355,7 +400,7 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) if (!dwLength || !pbuffer) return E_POINTER; - *dwLength = lstrlenW(version); + *dwLength = lstrlenW(version) + 1; if (cchBuffer < *dwLength) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index e66a44b..b513ade 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -71,10 +71,10 @@ static void test_versioninfo(void) path_len = size; hr = pGetCORSystemDirectory(path, path_len-1 , &size); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); hr = pGetCORSystemDirectory(path, MAX_PATH , NULL); ok(hr == E_POINTER,"GetCORSystemDirectory returned %08x\n", hr);

1 0

Jörg Höhle : mcicda: Opens d, d:, d:\, d: \foo since w2k. Only d: is portable.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 5bff616faa3ce967d2222eda4d2f9700ebf9e130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bff616faa3ce967d2222eda4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Aug 13 14:58:55 2010 +0200 mcicda: Opens d, d:, d:\, d:\foo since w2k. Only d: is portable. --- dlls/mcicda/mcicda.c | 14 +++++++------- dlls/winmm/tests/mcicda.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 51727ee..0334f2e 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -428,23 +428,23 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar if (dwFlags & MCI_OPEN_ELEMENT) { if (dwFlags & MCI_OPEN_ELEMENT_ID) { WARN("MCI_OPEN_ELEMENT_ID %p! Abort\n", lpOpenParms->lpstrElementName); - ret = MCIERR_NO_ELEMENT_ALLOWED; + ret = MCIERR_FLAGS_NOT_COMPATIBLE; goto the_error; } TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName)); - if (!isalpha(lpOpenParms->lpstrElementName[0]) || lpOpenParms->lpstrElementName[1] != ':' || - (lpOpenParms->lpstrElementName[2] && lpOpenParms->lpstrElementName[2] != '\\')) + /* Only the first letter counts since w2k + * Win9x-NT accept only d: and w98SE accepts d:\foobar as well. + * Play d:\Track03.cda plays from the first track, not #3. */ + if (!isalpha(lpOpenParms->lpstrElementName[0])) { - WARN("MCI_OPEN_ELEMENT unsupported format: %s\n", - debugstr_w(lpOpenParms->lpstrElementName)); - ret = MCIERR_NO_ELEMENT_ALLOWED; + ret = MCIERR_INVALID_FILE; goto the_error; } drive = toupper(lpOpenParms->lpstrElementName[0]); root[0] = drive; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; if (GetDriveTypeW(root) != DRIVE_CDROM) { - ret = MCIERR_INVALID_DEVICE_NAME; + ret = MCIERR_INVALID_FILE; goto the_error; } } diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index 14484a5..3dc610a 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -26,6 +26,7 @@ typedef union { MCI_STATUS_PARMS status; MCI_GETDEVCAPS_PARMS caps; + MCI_OPEN_PARMS open; MCI_PLAY_PARMS play; MCI_SEEK_PARMS seek; MCI_SAVE_PARMS save; @@ -151,8 +152,6 @@ static DWORD MSF_Add(DWORD d1, DWORD d2) return MCI_MAKE_MSF(m,s,f); } -/* TODO test_open "open X: type cdaudio" etc. */ -/* TODO demonstrate open X:\ fails on win95 while open X: works. */ /* TODO show that shareable flag is not what Wine implements. */ static void test_play(HWND hwnd) @@ -607,6 +606,46 @@ static void test_play(HWND hwnd) test_notification(hwnd, "STOP final", 0); } +static void test_openclose(HWND hwnd) +{ + MCIDEVICEID wDeviceID; + MCI_PARMS_UNION parm; + MCIERROR err; + char drive[] = {'a',':','\\','X','\0'}; + + /* Bug in native since NT: After OPEN "c" without MCI_OPEN_ALIAS fails with + * MCIERR_DEVICE_OPEN, any subsequent OPEN fails with EXTENSION_NOT_FOUND! */ + parm.open.lpstrAlias = "x"; /* with alias, OPEN "c" behaves normally */ + parm.open.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO; + parm.open.lpstrElementName = drive; + for ( ; strlen(drive); drive[strlen(drive)-1] = 0) + for (drive[0] = 'a'; drive[0] <= 'z'; drive[0]++) { + err = mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT | MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID + | MCI_OPEN_SHAREABLE | MCI_OPEN_ALIAS, (DWORD_PTR)&parm); + ok(!err || err == MCIERR_INVALID_FILE, "OPEN %s type: %s\n", drive, dbg_mcierr(err)); + /* open X:\ fails in Win9x/NT. Only open X: works everywhere. */ + if(!err) { + wDeviceID = parm.open.wDeviceID; + trace("ok with %s\n", drive); + err = mciSendCommand(wDeviceID, MCI_CLOSE, 0, 0); + ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err)); + } + } + drive[0] = '\\'; + err = mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT|MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID + | MCI_OPEN_SHAREABLE, (DWORD_PTR)&parm); + ok(err == MCIERR_INVALID_FILE, "OPEN %s type: %s\n", drive, dbg_mcierr(err)); + if(!err) mciSendCommand(parm.open.wDeviceID, MCI_CLOSE, 0, 0); + + if (0) { + parm.open.lpstrElementName = (LPCSTR)0xDEADBEEF; + err = mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT|MCI_OPEN_ELEMENT_ID + | MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID | MCI_OPEN_SHAREABLE, (DWORD_PTR)&parm); + todo_wine ok(err == MCIERR_FLAGS_NOT_COMPATIBLE, "OPEN elt_ID: %s\n", dbg_mcierr(err)); + if(!err) mciSendCommand(parm.open.wDeviceID, MCI_CLOSE, 0, 0); + } +} + START_TEST(mcicda) { MCIERROR err; @@ -615,6 +654,7 @@ START_TEST(mcicda) 0, 0, 0, NULL); test_notification(hwnd, "-prior to tests-", 0); test_play(hwnd); + test_openclose(hwnd); err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_STOP, 0, 0); todo_wine ok(!err || broken(err == MCIERR_HARDWARE /* blank CD or testbot without CD-ROM */), "STOP all returned %s\n", dbg_mcierr(err));

1 0