March 2011 - Wine-commits - list.winehq.org

Francois Gouget : winefile: Remove the unimplemented help search menu.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: ddeacf86a469d69feef8cab56aaf7e6dc6b674f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddeacf86a469d69feef8cab56… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:41:27 2011 +0200 winefile: Remove the unimplemented help search menu. --- po/ar.po | 49 ++++++++++++++++++---------------------- po/bg.po | 49 ++++++++++++++++++---------------------- po/ca.po | 48 ++++++++++++++++++--------------------- po/cs.po | 48 ++++++++++++++++++--------------------- po/da.po | 48 ++++++++++++++++++--------------------- po/de.po | 48 ++++++++++++++++++--------------------- po/el.po | 49 ++++++++++++++++++---------------------- po/en.po | 48 ++++++++++++++++++--------------------- po/en_US.po | 48 ++++++++++++++++++--------------------- po/eo.po | 49 ++++++++++++++++++---------------------- po/es.po | 48 ++++++++++++++++++--------------------- po/fa.po | 49 ++++++++++++++++++---------------------- po/fi.po | 49 ++++++++++++++++++---------------------- po/fr.po | 48 ++++++++++++++++++--------------------- po/he.po | 48 ++++++++++++++++++--------------------- po/hi.po | 48 ++++++++++++++++++--------------------- po/hu.po | 48 ++++++++++++++++++--------------------- po/it.po | 48 ++++++++++++++++++--------------------- po/ja.po | 48 ++++++++++++++++++--------------------- po/ko.po | 48 ++++++++++++++++++--------------------- po/lt.po | 48 ++++++++++++++++++--------------------- po/ml.po | 48 ++++++++++++++++++--------------------- po/nb_NO.po | 48 ++++++++++++++++++--------------------- po/nl.po | 48 ++++++++++++++++++--------------------- po/or.po | 48 ++++++++++++++++++--------------------- po/pa.po | 48 ++++++++++++++++++--------------------- po/pl.po | 48 ++++++++++++++++++--------------------- po/pt_BR.po | 48 ++++++++++++++++++--------------------- po/pt_PT.po | 48 ++++++++++++++++++--------------------- po/rm.po | 48 ++++++++++++++++++--------------------- po/ro.po | 48 ++++++++++++++++++--------------------- po/ru.po | 48 ++++++++++++++++++--------------------- po/sk.po | 48 ++++++++++++++++++--------------------- po/sl.po | 48 ++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 49 ++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 49 ++++++++++++++++++---------------------- po/sv.po | 48 ++++++++++++++++++--------------------- po/te.po | 48 ++++++++++++++++++--------------------- po/th.po | 49 ++++++++++++++++++---------------------- po/tr.po | 48 ++++++++++++++++++--------------------- po/uk.po | 48 ++++++++++++++++++--------------------- po/wa.po | 49 ++++++++++++++++++---------------------- po/wine.pot | 48 ++++++++++++++++++--------------------- po/zh_CN.po | 48 ++++++++++++++++++--------------------- po/zh_TW.po | 48 ++++++++++++++++++--------------------- programs/winefile/winefile.rc | 1 - 46 files changed, 990 insertions(+), 1181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddeacf86a469d69feef8c…

1 0

