April 2011 - Wine-Commits - list.winehq.org

David Hedberg : comdlg32: Factor out filename string splitting code.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 9c1f56f67efbccd9dac9346a61dc0d2a2f49941c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1f56f67efbccd9dac9346a6… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:31 2011 +0200 comdlg32: Factor out filename string splitting code. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/filedlg.c | 87 ++++++++++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 38 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index db0421e..00ec357 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -177,6 +177,7 @@ HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile); int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction); +int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed); /* ITEMIDLIST */ diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 1e33f5a..a36cd35 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -609,6 +609,54 @@ void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, } /*********************************************************************** + * COMDLG32_SplitFileNames [internal] + * + * Creates a delimited list of filenames. + */ +int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed) +{ + UINT nStrCharCount = 0; /* index in src buffer */ + UINT nFileIndex = 0; /* index in dest buffer */ + UINT nFileCount = 0; /* number of files */ + + /* we might get single filename without any '"', + * so we need nStrLen + terminating \0 + end-of-list \0 */ + *lpstrFileList = MemAlloc( (nStrLen+2)*sizeof(WCHAR) ); + *sizeUsed = 0; + + /* build delimited file list from filenames */ + while ( nStrCharCount <= nStrLen ) + { + if ( lpstrEdit[nStrCharCount]=='"' ) + { + nStrCharCount++; + while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen)) + { + (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount]; + nStrCharCount++; + } + (*lpstrFileList)[nFileIndex++] = 0; + nFileCount++; + } + nStrCharCount++; + } + + /* single, unquoted string */ + if ((nStrLen > 0) && (nFileIndex == 0) ) + { + lstrcpyW(*lpstrFileList, lpstrEdit); + nFileIndex = lstrlenW(lpstrEdit) + 1; + nFileCount = 1; + } + + /* trailing \0 */ + (*lpstrFileList)[nFileIndex++] = '\0'; + + *sizeUsed = nFileIndex; + return nFileCount; +} + +/*********************************************************************** * ArrangeCtrlPositions [internal] * * NOTE: Make sure to add testcases for any changes made here. @@ -3642,14 +3690,10 @@ static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, con * FILEDLG95_FILENAME_GetFileNames * * Copies the filenames to a delimited string list. - * The delimiter is specified by the parameter 'separator', - * usually either a space or a nul */ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed) { FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); - UINT nStrCharCount = 0; /* index in src buffer */ - UINT nFileIndex = 0; /* index in dest buffer */ UINT nFileCount = 0; /* number of files */ UINT nStrLen = 0; /* length of string in edit control */ LPWSTR lpstrEdit; /* buffer for string from edit control */ @@ -3663,40 +3707,7 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U TRACE("nStrLen=%u str=%s\n", nStrLen, debugstr_w(lpstrEdit)); - /* we might get single filename without any '"', - * so we need nStrLen + terminating \0 + end-of-list \0 */ - *lpstrFileList = MemAlloc( (nStrLen+2)*sizeof(WCHAR) ); - *sizeUsed = 0; - - /* build delimited file list from filenames */ - while ( nStrCharCount <= nStrLen ) - { - if ( lpstrEdit[nStrCharCount]=='"' ) - { - nStrCharCount++; - while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen)) - { - (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount]; - nStrCharCount++; - } - (*lpstrFileList)[nFileIndex++] = 0; - nFileCount++; - } - nStrCharCount++; - } - - /* single, unquoted string */ - if ((nStrLen > 0) && (nFileIndex == 0) ) - { - lstrcpyW(*lpstrFileList, lpstrEdit); - nFileIndex = lstrlenW(lpstrEdit) + 1; - nFileCount = 1; - } - - /* trailing \0 */ - (*lpstrFileList)[nFileIndex++] = '\0'; - - *sizeUsed = nFileIndex; + nFileCount = COMDLG32_SplitFileNames(lpstrEdit, nStrLen, lpstrFileList, sizeUsed); MemFree(lpstrEdit); return nFileCount; }

1 0

