Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- only display filename in the title for the file property dialog

Browse source 
- pass the stripped filename to SH_FileVersionDlgProc
- fix identation
- fix bug 3401

svn path=/trunk/; revision=34152
This commit is contained in:
Johannes Anderwald 2008-06-28 13:15:16 +00:00
parent e66d0d8a49
commit 88b230362c
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/dll/win32/shell32/fprop.c
View file

@ -667,8 +667,9 @@ SH_ShowPropertiesDialog(PCWSTR lpf)
HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE];
HPROPSHEETPAGE hpage;
WCHAR wFileName[MAX_PATH];
UINT num_pages = 0;
DWORD dwHandle = 0;
UINT num_pages = 0;
DWORD dwHandle = 0;
WCHAR * pFileName;
TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(lpf));
@ -690,10 +691,10 @@ SH_ShowPropertiesDialog(PCWSTR lpf)
*dst = '\0';
}
else
{
strcpyW(wFileName, lpf);
}
else
{
strcpyW(wFileName, lpf);
}
if (PathIsDirectoryW(wFileName) || strlenW(wFileName) == 3)
{
@ -708,19 +709,27 @@ SH_ShowPropertiesDialog(PCWSTR lpf)
hppages[num_pages] = hpage;
num_pages++;
if ( GetFileVersionInfoSizeW(lpf, &dwHandle) )
{
if ( (hpage = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)lpf, NULL))!= NULL)
{
hppages[num_pages] = hpage;
num_pages++;
}
}
{
if ( (hpage = SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",SH_FileVersionDlgProc, (LPARAM)wFileName, NULL))!= NULL)
{
hppages[num_pages] = hpage;
num_pages++;
}
}
pFileName = wcsrchr(wFileName, '\\');
if (!pFileName)
pFileName = wFileName;
else
pFileName++;
memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW));
pinfo.dwSize = sizeof(PROPSHEETHEADERW);
pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE;
pinfo.nPages = num_pages;
pinfo.u3.phpage = hppages;
pinfo.pszCaption = wFileName;
pinfo.pszCaption = pFileName;
return (PropertySheetW(&pinfo) != -1);
}
/*EOF */