David Hedberg : comdlg32: Add ExplorerBrowser control to Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 140113b266ee2772cc91b4901292901f44752faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=140113b266ee2772cc91b4901… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:25 2011 +0200 comdlg32: Add ExplorerBrowser control to Item Dialog. --- dlls/comdlg32/itemdlg.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index dfd2d3a..23429f0 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -76,6 +76,8 @@ typedef struct FileDialogImpl { IShellItem *psi_folder; HWND dlg_hwnd; + IExplorerBrowser *peb; + DWORD ebevents_cookie; } FileDialogImpl; /************************************************************************** @@ -88,6 +90,7 @@ static SIZE update_layout(FileDialogImpl *This) RECT dialog_rc; RECT cancel_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; + RECT ebrowser_rc; int missing_width, missing_height; static const UINT vspacing = 4, hspacing = 4; SIZE ret; @@ -190,12 +193,21 @@ static SIZE update_layout(FileDialogImpl *This) filename_rc.bottom = filename_rc.top + filename_height; } + /* The ExplorerBrowser control. */ + ebrowser_rc.left = dialog_rc.left + vspacing; + ebrowser_rc.top = 0; + ebrowser_rc.right = dialog_rc.right - vspacing; + ebrowser_rc.bottom = filename_rc.top - hspacing; + /**** * Move everything to the right place. */ /* FIXME: The Save Dialog uses a slightly different layout. */ - hdwp = BeginDeferWindowPos(5); + hdwp = BeginDeferWindowPos(6); + + if(hdwp && This->peb) + IExplorerBrowser_SetRect(This->peb, &hdwp, ebrowser_rc); /* The default controls */ if(hdwp && (hwnd = GetDlgItem(This->dlg_hwnd, IDC_FILETYPE)) ) @@ -228,11 +240,60 @@ static SIZE update_layout(FileDialogImpl *This) return ret; } +static HRESULT init_explorerbrowser(FileDialogImpl *This) +{ + IShellItem *psi_folder; + FOLDERSETTINGS fos; + RECT rc = {0}; + HRESULT hr; + + /* Create ExplorerBrowser instance */ + OleInitialize(NULL); + + hr = CoCreateInstance(&CLSID_ExplorerBrowser, NULL, CLSCTX_INPROC_SERVER, + &IID_IExplorerBrowser, (void**)&This->peb); + if(FAILED(hr)) + { + ERR("Failed to instantiate ExplorerBrowser control.\n"); + return hr; + } + + IExplorerBrowser_SetOptions(This->peb, EBO_SHOWFRAMES); + + hr = IExplorerBrowser_Initialize(This->peb, This->dlg_hwnd, &rc, NULL); + if(FAILED(hr)) + { + ERR("Failed to initialize the ExplorerBrowser control.\n"); + IExplorerBrowser_Release(This->peb); + This->peb = NULL; + return hr; + } + hr = IExplorerBrowser_Advise(This->peb, &This->IExplorerBrowserEvents_iface, &This->ebevents_cookie); + if(FAILED(hr)) + ERR("Advise (ExplorerBrowser) failed.\n"); + + /* Get previous options? */ + fos.ViewMode = fos.fFlags = 0; + if(!(This->options & FOS_ALLOWMULTISELECT)) + fos.fFlags |= FWF_SINGLESEL; + + IExplorerBrowser_SetFolderSettings(This->peb, &fos); + + /* Browse somewhere */ + psi_folder = This->psi_setfolder ? This->psi_setfolder : This->psi_defaultfolder; + IExplorerBrowser_BrowseToObject(This->peb, (IUnknown*)psi_folder, SBSP_DEFBROWSER); + + hr = IUnknown_SetSite((IUnknown*)This->peb, (IUnknown*)This); + if(FAILED(hr)) + ERR("SetSite (ExplorerBrowser) failed.\n"); + + return S_OK; +} + static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) { FileDialogImpl *This = (FileDialogImpl*)lParam; HWND hitem; - TRACE("(%p, %p)\n", This, hwnd); SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LPARAM)This); @@ -257,6 +318,7 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) else ShowWindow(hitem, SW_HIDE); + init_explorerbrowser(This); update_layout(This); return TRUE; @@ -284,6 +346,13 @@ static LRESULT on_wm_destroy(FileDialogImpl *This) { TRACE("%p\n", This); + if(This->peb) + { + IExplorerBrowser_Destroy(This->peb); + IExplorerBrowser_Release(This->peb); + This->peb = NULL; + } + This->dlg_hwnd = NULL; return TRUE; @@ -307,12 +376,34 @@ static LRESULT on_idcancel(FileDialogImpl *This) return FALSE; } +static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) +{ + if(HIWORD(wparam) == CBN_SELCHANGE) + { + IShellView *psv; + HRESULT hr; + + This->filetypeindex = SendMessageW((HWND)lparam, CB_GETCURSEL, 0, 0); + TRACE("File type selection changed to %d.\n", This->filetypeindex); + + hr = IExplorerBrowser_GetCurrentView(This->peb, &IID_IShellView, (void**)&psv); + if(SUCCEEDED(hr)) + { + IShellView_Refresh(psv); + IShellView_Release(psv); + } + } + + return FALSE; +} + static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { switch(wparam) { case IDOK: return on_idok(This); case IDCANCEL: return on_idcancel(This); + case IDC_FILETYPE: return on_command_filetype(This, wparam, lparam); default: TRACE("Unknown command.\n"); } return FALSE; @@ -1340,7 +1431,19 @@ static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationComplete(IExplorerBro PCIDLIST_ABSOLUTE pidlFolder) { FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); + HRESULT hr; TRACE("%p (%p)\n", This, pidlFolder); + + if(This->psi_folder) + IShellItem_Release(This->psi_folder); + + hr = SHCreateItemFromIDList(pidlFolder, &IID_IShellItem, (void**)&This->psi_folder); + if(FAILED(hr)) + { + ERR("Failed to get the current folder.\n"); + This->psi_folder = NULL; + } + return S_OK; } @@ -1406,6 +1509,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->events_next_cookie = 0; fdimpl->dlg_hwnd = NULL; + fdimpl->peb = NULL; /* FIXME: The default folder setting should be restored for the * application if it was previously set. */

