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

Marcus Meissner : mscms: Fixed bad sizeof() (Coverity).
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: aca1b275aa5ad5be910d872e68b0c034e7aebef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca1b275aa5ad5be910d872e6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 2 09:28:18 2011 +0200 mscms: Fixed bad sizeof() (Coverity). --- dlls/mscms/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 801ef4d..49230ec 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -238,7 +238,7 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil if (out_format == TYPE_Lab_16) cmsconvert = cmsCreateLabProfile( NULL ); } - cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE *) ); + cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ); if (cmsprofiles) { cmsprofiles[0] = profile0->cmsprofile;

1 0

Marcus Meissner : mscms: Added missing breaks (Coverity).
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 933b3af981d11628b2c5e98a6f97a74a529e830f URL: http://source.winehq.org/git/wine.git/?a=commit;h=933b3af981d11628b2c5e98a6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 2 09:36:56 2011 +0200 mscms: Added missing breaks (Coverity). --- dlls/mscms/transform.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 49230ec..a5b3486 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -384,6 +384,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_Lab: { @@ -399,6 +400,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_GRAY: { @@ -414,6 +416,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_CMYK: { @@ -429,6 +432,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_XYZ: { @@ -444,6 +448,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.0 and 1.3.17
by Jeremy Newman 04 Apr '11

04 Apr '11

Module: website Branch: master Commit: c62bc720b0e6981f95be07ead242f4e2934b2be6 URL: http://source.winehq.org/git/website.git/?a=commit;h=c62bc720b0e6981f95be07… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Apr 1 19:59:55 2011 +0200 Polish translation for release 1.3.0 and 1.3.17 --- news/pl/2010073001.xml | 17 +++++++++++++++++ news/pl/2011040101.xml | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/news/pl/2010073001.xml b/news/pl/2010073001.xml new file mode 100644 index 0000000..e4fe67b --- /dev/null +++ b/news/pl/2010073001.xml @@ -0,0 +1,17 @@ +<news> +<date>Lipiec 30, 2010</date> +<title>Wydano Wine 1.3.0</title> +<body> + Wydanie rozwojowe Wine 1.3.0 jest już dostępne. + <a href="{$root}/announce/1.3.0">Co nowego</a> w tym wydaniu: +<ul> + <li>Początki interfejsu użytkownika dla wbudowanego Internet Explorer.</li> + <li>Wsparcie dla przeciągnij i upuść między procesami OLE.</li> + <li>Nowy wbudowany program wscript.exe (Windows Script Host).</li> + <li>Dialogi otwórz/zapisz zapamiętują ostatnio używany katalog.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.0.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2011040101.xml b/news/pl/2011040101.xml new file mode 100644 index 0000000..9256110 --- /dev/null +++ b/news/pl/2011040101.xml @@ -0,0 +1,17 @@ +<news> +<date>Kwiecień 1, 2011</date> +<title>Wydano Wine 1.3.17</title> +<body> + Wydanie rozwojowe Wine 1.3.17 jest już dostępne. + <a href="{$root}/announce/1.3.17">Co nowego</a> w tym wydaniu: +<ul> + <li>Implementacja nowych dialogów plikowych z Visty.</li> + <li>Wstępne wsparcie dla łatania w instalatorach MSI.</li> + <li>Ulepszenia do panelu kalendarza.</li> + <li>Kilka poprawek w skojarzeniach plików.</li> + <li>Wiele menu we wbudowanych aplikacjach zostało oczyszczonych.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.17.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.3.17 freigegeben
by Jeremy Newman 01 Apr '11

01 Apr '11

Module: website Branch: master Commit: 6e2281b3b7713a75bbe556d949680b28e3811b7e URL: http://source.winehq.org/git/website.git/?a=commit;h=6e2281b3b7713a75bbe556… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 1 20:03:15 2011 +0200 Wine 1.3.17 freigegeben --- news/de/2011040101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011040101.xml b/news/de/2011040101.xml new file mode 100644 index 0000000..2b4a539 --- /dev/null +++ b/news/de/2011040101.xml @@ -0,0 +1,17 @@ +<news> +<date>1. April 2011</date> +<title>Wine 1.3.17 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Implementierung des neuen Vista Dateidialogs.</li> + <li>Anfängliche Unterstützung fürs patchen in MSI Setups.</li> + <li>Verbesserungen am Kalendersteuerelement.</li> + <li>Ein paar Behebungen für Dateiverknüpfungen.</li> + <li>Menüs in eingebauten Anwendungen aufgeräumt.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.17.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.17
by Jeremy Newman 01 Apr '11

01 Apr '11

Module: website Branch: master Commit: 30254c9c7154b7f3e2574dd155890dc6f9de1a40 URL: http://source.winehq.org/git/website.git/?a=commit;h=30254c9c7154b7f3e2574d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 1 20:21:59 2011 +0200 French translation for release 1.3.17 --- news/fr/2011040101.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011040101.xml b/news/fr/2011040101.xml new file mode 100644 index 0000000..4150141 --- /dev/null +++ b/news/fr/2011040101.xml @@ -0,0 +1,20 @@ +<news> +<date></date> +<title>Sortie de Wine 1.3.17</title> +<body> + La version de développement 1.3.17 de Wine est disponible. + <a href="{$root}/announce/1.3.17">Nouveautés</a> de cette version : +<ul> + <li>Implémentation des nouvelles boîtes de dialogue Vista.</li> + <li>Prise en charge initiale des patchs dans les programmes d'installation MSI.</li> + <li>Améliorations du contrôle calendrier.</li> + <li>Quelques corrections pour les associations de fichiers.</li> + <li>Nettoyage des menus dans les applications intégrées.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.17.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.17
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: website Branch: master Commit: ba6469753266051d6af89326ff0e593ae6b956c7 URL: http://source.winehq.org/git/website.git/?a=commit;h=ba6469753266051d6af893… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 19:38:46 2011 +0200 Wine release 1.3.17 --- news/en/2011040101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011040101.xml b/news/en/2011040101.xml new file mode 100644 index 0000000..ee3e60a --- /dev/null +++ b/news/en/2011040101.xml @@ -0,0 +1,17 @@ +<news> +<date>April 1, 2011</date> +<title>Wine 1.3.17 Released</title> +<body> + The Wine development release 1.3.17 is now available. + <a href="{$root}/announce/1.3.17">What's new</a> in this release: +<ul> + <li>Implementation of the new Vista file dialogs.</li> + <li>Initial support for patching in MSI installers.</li> + <li>Improvements to the calendar control.</li> + <li>A few fixes for file associations.</li> + <li>Menus cleaned up in built-in applications.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.17.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.17.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: 123e4ad41d81bf4edc56eeab9f3cece9b511f690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123e4ad41d81bf4edc56eeab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 19:29:41 2011 +0200 Release 1.3.17. --- ANNOUNCE | 1066 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 464 insertions(+), 622 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=123e4ad41d81bf4edc56e…

1 0

Tag wine-1.3.17 : Alexandre Julliard : Release 1.3.17
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: refs/tags/wine-1.3.17 Tag: 017ac0f52f50c82ceda695a08ca4daec4dd2cec4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=017ac0f52f50c82ceda695a08ca4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 19:29:41 2011 +0200 Release 1.3.17

1 0

David Hedberg : comdlg32: Factor out filename string splitting code.
by Alexandre Julliard 01 Apr '11

01 Apr '11

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

David Hedberg : comdlg32: Implement opening files with the item dialog.
by Alexandre Julliard 01 Apr '11

01 Apr '11

Module: wine Branch: master Commit: f2231f8419a80c3a9653252028658ea6c9040a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2231f8419a80c3a965325202… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:32 2011 +0200 comdlg32: Implement opening files with the item dialog. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/cdlg32.c | 3 +- dlls/comdlg32/itemdlg.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index 00ec357..e1b341c 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -192,6 +192,7 @@ extern UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST); extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); extern BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); +extern LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID); #define ONOPEN_BROWSE 1 #define ONOPEN_OPEN 2 diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 4f6b98a..ad44bbb 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -57,6 +57,7 @@ UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST); LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); +LPITEMIDLIST (WINAPI *COMDLG32_SHSimpleIDListFromPathAW)(LPCVOID); /*********************************************************************** * DllMain (COMDLG32.init) @@ -96,7 +97,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) GPA(COMDLG32_PIDL_ILGetSize, SHELL32_hInstance, (LPCSTR)152L); /* SHELL */ - + GPA(COMDLG32_SHSimpleIDListFromPathAW, SHELL32_hInstance, (LPCSTR)162); GPA(COMDLG32_SHAlloc, SHELL32_hInstance, (LPCSTR)196L); GPA(COMDLG32_SHFree, SHELL32_hInstance, (LPCSTR)195L); diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index caa2454..35910c3 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -199,6 +199,113 @@ static void fill_filename_from_selection(FileDialogImpl *This) return; } +static HRESULT on_default_action(FileDialogImpl *This) +{ + IShellFolder *psf_parent, *psf_desktop; + LPITEMIDLIST *pidla; + LPITEMIDLIST current_folder; + LPWSTR fn_iter, files, tmp_files; + UINT file_count = 0, len, i; + int open_action; + HRESULT hr, ret = E_FAIL; + + len = get_file_name(This, &tmp_files); + if(len) + { + UINT size_used; + file_count = COMDLG32_SplitFileNames(tmp_files, len, &files, &size_used); + } + if(!file_count) return E_FAIL; + + hr = SHGetIDListFromObject((IUnknown*)This->psi_folder, &current_folder); + if(FAILED(hr)) + { + ERR("Failed to get pidl for current directory.\n"); + return hr; + } + + TRACE("Acting on %d file(s).\n", file_count); + + pidla = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST) * file_count); + open_action = ONOPEN_OPEN; + fn_iter = files; + + for(i = 0; i < file_count && open_action == ONOPEN_OPEN; i++) + { + WCHAR canon_filename[MAX_PATH]; + psf_parent = NULL; + + COMDLG32_GetCanonicalPath(current_folder, fn_iter, canon_filename); + + if( (This->options & FOS_NOVALIDATE) && + !(This->options & FOS_FILEMUSTEXIST) ) + open_action = ONOPEN_OPEN; + else + open_action = ONOPEN_BROWSE; + + open_action = FILEDLG95_ValidatePathAction(canon_filename, &psf_parent, This->dlg_hwnd, + This->options, (This->dlg_type == ITEMDLG_TYPE_SAVE), + open_action); + + pidla[i] = COMDLG32_SHSimpleIDListFromPathAW(canon_filename); + + if(psf_parent && !(open_action == ONOPEN_BROWSE)) + IShellItem_Release(psf_parent); + + fn_iter += (WCHAR)lstrlenW(fn_iter) + 1; + } + + HeapFree(GetProcessHeap(), 0, files); + ILFree(current_folder); + + if((This->options & FOS_PICKFOLDERS) && open_action == ONOPEN_BROWSE) + open_action = ONOPEN_OPEN; /* FIXME: Multiple folders? */ + + switch(open_action) + { + case ONOPEN_SEARCH: + FIXME("Filtering not implemented.\n"); + break; + + case ONOPEN_BROWSE: + hr = IExplorerBrowser_BrowseToObject(This->peb, (IUnknown*)psf_parent, SBSP_DEFBROWSER); + if(FAILED(hr)) + ERR("Failed to browse to directory: %08x\n", hr); + + IShellItem_Release(psf_parent); + break; + + case ONOPEN_OPEN: + hr = SHGetDesktopFolder(&psf_desktop); + if(SUCCEEDED(hr)) + { + if(This->psia_results) + IShellItemArray_Release(This->psia_results); + + hr = SHCreateShellItemArray(NULL, psf_desktop, file_count, (PCUITEMID_CHILD_ARRAY)pidla, + &This->psia_results); + + if(SUCCEEDED(hr)) + ret = S_OK; + + IShellFolder_Release(psf_desktop); + } + break; + + default: + ERR("Failed.\n"); + break; + } + + /* Clean up */ + for(i = 0; i < file_count; i++) + ILFree(pidla[i]); + HeapFree(GetProcessHeap(), 0, pidla); + + /* Success closes the dialog */ + return ret; +} + /************************************************************************** * Window related functions. */ @@ -527,7 +634,8 @@ static LRESULT on_idok(FileDialogImpl *This) { TRACE("%p\n", This); - EndDialog(This->dlg_hwnd, S_OK); + if(SUCCEEDED(on_default_action(This))) + EndDialog(This->dlg_hwnd, S_OK); return FALSE; } @@ -1766,7 +1874,14 @@ static HRESULT WINAPI ICommDlgBrowser3_fnOnDefaultCommand(ICommDlgBrowser3 *ifac IShellView *shv) { FileDialogImpl *This = impl_from_ICommDlgBrowser3(iface); - FIXME("Stub: %p (%p)\n", This, shv); + HRESULT hr; + TRACE("%p (%p)\n", This, shv); + + hr = on_default_action(This); + + if(SUCCEEDED(hr)) + EndDialog(This->dlg_hwnd, S_OK); + return S_OK; }

1 0