Hans Leidekker : msi: Implement and test MsiEnumComponentCostsA/W.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 68d615887535b39c4b3c661823997ccad67f1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d615887535b39c4b3c66182… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 1 14:54:12 2011 +0200 msi: Implement and test MsiEnumComponentCostsA/W. --- dlls/msi/action.c | 9 +-- dlls/msi/msi.c | 101 +++++++++++++++++++-- dlls/msi/msi.spec | 2 +- dlls/msi/msipriv.h | 1 + dlls/msi/tests/package.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 316 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68d615887535b39c4b3c6…

1 0

David Hedberg : comdlg32: Implement GetFileName and SetFileName for the item dialog.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 36bf6e1afe0b4b21ecbc182df4e0419ea566462e URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bf6e1afe0b4b21ecbc182df… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:24 2011 +0200 comdlg32: Implement GetFileName and SetFileName for the item dialog. --- dlls/comdlg32/itemdlg.c | 70 ++++++++++++++++++++++++++++++++++++++-- dlls/comdlg32/tests/itemdlg.c | 14 +++++--- 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index ef4bb9d..682f01b 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -80,9 +80,52 @@ typedef struct FileDialogImpl { HWND dlg_hwnd; IExplorerBrowser *peb; DWORD ebevents_cookie; + + LPWSTR set_filename; } FileDialogImpl; /************************************************************************** + * Helper functions. + */ +static UINT get_file_name(FileDialogImpl *This, LPWSTR *str) +{ + HWND hwnd_edit = GetDlgItem(This->dlg_hwnd, IDC_FILENAME); + UINT len; + + if(!hwnd_edit) + { + if(This->set_filename) + { + len = lstrlenW(This->set_filename); + *str = CoTaskMemAlloc(sizeof(WCHAR)*(len+1)); + lstrcpyW(*str, This->set_filename); + return len; + } + return FALSE; + } + + len = SendMessageW(hwnd_edit, WM_GETTEXTLENGTH, 0, 0); + *str = CoTaskMemAlloc(sizeof(WCHAR)*(len+1)); + if(!*str) + return FALSE; + + SendMessageW(hwnd_edit, WM_GETTEXT, len+1, (LPARAM)*str); + return len; +} + +static BOOL set_file_name(FileDialogImpl *This, LPCWSTR str) +{ + HWND hwnd_edit = GetDlgItem(This->dlg_hwnd, IDC_FILENAME); + + if(This->set_filename) + LocalFree(This->set_filename); + + This->set_filename = StrDupW(str); + + return SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str); +} + +/************************************************************************** * Window related functions. */ static SIZE update_layout(FileDialogImpl *This) @@ -320,6 +363,10 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) else ShowWindow(hitem, SW_HIDE); + if(This->set_filename && + (hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAME)) ) + SendMessageW(hitem, WM_SETTEXT, 0, (LPARAM)This->set_filename); + init_explorerbrowser(This); update_layout(This); @@ -533,6 +580,8 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface) if(This->psia_selection) IShellItemArray_Release(This->psia_selection); if(This->psia_results) IShellItemArray_Release(This->psia_results); + LocalFree(This->set_filename); + HeapFree(GetProcessHeap(), 0, This); } @@ -752,15 +801,26 @@ static HRESULT WINAPI IFileDialog2_fnGetCurrentSelection(IFileDialog2 *iface, IS static HRESULT WINAPI IFileDialog2_fnSetFileName(IFileDialog2 *iface, LPCWSTR pszName) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, pszName); - return E_NOTIMPL; + TRACE("%p (%p)\n", iface, pszName); + + set_file_name(This, pszName); + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnGetFileName(IFileDialog2 *iface, LPWSTR *pszName) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, pszName); - return E_NOTIMPL; + TRACE("%p (%p)\n", iface, pszName); + + if(!pszName) + return E_INVALIDARG; + + *pszName = NULL; + if(get_file_name(This, pszName)) + return S_OK; + else + return E_FAIL; } static HRESULT WINAPI IFileDialog2_fnSetTitle(IFileDialog2 *iface, LPCWSTR pszTitle) @@ -1705,6 +1765,8 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->dlg_hwnd = NULL; fdimpl->peb = NULL; + fdimpl->set_filename = NULL; + /* FIXME: The default folder setting should be restored for the * application if it was previously set. */ SHGetDesktopFolder(&psf); diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 8f031c2..e14bfaa 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -371,8 +371,6 @@ static void test_basics(void) } /* GetFileName */ - todo_wine - { hr = IFileOpenDialog_GetFileName(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); filename = (void*)0xdeadbeef; @@ -385,7 +383,6 @@ static void test_basics(void) hr = IFileSaveDialog_GetFileName(pfsd, &filename); ok(hr == E_FAIL, "got 0x%08x.\n", hr); ok(filename == NULL, "got %p\n", filename); - } /* GetFileTypeIndex */ hr = IFileOpenDialog_GetFileTypeIndex(pfod, NULL); @@ -546,14 +543,16 @@ static void test_basics(void) } /* SetFileName */ - todo_wine - { hr = IFileOpenDialog_SetFileName(pfod, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_SetFileName(pfod, null); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_SetFileName(pfod, txt); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IFileOpenDialog_GetFileName(pfod, &filename); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, txt), "Strings do not match.\n"); + CoTaskMemFree(filename); hr = IFileSaveDialog_SetFileName(pfsd, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -561,7 +560,10 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_SetFileName(pfsd, txt); ok(hr == S_OK, "got 0x%08x\n", hr); - } + hr = IFileSaveDialog_GetFileName(pfsd, &filename); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, txt), "Strings do not match.\n"); + CoTaskMemFree(filename); /* SetFileNameLabel */ todo_wine