1 0

David Hedberg : comdlg32: Add IServiceProvider implementation to the Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 768d498ed5eef9947a25969d9d03ebc8171ea831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768d498ed5eef9947a25969d9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:26 2011 +0200 comdlg32: Add IServiceProvider implementation to the Item Dialog. --- dlls/comdlg32/itemdlg.c | 69 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 2 +- 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 23429f0..145bca7 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -59,6 +59,7 @@ typedef struct FileDialogImpl { } u; enum ITEMDLG_TYPE dlg_type; IExplorerBrowserEvents IExplorerBrowserEvents_iface; + IServiceProvider IServiceProvider_iface; LONG ref; FILEOPENDIALOGOPTIONS options; @@ -478,6 +479,10 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->IExplorerBrowserEvents_iface; } + else if(IsEqualGUID(riid, &IID_IServiceProvider)) + { + *ppvObject = &This->IServiceProvider_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid)); @@ -1465,6 +1470,69 @@ static const IExplorerBrowserEventsVtbl vt_IExplorerBrowserEvents = { IExplorerBrowserEvents_fnOnNavigationFailed }; +/************************************************************************** + * IServiceProvider implementation + */ +static inline FileDialogImpl *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, IServiceProvider_iface); +} + +static HRESULT WINAPI IServiceProvider_fnQueryInterface(IServiceProvider *iface, + REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + TRACE("%p\n", This); + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI IServiceProvider_fnAddRef(IServiceProvider *iface) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + TRACE("%p\n", This); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI IServiceProvider_fnRelease(IServiceProvider *iface) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + TRACE("%p\n", This); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, + REFGUID guidService, + REFIID riid, void **ppv) +{ + FileDialogImpl *This = impl_from_IServiceProvider(iface); + HRESULT hr = E_FAIL; + TRACE("%p (%s, %s, %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + *ppv = NULL; + if(IsEqualGUID(guidService, &SID_STopLevelBrowser) && This->peb) + hr = IExplorerBrowser_QueryInterface(This->peb, riid, ppv); + else if(IsEqualGUID(guidService, &SID_SExplorerBrowserFrame)) + hr = IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppv); + else + FIXME("Interface %s requested from unknown service %s\n", + debugstr_guid(riid), debugstr_guid(guidService)); + + if(SUCCEEDED(hr) && *ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_FAIL; +} + +static const IServiceProviderVtbl vt_IServiceProvider = { + IServiceProvider_fnQueryInterface, + IServiceProvider_fnAddRef, + IServiceProvider_fnRelease, + IServiceProvider_fnQueryService +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -1484,6 +1552,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->ref = 1; fdimpl->IFileDialog2_iface.lpVtbl = &vt_IFileDialog2; fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; + fdimpl->IServiceProvider_iface.lpVtbl = &vt_IServiceProvider; if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 8b998a6..069de20 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -181,7 +181,7 @@ static BOOL test_instantiation(void) if(SUCCEEDED(hr)) IFileOpenDialog_Release(pfsd); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IServiceProvider, (void**)&psp); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) { IExplorerBrowser *peb;

1 0

David Hedberg : comdlg32: Add ICommDlgBrowser3 stub to Item Dialog.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 338d700a23c221290e884852f05961781a0f201f URL: http://source.winehq.org/git/wine.git/?a=commit;h=338d700a23c221290e884852f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 31 05:55:27 2011 +0200 comdlg32: Add ICommDlgBrowser3 stub to Item Dialog. --- dlls/comdlg32/itemdlg.c | 125 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 12 +++- 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 145bca7..35812f2 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -60,6 +60,7 @@ typedef struct FileDialogImpl { enum ITEMDLG_TYPE dlg_type; IExplorerBrowserEvents IExplorerBrowserEvents_iface; IServiceProvider IServiceProvider_iface; + ICommDlgBrowser3 ICommDlgBrowser3_iface; LONG ref; FILEOPENDIALOGOPTIONS options; @@ -483,6 +484,12 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->IServiceProvider_iface; } + else if(IsEqualGUID(&IID_ICommDlgBrowser3, riid) || + IsEqualGUID(&IID_ICommDlgBrowser2, riid) || + IsEqualGUID(&IID_ICommDlgBrowser, riid)) + { + *ppvObject = &This->ICommDlgBrowser3_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid)); @@ -1533,6 +1540,123 @@ static const IServiceProviderVtbl vt_IServiceProvider = { IServiceProvider_fnQueryService }; +/************************************************************************** + * ICommDlgBrowser3 implementation + */ +static inline FileDialogImpl *impl_from_ICommDlgBrowser3(ICommDlgBrowser3 *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, ICommDlgBrowser3_iface); +} + +static HRESULT WINAPI ICommDlgBrowser3_fnQueryInterface(ICommDlgBrowser3 *iface, + REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI ICommDlgBrowser3_fnAddRef(ICommDlgBrowser3 *iface) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI ICommDlgBrowser3_fnRelease(ICommDlgBrowser3 *iface) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + TRACE("%p\n", This); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnDefaultCommand(ICommDlgBrowser3 *iface, + IShellView *shv) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p)\n", This, shv); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnStateChange(ICommDlgBrowser3 *iface, + IShellView *shv, ULONG uChange ) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %x)\n", This, shv, uChange); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnIncludeObject(ICommDlgBrowser3 *iface, + IShellView *shv, LPCITEMIDLIST pidl) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %p)\n", This, shv, pidl); + return S_OK; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnNotify(ICommDlgBrowser3 *iface, + IShellView *ppshv, DWORD dwNotifyType) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, 0x%x)\n", This, ppshv, dwNotifyType); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetDefaultMenuText(ICommDlgBrowser3 *iface, + IShellView *pshv, + LPWSTR pszText, int cchMax) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %p, %d)\n", This, pshv, pszText, cchMax); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetViewFlags(ICommDlgBrowser3 *iface, DWORD *pdwFlags) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p)\n", This, pdwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnColumnClicked(ICommDlgBrowser3 *iface, + IShellView *pshv, int iColumn) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %d)\n", This, pshv, iColumn); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnGetCurrentFilter(ICommDlgBrowser3 *iface, + LPWSTR pszFileSpec, int cchFileSpec) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p, %d)\n", This, pszFileSpec, cchFileSpec); + return E_NOTIMPL; +} + +static HRESULT WINAPI ICommDlgBrowser3_fnOnPreviewCreated(ICommDlgBrowser3 *iface, + IShellView *pshv) +{ + FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); + FIXME("Stub: %p (%p)\n", This, pshv); + return E_NOTIMPL; +} + +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 +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -1553,6 +1677,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->IFileDialog2_iface.lpVtbl = &vt_IFileDialog2; fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; fdimpl->IServiceProvider_iface.lpVtbl = &vt_IServiceProvider; + fdimpl->ICommDlgBrowser3_iface.lpVtbl = &vt_ICommDlgBrowser3; if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 069de20..8f031c2 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -196,8 +196,8 @@ static BOOL test_instantiation(void) hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk); ok(hr == E_FAIL, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); IServiceProvider_Release(psp); @@ -215,6 +215,10 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_ICommDlgBrowser3, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IShellBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); @@ -255,6 +259,10 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileOpenDialog_QueryInterface(pfsd, &IID_ICommDlgBrowser3, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IShellBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk);

1 0

Francois Gouget : msi: Make load_ttf_name_id() static.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1d246654cbcf2e0c57b446dbb9b046cc8601e64e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d246654cbcf2e0c57b446dbb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 31 12:35:58 2011 +0200 msi: Make load_ttf_name_id() static. --- dlls/msi/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 7a49386..f74c59e 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -84,7 +84,7 @@ static const WCHAR regfont2[] = * Code based off of code located here * http://www.codeproject.com/gdi/fontnamefromfile.asp */ -WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) +static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) { TT_TABLE_DIRECTORY tblDir; BOOL bFound = FALSE;

1 0

Matteo Bruni : winex11.drv: Take care of the destroyed drawable in wglFlush /wglFinish too.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 1e0075cd61c908b3cf6523c132fb16b1a8ee58ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0075cd61c908b3cf6523c13… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 7 22:39:34 2011 +0100 winex11.drv: Take care of the destroyed drawable in wglFlush/wglFinish too. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a7ec8c8..feead5f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2271,7 +2271,7 @@ void flush_gl_drawable(X11DRV_PDEVICE *physDev) { int w, h; - if (!physDev->gl_copy) + if (!physDev->gl_copy || !physDev->current_pf) return; w = physDev->dc_rect.right - physDev->dc_rect.left;

1 0

Matteo Bruni : opengl32/tests: Improve window destroy tests.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: bc3ba2f06e4ce34177ac60dc4a48b6c39470d6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3ba2f06e4ce34177ac60dc4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 14 14:47:25 2011 +0100 opengl32/tests: Improve window destroy tests. --- dlls/opengl32/tests/opengl.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 1669d73..64b9ee5 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -949,6 +949,8 @@ static void test_destroy(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); ret = DestroyWindow(window); ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); @@ -960,6 +962,10 @@ static void test_destroy(HDC oldhdc) err = GetLastError(); ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior when making context current, ret %d, last error %#x.\n", ret, err); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); ok(wglGetCurrentContext() == ctx, "Wrong current context.\n"); @@ -967,6 +973,10 @@ static void test_destroy(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); ret = wglMakeCurrent(NULL, NULL); ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); @@ -975,6 +985,10 @@ static void test_destroy(HDC oldhdc) glFinish(); glerr = glGetError(); todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); SetLastError(0xdeadbeef); ret = wglMakeCurrent(dc, ctx); @@ -1087,6 +1101,8 @@ static void test_destroy_read(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glCopyPixel, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); ret = DestroyWindow(read_window); ok(ret, "Failed to destroy window, last error %#x.\n", GetLastError()); @@ -1105,6 +1121,8 @@ static void test_destroy_read(HDC oldhdc) glFinish(); glerr = glGetError(); ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(draw_dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); ret = wglMakeCurrent(NULL, NULL); ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); @@ -1125,6 +1143,10 @@ static void test_destroy_read(HDC oldhdc) glFinish(); glerr = glGetError(); todo_wine ok(glerr == GL_INVALID_OPERATION, "Failed glClear, error %#x.\n", glerr); + SetLastError(0xdeadbeef); + ret = SwapBuffers(draw_dc); + err = GetLastError(); + ok(!ret && err == ERROR_INVALID_HANDLE, "Unexpected behavior with SwapBuffer, last error %#x.\n", err); SetLastError(0xdeadbeef); ret = pwglMakeContextCurrentARB(draw_dc, read_dc, ctx);

1 0

Bart Van Assche : ntdll: Avoid examining uninitialized data.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: e5fe510720ba3d8a247a91e17d1b09bde5f268c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fe510720ba3d8a247a91e17… Author: Bart Van Assche <bvanassche(a)acm.org> Date: Wed Mar 30 20:50:12 2011 +0200 ntdll: Avoid examining uninitialized data. --- dlls/ntdll/directory.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 66572da..b57741a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -923,7 +923,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; - statfs( dir, &stfs ); + if (statfs( dir, &stfs ) == -1) return FALSE; /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -960,7 +960,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; - statvfs( dir, &stfs ); + if (statvfs( dir, &stfs ) == -1) return FALSE; /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) @@ -973,7 +973,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) char *cifile; /* Only assume CIOPFS is case insensitive. */ - statfs( dir, &stfs ); + if (statfs( dir, &stfs ) == -1) return FALSE; if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) return TRUE; /* Normally, we'd have to parse the mtab to find out exactly what @@ -2175,7 +2175,6 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i } } closedir( dir ); - goto not_found; /* avoid warning */ not_found: unix_name[pos - 1] = 0;