1 0

David Hedberg : comdlg32: Implement filetype filtering for the item dialog.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 209069ae46343cdf4ee1589774133d648d65c8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209069ae46343cdf4ee158977… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:26 2011 +0200 comdlg32: Implement filetype filtering for the item dialog. --- dlls/comdlg32/itemdlg.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 99e41a6..92ea665 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1746,8 +1746,47 @@ 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; + IShellItem *psi; + LPWSTR filename; + LPITEMIDLIST parent_pidl; + HRESULT hr; + ULONG attr; + TRACE("%p (%p, %p)\n", This, shv, pidl); + + if(!This->filterspec_count) + return S_OK; + + hr = SHGetIDListFromObject((IUnknown*)shv, &parent_pidl); + if(SUCCEEDED(hr)) + { + LPITEMIDLIST full_pidl = ILCombine(parent_pidl, pidl); + hr = SHCreateItemFromIDList(full_pidl, &IID_IShellItem, (void**)&psi); + ILFree(parent_pidl); + ILFree(full_pidl); + } + if(FAILED(hr)) + { + ERR("Failed to get shellitem (%08x).\n", hr); + return S_OK; + } + + hr = IShellItem_GetAttributes(psi, SFGAO_FOLDER|SFGAO_LINK, &attr); + if(FAILED(hr) || (attr & (SFGAO_FOLDER | SFGAO_LINK))) + { + IShellItem_Release(psi); + return S_OK; + } + + hr = S_OK; + if(SUCCEEDED(IShellItem_GetDisplayName(psi, SIGDN_PARENTRELATIVEPARSING, &filename))) + { + if(!PathMatchSpecW(filename, This->filterspecs[This->filetypeindex].pszSpec)) + hr = S_FALSE; + CoTaskMemFree(filename); + } + + IShellItem_Release(psi); + return hr; } static HRESULT WINAPI ICommDlgBrowser3_fnNotify(ICommDlgBrowser3 *iface,

1 0

David Hedberg : comdlg32: Update file name from selection in the item dialog.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: ccfbe722e3cb13d5d43ecc6312e8d2935b07385d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfbe722e3cb13d5d43ecc631… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:25 2011 +0200 comdlg32: Update file name from selection in the item dialog. --- dlls/comdlg32/itemdlg.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 682f01b..99e41a6 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -125,6 +125,76 @@ static BOOL set_file_name(FileDialogImpl *This, LPCWSTR str) return SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str); } +static void fill_filename_from_selection(FileDialogImpl *This) +{ + IShellItem *psi; + LPWSTR *names; + HRESULT hr; + UINT item_count, valid_count; + UINT len_total, i; + + if(!This->psia_selection) + return; + + hr = IShellItemArray_GetCount(This->psia_selection, &item_count); + if(FAILED(hr) || !item_count) + return; + + names = HeapAlloc(GetProcessHeap(), 0, item_count*sizeof(LPWSTR)); + + /* Get names of the selected items */ + valid_count = 0; len_total = 0; + for(i = 0; i < item_count; i++) + { + hr = IShellItemArray_GetItemAt(This->psia_selection, i, &psi); + if(SUCCEEDED(hr)) + { + UINT attr; + + hr = IShellItem_GetAttributes(psi, SFGAO_FOLDER, &attr); + if(SUCCEEDED(hr) && (attr & SFGAO_FOLDER)) + continue; /* FIXME: FOS_PICKFOLDERS */ + + hr = IShellItem_GetDisplayName(psi, SIGDN_PARENTRELATIVEPARSING, &names[valid_count]); + if(SUCCEEDED(hr)) + { + len_total += lstrlenW(names[valid_count]) + 3; + valid_count++; + } + IShellItem_Release(psi); + } + } + + if(valid_count == 1) + { + set_file_name(This, names[0]); + CoTaskMemFree(names[0]); + } + else if(valid_count > 1) + { + LPWSTR string = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len_total); + LPWSTR cur_point = string; + + for(i = 0; i < valid_count; i++) + { + LPWSTR file = names[i]; + *cur_point++ = '\"'; + lstrcpyW(cur_point, file); + cur_point += lstrlenW(file); + *cur_point++ = '\"'; + *cur_point++ = ' '; + CoTaskMemFree(file); + } + *(cur_point-1) = '\0'; + + set_file_name(This, string); + HeapFree(GetProcessHeap(), 0, string); + } + + HeapFree(GetProcessHeap(), 0, names); + return; +} + /************************************************************************** * Window related functions. */ @@ -1642,7 +1712,33 @@ 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); + IDataObject *new_selection; + HRESULT hr; + TRACE("%p (%p, %x)\n", This, shv, uChange); + + switch(uChange) + { + case CDBOSC_SELCHANGE: + if(This->psia_selection) + { + IShellItemArray_Release(This->psia_selection); + This->psia_selection = NULL; + } + + hr = IShellView_GetItemObject(shv, SVGIO_SELECTION, &IID_IDataObject, (void**)&new_selection); + if(SUCCEEDED(hr)) + { + hr = SHCreateShellItemArrayFromDataObject(new_selection, &IID_IShellItemArray, + (void**)&This->psia_selection); + if(SUCCEEDED(hr)) + fill_filename_from_selection(This); + + IDataObject_Release(new_selection); + } + break; + default: + TRACE("Unhandled state change\n"); + } return S_OK; }

1 0

David Hedberg : comdlg32: Add a couple of simple navigation buttons to the item dialog.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: a172365bd94126c7083248ac1575f25fbf6b4914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a172365bd94126c7083248ac1… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:28 2011 +0200 comdlg32: Add a couple of simple navigation buttons to the item dialog. --- dlls/comdlg32/itemdlg.c | 68 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 0d75c33..caa2454 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -38,6 +38,10 @@ #include "wine/debug.h" #include "wine/list.h" +#define IDC_NAV_TOOLBAR 200 +#define IDC_NAVBACK 201 +#define IDC_NAVFORWARD 202 + WINE_DEFAULT_DEBUG_CHANNEL(commdlg); enum ITEMDLG_TYPE { @@ -205,7 +209,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; + RECT toolbar_rc, ebrowser_rc; int missing_width, missing_height; static const UINT vspacing = 4, hspacing = 4; SIZE ret; @@ -308,10 +312,17 @@ static SIZE update_layout(FileDialogImpl *This) filename_rc.bottom = filename_rc.top + filename_height; } + hwnd = GetDlgItem(This->dlg_hwnd, IDC_NAV_TOOLBAR); + if(hwnd) + { + GetWindowRect(hwnd, &toolbar_rc); + MapWindowPoints(NULL, This->dlg_hwnd, (POINT*)&toolbar_rc, 2); + } + /* The ExplorerBrowser control. */ ebrowser_rc.left = dialog_rc.left + vspacing; - ebrowser_rc.top = 0; - ebrowser_rc.right = dialog_rc.right - vspacing; + ebrowser_rc.top = toolbar_rc.bottom + vspacing; + ebrowser_rc.right = dialog_rc.right - hspacing; ebrowser_rc.bottom = filename_rc.top - hspacing; /**** @@ -405,10 +416,44 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This) return S_OK; } +static void init_toolbar(FileDialogImpl *This, HWND hwnd) +{ + HWND htoolbar; + TBADDBITMAP tbab; + TBBUTTON button[2]; + + htoolbar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, + hwnd, (HMENU)IDC_NAV_TOOLBAR, NULL, NULL); + + tbab.hInst = HINST_COMMCTRL; + tbab.nID = IDB_HIST_LARGE_COLOR; + SendMessageW(htoolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + + button[0].iBitmap = HIST_BACK; + button[0].idCommand = IDC_NAVBACK; + button[0].fsState = TBSTATE_ENABLED; + button[0].fsStyle = BTNS_BUTTON; + button[0].dwData = 0; + button[0].iString = 0; + + button[1].iBitmap = HIST_FORWARD; + button[1].idCommand = IDC_NAVFORWARD; + button[1].fsState = TBSTATE_ENABLED; + button[1].fsStyle = BTNS_BUTTON; + button[1].dwData = 0; + button[1].iString = 0; + + SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)&button); + SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(24,24)); + SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); +} + 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); @@ -438,6 +483,7 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) SendMessageW(hitem, WM_SETTEXT, 0, (LPARAM)This->set_filename); init_explorerbrowser(This); + init_toolbar(This, hwnd); update_layout(This); return TRUE; @@ -495,6 +541,20 @@ static LRESULT on_idcancel(FileDialogImpl *This) return FALSE; } +static LRESULT on_browse_back(FileDialogImpl *This) +{ + TRACE("%p\n", This); + IExplorerBrowser_BrowseToIDList(This->peb, NULL, SBSP_NAVIGATEBACK); + return FALSE; +} + +static LRESULT on_browse_forward(FileDialogImpl *This) +{ + TRACE("%p\n", This); + IExplorerBrowser_BrowseToIDList(This->peb, NULL, SBSP_NAVIGATEFORWARD); + return FALSE; +} + static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { if(HIWORD(wparam) == CBN_SELCHANGE) @@ -522,6 +582,8 @@ static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { case IDOK: return on_idok(This); case IDCANCEL: return on_idcancel(This); + case IDC_NAVBACK: return on_browse_back(This); + case IDC_NAVFORWARD: return on_browse_forward(This); case IDC_FILETYPE: return on_command_filetype(This, wparam, lparam); default: TRACE("Unknown command.\n"); }