1 0

Hans Leidekker : msi: Fix buffer size calculation in get_keypath.
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 0aaf17c0d8c35de836540f83b573e1329b991e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aaf17c0d8c35de836540f83b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 31 11:57:25 2011 +0200 msi: Fix buffer size calculation in get_keypath. --- dlls/msi/action.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a5a1e33..73d6d1b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2879,14 +2879,11 @@ static WCHAR *get_keypath( MSIPACKAGE *package, HKEY root, const WCHAR *path ) UINT size; WCHAR *path_32node; - size = (strlenW( path ) + strlenW( szWow6432Node ) + 1) * sizeof(WCHAR); - path_32node = msi_alloc( size ); - if (!path_32node) - return NULL; + size = (strlenW( path ) + strlenW( szWow6432Node ) + 2) * sizeof(WCHAR); + if (!(path_32node = msi_alloc( size ))) return NULL; memcpy( path_32node, path, len * sizeof(WCHAR) ); - path_32node[len] = 0; - strcatW( path_32node, szWow6432Node ); + strcpyW( path_32node + len, szWow6432Node ); strcatW( path_32node, szBackSlash ); strcatW( path_32node, path + len ); return path_32node;

1 0

Hans Leidekker : msi: Fix building the message string in MSI_ProcessMessage .
by Alexandre Julliard 31 Mar '11

31 Mar '11

Module: wine Branch: master Commit: 31291ec2050a642ce67dd8c2f224d701f55050a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31291ec2050a642ce67dd8c2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 31 11:57:47 2011 +0200 msi: Fix building the message string in MSI_ProcessMessage. --- dlls/msi/package.c | 62 ++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7317af2..49acdb7 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1703,8 +1703,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) return handle; } -INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, - MSIRECORD *record) +INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIRECORD *record ) { static const WCHAR szActionData[] = {'A','c','t','i','o','n','D','a','t','a',0}; @@ -1713,10 +1712,9 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, static const WCHAR szActionText[] = {'A','c','t','i','o','n','T','e','x','t',0}; LPWSTR message; - DWORD sz, total_size = 0, log_type = 0; - INT i, rc = 0; + DWORD i, len, total_len, log_type = 0; + INT rc = 0; char *msg; - int len; TRACE("%x\n", eMessageType); @@ -1769,35 +1767,39 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, } else { - INT msg_field=1; - message = msi_alloc(1*sizeof (WCHAR)); - message[0]=0; - msg_field = MSI_RecordGetFieldCount(record); - for (i = 1; i <= msg_field; i++) + static const WCHAR format[] = {'%','u',':',' ',0}; + UINT count = MSI_RecordGetFieldCount( record ); + WCHAR *p; + + total_len = 1; + for (i = 1; i <= count; i++) + { + len = 0; + MSI_RecordGetStringW( record, i, NULL, &len ); + total_len += len + 13; + } + p = message = msi_alloc( total_len * sizeof(WCHAR) ); + if (!p) return ERROR_OUTOFMEMORY; + + for (i = 1; i <= count; i++) { - LPWSTR tmp; - WCHAR number[3]; - static const WCHAR format[] = { '%','i',':',' ',0}; - sz = 0; - MSI_RecordGetStringW(record,i,NULL,&sz); - sz+=4; - total_size+=sz*sizeof(WCHAR); - tmp = msi_alloc(sz*sizeof(WCHAR)); - message = msi_realloc(message,total_size*sizeof (WCHAR)); - - MSI_RecordGetStringW(record,i,tmp,&sz); - - if (msg_field > 1) + if (count > 1) { - sprintfW(number,format,i); - strcatW(message,number); + len = sprintfW( p, format, i ); + total_len -= len; + p += len; + } + len = total_len; + MSI_RecordGetStringW( record, i, p, &len ); + total_len -= len; + p += len; + if (count > 1 && total_len) + { + *p++ = ' '; + total_len--; } - strcatW(message,tmp); - if (msg_field > 1) - strcatW(message, szSpace); - - msi_free(tmp); } + p[0] = 0; } TRACE("%p %p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, gUIHandlerRecord,

1 0