1 0

David Hedberg : comdlg32: Factor out some path building code from FILEDLG95_OnOpen.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: fcb169fe3667126ed256867114c35b39c0ad6cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb169fe3667126ed25686711… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:29 2011 +0200 comdlg32: Factor out some path building code from FILEDLG95_OnOpen. --- dlls/comdlg32/cdlg.h | 3 ++ dlls/comdlg32/filedlg.c | 71 +++++++++++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index 17492a3..fb6280d 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -173,6 +173,9 @@ typedef struct { HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv); HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv); +/* Shared helper functions */ +void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile); + /* ITEMIDLIST */ extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST); diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index c65c1f7..84b4eeb 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -568,6 +568,46 @@ static BOOL COMDLG32_GetDisplayNameOf(LPCITEMIDLIST pidl, LPWSTR pwszPath) { return SUCCEEDED(StrRetToBufW(&strret, pidl, pwszPath, MAX_PATH)); } +/****************************************************************************** + * COMDLG32_GetCanonicalPath [internal] + * + * Helper function to get the canonical path. + */ +void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, + LPWSTR lpstrFile, LPWSTR lpstrPathAndFile) +{ + WCHAR lpstrTemp[MAX_PATH]; + + /* Get the current directory name */ + if (!COMDLG32_GetDisplayNameOf(pidlAbsCurrent, lpstrPathAndFile)) + { + /* last fallback */ + GetCurrentDirectoryW(MAX_PATH, lpstrPathAndFile); + } + PathAddBackslashW(lpstrPathAndFile); + + TRACE("current directory=%s\n", debugstr_w(lpstrPathAndFile)); + + /* if the user specified a fully qualified path use it */ + if(PathIsRelativeW(lpstrFile)) + { + lstrcatW(lpstrPathAndFile, lpstrFile); + } + else + { + /* does the path have a drive letter? */ + if (PathGetDriveNumberW(lpstrFile) == -1) + lstrcpyW(lpstrPathAndFile+2, lpstrFile); + else + lstrcpyW(lpstrPathAndFile, lpstrFile); + } + + /* resolve "." and ".." */ + PathCanonicalizeW(lpstrTemp, lpstrPathAndFile ); + lstrcpyW(lpstrPathAndFile, lpstrTemp); + TRACE("canon=%s\n", debugstr_w(lpstrPathAndFile)); +} + /*********************************************************************** * ArrangeCtrlPositions [internal] * @@ -2200,7 +2240,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) UINT sizeUsed = 0; BOOL ret = TRUE; WCHAR lpstrPathAndFile[MAX_PATH]; - WCHAR lpstrTemp[MAX_PATH]; LPSHELLFOLDER lpsf = NULL; int nOpenAction; FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); @@ -2234,35 +2273,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) - the edit box contains ".." (or a path with ".." in it) */ - /* Get the current directory name */ - if (!COMDLG32_GetDisplayNameOf(fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathAndFile)) - { - /* last fallback */ - GetCurrentDirectoryW(MAX_PATH, lpstrPathAndFile); - } - PathAddBackslashW(lpstrPathAndFile); - - TRACE("current directory=%s\n", debugstr_w(lpstrPathAndFile)); - - /* if the user specified a fully qualified path use it */ - if(PathIsRelativeW(lpstrFileList)) - { - lstrcatW(lpstrPathAndFile, lpstrFileList); - } - else - { - /* does the path have a drive letter? */ - if (PathGetDriveNumberW(lpstrFileList) == -1) - lstrcpyW(lpstrPathAndFile+2, lpstrFileList); - else - lstrcpyW(lpstrPathAndFile, lpstrFileList); - } - - /* resolve "." and ".." */ - PathCanonicalizeW(lpstrTemp, lpstrPathAndFile ); - lstrcpyW(lpstrPathAndFile, lpstrTemp); - TRACE("canon=%s\n", debugstr_w(lpstrPathAndFile)); - + COMDLG32_GetCanonicalPath(fodInfos->ShellInfos.pidlAbsCurrent, lpstrFileList, lpstrPathAndFile); MemFree(lpstrFileList); /*

1 0

David Hedberg : comdlg32: Factor out some path validating code from FILEDLG95_OnOpen.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 7f5ccd32627c6c25afdbead35333580ac96f37c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5ccd32627c6c25afdbead35… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:30 2011 +0200 comdlg32: Factor out some path validating code from FILEDLG95_OnOpen. --- dlls/comdlg32/cdlg.h | 6 + dlls/comdlg32/filedlg.c | 252 ++++++++++++++++++++++++----------------------- 2 files changed, 135 insertions(+), 123 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index fb6280d..db0421e 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -175,6 +175,8 @@ HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) /* Shared helper functions */ void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile); +int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, + HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction); /* ITEMIDLIST */ @@ -190,4 +192,8 @@ extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); extern BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); +#define ONOPEN_BROWSE 1 +#define ONOPEN_OPEN 2 +#define ONOPEN_SEARCH 3 + #endif /* _WINE_DLL_CDLG_H */ diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 84b4eeb..1e33f5a 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2211,16 +2211,6 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) TRACE("got MRU path: %s\n", wine_dbgstr_w(stored_path)); } -/*********************************************************************** - * FILEDLG95_OnOpen - * - * Ok button WM_COMMAND message handler - * - * If the function succeeds, the return value is nonzero. - */ -#define ONOPEN_BROWSE 1 -#define ONOPEN_OPEN 2 -#define ONOPEN_SEARCH 3 static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) { WCHAR strMsgTitle[MAX_PATH]; @@ -2233,6 +2223,130 @@ static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); } +int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, + HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction) +{ + int nOpenAction = defAction; + LPWSTR lpszTemp, lpszTemp1; + LPITEMIDLIST pidl = NULL; + static const WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; + + /* check for invalid chars */ + if((strpbrkW(lpstrPathAndFile+3, szwInvalid) != NULL) && !(flags & OFN_NOVALIDATE)) + { + FILEDLG95_OnOpenMessage(hwnd, IDS_INVALID_FILENAME_TITLE, IDS_INVALID_FILENAME); + return FALSE; + } + + if (FAILED (SHGetDesktopFolder(ppsf))) return FALSE; + + lpszTemp1 = lpszTemp = lpstrPathAndFile; + while (lpszTemp1) + { + LPSHELLFOLDER lpsfChild; + WCHAR lpwstrTemp[MAX_PATH]; + DWORD dwEaten, dwAttributes; + LPWSTR p; + + lstrcpyW(lpwstrTemp, lpszTemp); + p = PathFindNextComponentW(lpwstrTemp); + + if (!p) break; /* end of path */ + + *p = 0; + lpszTemp = lpszTemp + lstrlenW(lpwstrTemp); + + /* There are no wildcards when OFN_NOVALIDATE is set */ + if(*lpszTemp==0 && !(flags & OFN_NOVALIDATE)) + { + static const WCHAR wszWild[] = { '*', '?', 0 }; + /* if the last element is a wildcard do a search */ + if(strpbrkW(lpszTemp1, wszWild) != NULL) + { + nOpenAction = ONOPEN_SEARCH; + break; + } + } + lpszTemp1 = lpszTemp; + + TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_w(lpszTemp), *ppsf); + + /* append a backslash to drive letters */ + if(lstrlenW(lpwstrTemp)==2 && lpwstrTemp[1] == ':' && + ((lpwstrTemp[0] >= 'a' && lpwstrTemp[0] <= 'z') || + (lpwstrTemp[0] >= 'A' && lpwstrTemp[0] <= 'Z'))) + { + PathAddBackslashW(lpwstrTemp); + } + + dwAttributes = SFGAO_FOLDER; + if(SUCCEEDED(IShellFolder_ParseDisplayName(*ppsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes))) + { + /* the path component is valid, we have a pidl of the next path component */ + TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl); + if(dwAttributes & SFGAO_FOLDER) + { + if(FAILED(IShellFolder_BindToObject(*ppsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild))) + { + ERR("bind to failed\n"); /* should not fail */ + break; + } + IShellFolder_Release(*ppsf); + *ppsf = lpsfChild; + lpsfChild = NULL; + } + else + { + TRACE("value\n"); + + /* end dialog, return value */ + nOpenAction = ONOPEN_OPEN; + break; + } + COMDLG32_SHFree(pidl); + pidl = NULL; + } + else if (!(flags & OFN_NOVALIDATE)) + { + if(*lpszTemp || /* points to trailing null for last path element */ + (lpwstrTemp[strlenW(lpwstrTemp)-1] == '\\')) /* or if last element ends in '\' */ + { + if(flags & OFN_PATHMUSTEXIST) + { + FILEDLG95_OnOpenMessage(hwnd, 0, IDS_PATHNOTEXISTING); + break; + } + } + else + { + if( (flags & OFN_FILEMUSTEXIST) && !isSaveDlg ) + { + FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING); + break; + } + } + /* change to the current folder */ + nOpenAction = ONOPEN_OPEN; + break; + } + else + { + nOpenAction = ONOPEN_OPEN; + break; + } + } + if(pidl) COMDLG32_SHFree(pidl); + + return nOpenAction; +} + +/*********************************************************************** + * FILEDLG95_OnOpen + * + * Ok button WM_COMMAND message handler + * + * If the function succeeds, the return value is nonzero. + */ BOOL FILEDLG95_OnOpen(HWND hwnd) { LPWSTR lpstrFileList; @@ -2294,120 +2408,12 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else nOpenAction = ONOPEN_BROWSE; - /* don't apply any checks with OFN_NOVALIDATE */ - { - LPWSTR lpszTemp, lpszTemp1; - LPITEMIDLIST pidl = NULL; - static const WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; - - /* check for invalid chars */ - if((strpbrkW(lpstrPathAndFile+3, szwInvalid) != NULL) && !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) - { - FILEDLG95_OnOpenMessage(hwnd, IDS_INVALID_FILENAME_TITLE, IDS_INVALID_FILENAME); - ret = FALSE; + nOpenAction = FILEDLG95_ValidatePathAction(lpstrPathAndFile, &lpsf, hwnd, + fodInfos->ofnInfos->Flags, + fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG, + nOpenAction); + if(!nOpenAction) goto ret; - } - - if (FAILED (SHGetDesktopFolder(&lpsf))) return FALSE; - - lpszTemp1 = lpszTemp = lpstrPathAndFile; - while (lpszTemp1) - { - LPSHELLFOLDER lpsfChild; - WCHAR lpwstrTemp[MAX_PATH]; - DWORD dwEaten, dwAttributes; - LPWSTR p; - - lstrcpyW(lpwstrTemp, lpszTemp); - p = PathFindNextComponentW(lpwstrTemp); - - if (!p) break; /* end of path */ - - *p = 0; - lpszTemp = lpszTemp + lstrlenW(lpwstrTemp); - - /* There are no wildcards when OFN_NOVALIDATE is set */ - if(*lpszTemp==0 && !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) - { - static const WCHAR wszWild[] = { '*', '?', 0 }; - /* if the last element is a wildcard do a search */ - if(strpbrkW(lpszTemp1, wszWild) != NULL) - { - nOpenAction = ONOPEN_SEARCH; - break; - } - } - lpszTemp1 = lpszTemp; - - TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_w(lpszTemp), lpsf); - - /* append a backslash to drive letters */ - if(lstrlenW(lpwstrTemp)==2 && lpwstrTemp[1] == ':' && - ((lpwstrTemp[0] >= 'a' && lpwstrTemp[0] <= 'z') || - (lpwstrTemp[0] >= 'A' && lpwstrTemp[0] <= 'Z'))) - { - PathAddBackslashW(lpwstrTemp); - } - - dwAttributes = SFGAO_FOLDER; - if(SUCCEEDED(IShellFolder_ParseDisplayName(lpsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes))) - { - /* the path component is valid, we have a pidl of the next path component */ - TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl); - if(dwAttributes & SFGAO_FOLDER) - { - if(FAILED(IShellFolder_BindToObject(lpsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild))) - { - ERR("bind to failed\n"); /* should not fail */ - break; - } - IShellFolder_Release(lpsf); - lpsf = lpsfChild; - lpsfChild = NULL; - } - else - { - TRACE("value\n"); - - /* end dialog, return value */ - nOpenAction = ONOPEN_OPEN; - break; - } - COMDLG32_SHFree(pidl); - pidl = NULL; - } - else if (!(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) - { - if(*lpszTemp || /* points to trailing null for last path element */ - (lpwstrTemp[strlenW(lpwstrTemp)-1] == '\\')) /* or if last element ends in '\' */ - { - if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST) - { - FILEDLG95_OnOpenMessage(hwnd, 0, IDS_PATHNOTEXISTING); - break; - } - } - else - { - if( (fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST) && - !( fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG ) ) - { - FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING); - break; - } - } - /* change to the current folder */ - nOpenAction = ONOPEN_OPEN; - break; - } - else - { - nOpenAction = ONOPEN_OPEN; - break; - } - } - if(pidl) COMDLG32_SHFree(pidl); - } /* Step 3: here we have a cleaned up and validated path

1 0

David Hedberg : comdlg32: We only want to check the low word of wparam.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: b2575dab623acf5527f20d2d863ae5364fe93837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2575dab623acf5527f20d2d8… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:27 2011 +0200 comdlg32: We only want to check the low word of wparam. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 92ea665..0d75c33 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -518,7 +518,7 @@ static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM l static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { - switch(wparam) + switch(LOWORD(wparam)) { case IDOK: return on_idok(This); case IDCANCEL: return on_idcancel(This);

1 0

André Hentschel : shlwapi: Implement wow64 reporting.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: a4d8b22f4377bd4a3ec11e5f1911601117d6c4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d8b22f4377bd4a3ec11e5f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 31 19:44:26 2011 +0200 shlwapi: Implement wow64 reporting. --- dlls/shlwapi/ordinal.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 5b0626d..0df1646 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4063,8 +4063,11 @@ BOOL WINAPI IsOS(DWORD feature) case OS_ANYSERVER: ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) case OS_WOW6432: - FIXME("(OS_WOW6432) Should we check this?\n"); - return FALSE; + { + BOOL is_wow64; + IsWow64Process(GetCurrentProcess(), &is_wow64); + return is_wow64; + } case OS_WEBSERVER: ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) case OS_SMALLBUSINESSSERVER:

1 0