Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
- Formatting + changed few declarations.

svn path=/trunk/; revision=54903
This commit is contained in:
Rafal Harabien 2012-01-10 16:01:13 +00:00
parent d35c3eedcb
commit 95da52581a
2 changed files with 101 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

233
reactos/dll/win32/shell32/fprop.cpp
View file

@ -49,7 +49,7 @@ static LONG SH_GetAssociatedApplication(WCHAR *pwszFileExt, WCHAR *pwszAssocApp)
notepad.exe "%1" notepad.exe "%1"
%systemroot%\notepad.exe "%1" %systemroot%\notepad.exe "%1"
etc etc
Maybe there is code to do that somewhere? Maybe there is code to do that somewhere?
dll\win32\shell32\shlexec.c for example? */ dll\win32\shell32\shlexec.c for example? */
} }
@ -64,13 +64,13 @@ static LONG SH_FileGeneralOpensWith(HWND hwndDlg, WCHAR *fileext)
LONG result; LONG result;
WCHAR wAppName[MAX_PATH] = {0}; WCHAR wAppName[MAX_PATH] = {0};
WCHAR wAssocApp[MAX_PATH] = {0}; WCHAR wAssocApp[MAX_PATH] = {0};
result = SH_GetAssociatedApplication(fileext, wAssocApp); result = SH_GetAssociatedApplication(fileext, wAssocApp);
if (result == ERROR_SUCCESS) if (result == ERROR_SUCCESS)
{ {
_wsplitpath(wAssocApp, NULL, NULL, wAppName, NULL); _wsplitpath(wAssocApp, NULL, NULL, wAppName, NULL);
SetDlgItemTextW(hwndDlg, 14007, wAppName); SetDlgItemTextW(hwndDlg, 14007, wAppName);
} }
@ -112,8 +112,8 @@ LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT
swprintf(szNumber, L"%I64u", lpQwSize->QuadPart); swprintf(szNumber, L"%I64u", lpQwSize->QuadPart);
// Get system strings for decimal and thousand separators. // Get system strings for decimal and thousand separators.
GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSep, sizeof(szDecimalSep)/sizeof(*szDecimalSep)); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSep, sizeof(szDecimalSep) / sizeof(*szDecimalSep));
GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szThousandSep, sizeof(szThousandSep)/sizeof(*szThousandSep)); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szThousandSep, sizeof(szThousandSep) / sizeof(*szThousandSep));
// Initialize format for printing the number in bytes // Initialize format for printing the number in bytes
ZeroMemory(&nf, sizeof(nf)); ZeroMemory(&nf, sizeof(nf));
@ -128,7 +128,7 @@ LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT
Len = GetLocaleInfoW(LOCALE_USER_DEFAULT, Len = GetLocaleInfoW(LOCALE_USER_DEFAULT,
LOCALE_SGROUPING, LOCALE_SGROUPING,
szGrouping, szGrouping,
sizeof(szGrouping)/sizeof(*szGrouping)); sizeof(szGrouping) / sizeof(*szGrouping));
// Convert grouping specs from string to integer // Convert grouping specs from string to integer
for (i = 0; i < Len; i++) for (i = 0; i < Len; i++)
@ -189,16 +189,14 @@ LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT
*/ */
HPROPSHEETPAGE HPROPSHEETPAGE
SH_CreatePropertySheetPage(LPCSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) SH_CreatePropertySheetPage(LPCSTR pszResName, DLGPROC pfnDlgProc, LPARAM lParam, LPWSTR pwszTitle)
{ {
HRSRC hRes; HRSRC hRes;
LPVOID lpsztemplate;
PROPSHEETPAGEW ppage;
if (resname == NULL) if (pszResName == NULL)
return (HPROPSHEETPAGE)0; return (HPROPSHEETPAGE)0;
hRes = FindResourceA(shell32_hInstance, resname, (LPSTR)RT_DIALOG); hRes = FindResourceA(shell32_hInstance, pszResName, (LPSTR)RT_DIALOG);
if (hRes == NULL) if (hRes == NULL)
{ {
@ -206,25 +204,24 @@ SH_CreatePropertySheetPage(LPCSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWST
return (HPROPSHEETPAGE)0; return (HPROPSHEETPAGE)0;
} }
lpsztemplate = LoadResource(shell32_hInstance, hRes); LPVOID pTemplate = LoadResource(shell32_hInstance, hRes);
if (lpsztemplate == NULL) if (pTemplate == NULL)
return (HPROPSHEETPAGE)0; return (HPROPSHEETPAGE)0;
memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW)); PROPSHEETPAGEW Page;
ppage.dwSize = sizeof(PROPSHEETPAGEW); memset(&Page, 0x0, sizeof(PROPSHEETPAGEW));
ppage.dwFlags = PSP_DLGINDIRECT; Page.dwSize = sizeof(PROPSHEETPAGEW);
ppage.pResource = (DLGTEMPLATE *)lpsztemplate; Page.dwFlags = PSP_DLGINDIRECT;
ppage.pfnDlgProc = dlgproc; Page.pResource = (DLGTEMPLATE *)pTemplate;
ppage.lParam = lParam; Page.pfnDlgProc = pfnDlgProc;
ppage.pszTitle = szTitle; Page.lParam = lParam;
Page.pszTitle = pwszTitle;
if (szTitle) if (pwszTitle)
{ Page.dwFlags |= PSP_USETITLE;
ppage.dwFlags |= PSP_USETITLE;
}
return CreatePropertySheetPageW(&ppage); return CreatePropertySheetPageW(&Page);
} }
/************************************************************************* /*************************************************************************
@ -364,10 +361,6 @@ SHFileGeneralGetFileTimeString(LPFILETIME lpFileTime, WCHAR *lpResult)
{ {
FILETIME ft; FILETIME ft;
SYSTEMTIME dt; SYSTEMTIME dt;
WORD wYear;
static const WCHAR wFormat[] = {
'%', '0', '2', 'd', '/', '%', '0', '2', 'd', '/', '%', '0', '4', 'd',
' ', ' ', '%', '0', '2', 'd', ':', '%', '0', '2', 'u', 0 };
if (lpFileTime == NULL || lpResult == NULL) if (lpFileTime == NULL || lpResult == NULL)
return FALSE; return FALSE;
@ -377,10 +370,8 @@ SHFileGeneralGetFileTimeString(LPFILETIME lpFileTime, WCHAR *lpResult)
FileTimeToSystemTime(&ft, &dt); FileTimeToSystemTime(&ft, &dt);
wYear = dt.wYear;
/* ddmmyy */ /* ddmmyy */
swprintf(lpResult, wFormat, dt.wDay, dt.wMonth, wYear, dt.wHour, dt.wMinute); swprintf(lpResult, L"%02hu/%02hu/%04hu %02hu:%02hu", dt.wDay, dt.wMonth, dt.wYear, dt.wHour, dt.wMinute);
TRACE("result %s\n", debugstr_w(lpResult)); TRACE("result %s\n", debugstr_w(lpResult));
return TRUE; return TRUE;
@ -405,7 +396,7 @@ SH_FileGeneralSetText(HWND hwndDlg, WCHAR *lpstr)
if (lpstr == NULL) if (lpstr == NULL)
return FALSE; return FALSE;
lpdir = wcsrchr(lpstr, '\\'); /* find the last occurence of '\\' */ lpdir = wcsrchr(lpstr, L'\\'); /* find the last occurence of '\\' */
plength = wcslen(lpstr); plength = wcslen(lpstr);
flength = wcslen(lpdir); flength = wcslen(lpdir);
@ -551,30 +542,27 @@ SH_FileVersionQuerySetText(HWND hwndDlg, DWORD dlgId, LPVOID pInfo, WCHAR *text,
*/ */
BOOL BOOL
SH_FileVersionQuerySetListText(HWND hwndDlg, LPVOID pInfo, const WCHAR *text, WCHAR **resptr, WORD lang, WORD code) SH_FileVersionQuerySetListText(HWND hwndDlg, LPVOID pInfo, LPCWSTR pwszProp, WORD wLang, WORD wCode)
{ {
UINT reslen;
HWND hDlgCtrl; HWND hDlgCtrl;
UINT index; UINT Index;
static const WCHAR wFormat[] = { UINT cbResult;
'\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o', WCHAR buff[256], *pwszResult = NULL;
'\\', '%', '0', '4', 'x', '%', '0', '4', 'x', '\\', '%', 's', 0 };
WCHAR buff[256];
TRACE("text %s, resptr %p hwndDlg %p\n", debugstr_w(text), resptr, hwndDlg); TRACE("pwszProp %s, hwndDlg %p\n", debugstr_w(pwszProp), hwndDlg);
if (hwndDlg == NULL || resptr == NULL || text == NULL) if (hwndDlg == NULL || pwszProp == NULL)
return FALSE; return FALSE;
swprintf(buff, wFormat, lang, code, text); swprintf(buff, L"\\StringFileInfo\\%04x%04x\\%s", wLang, wCode, pwszProp);
if (VerQueryValueW(pInfo, buff, (LPVOID *)resptr, &reslen)) if (VerQueryValueW(pInfo, buff, (LPVOID *)&pwszResult, &cbResult))
{ {
/* listbox name property */ /* listbox name property */
hDlgCtrl = GetDlgItem(hwndDlg, 14009); hDlgCtrl = GetDlgItem(hwndDlg, 14009);
TRACE("%s :: %s\n", debugstr_w(text), debugstr_w(*resptr)); TRACE("%s :: %s\n", debugstr_w(pwszProp), debugstr_w(pwszResult));
index = SendMessageW(hDlgCtrl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)text); Index = SendMessageW(hDlgCtrl, LB_ADDSTRING, (WPARAM) -1, (LPARAM)pwszProp);
SendMessageW(hDlgCtrl, LB_SETITEMDATA, (WPARAM)index, (LPARAM)(WCHAR *)*resptr); SendMessageW(hDlgCtrl, LB_SETITEMDATA, (WPARAM)Index, (LPARAM)(WCHAR *)pwszResult);
return TRUE; return TRUE;
} }
@ -589,7 +577,7 @@ SH_FileVersionQuerySetListText(HWND hwndDlg, LPVOID pInfo, const WCHAR *text, WC
*/ */
BOOL BOOL
SH_FileVersionInitialize(HWND hwndDlg, WCHAR *lpfilename) SH_FileVersionInitialize(HWND hwndDlg, LPCWSTR pwszFilename)
{ {
LPVOID pBuf; LPVOID pBuf;
DWORD versize; DWORD versize;
@ -602,37 +590,11 @@ SH_FileVersionInitialize(HWND hwndDlg, WCHAR *lpfilename)
WORD code = 0; WORD code = 0;
LPLANGANDCODEPAGE lplangcode; LPLANGANDCODEPAGE lplangcode;
WCHAR *str; WCHAR *str;
static const WCHAR wVersionFormat[] = {
'%', 'd', '.', '%', 'd', '.', '%', 'd', '.', '%', 'd', 0 };
static const WCHAR wFileDescriptionFormat[] = {
'\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o',
'\\', '%', '0', '4', 'x', '%', '0', '4', 'x',
'\\', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 0 };
static const WCHAR wLegalCopyrightFormat[] = {
'\\', 'S', 't', 'r', 'i', 'n', 'g', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o',
'\\', '%', '0', '4', 'x', '%', '0', '4', 'x',
'\\', 'L', 'e', 'g', 'a', 'l', 'C', 'o', 'p', 'y', 'r', 'i', 'g', 'h', 't', 0 };
static const WCHAR wTranslation[] = {
'V', 'a', 'r', 'F', 'i', 'l', 'e', 'I', 'n', 'f', 'o',
'\\', 'T', 'r', 'a', 'n', 's', 'l', 'a', 't', 'i', 'o', 'n', 0 };
static const WCHAR wCompanyName[] = {
'C', 'o', 'm', 'p', 'a', 'n', 'y', 'N', 'a', 'm', 'e', 0 };
static const WCHAR wFileVersion[] = {
'F', 'i', 'l', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 };
static const WCHAR wInternalName[] = {
'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'N', 'a', 'm', 'e', 0 };
static const WCHAR wOriginalFilename[] = {
'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'F', 'i', 'l', 'e', 'n', 'a', 'm', 'e', 0 };
static const WCHAR wProductName[] = {
'P', 'r', 'o', 'd', 'u', 'c', 't', 'N', 'a', 'm', 'e', 0 };
static const WCHAR wProductVersion[] = {
'P', 'r', 'o', 'd', 'u', 'c', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 };
static const WCHAR wSlash[] = { '\\', 0 };
if (lpfilename == 0) if (pwszFilename == 0)
return FALSE; return FALSE;
if (!(versize = GetFileVersionInfoSizeW(lpfilename, &handle))) if (!(versize = GetFileVersionInfoSizeW(pwszFilename, &handle)))
{ {
WARN("GetFileVersionInfoSize failed\n"); WARN("GetFileVersionInfoSize failed\n");
return FALSE; return FALSE;
@ -644,24 +606,24 @@ SH_FileVersionInitialize(HWND hwndDlg, WCHAR *lpfilename)
return FALSE; return FALSE;
} }
if (!GetFileVersionInfoW(lpfilename, handle, versize, pBuf)) if (!GetFileVersionInfoW(pwszFilename, handle, versize, pBuf))
{ {
HeapFree(GetProcessHeap(), 0, pBuf); HeapFree(GetProcessHeap(), 0, pBuf);
return FALSE; return FALSE;
} }
if (VerQueryValueW(pBuf, const_cast<LPWSTR>(wSlash), &info, &infolen)) if (VerQueryValueW(pBuf, L"\\", &info, &infolen))
{ {
VS_FIXEDFILEINFO *inf = (VS_FIXEDFILEINFO *)info; VS_FIXEDFILEINFO *inf = (VS_FIXEDFILEINFO *)info;
swprintf(buff, wVersionFormat, HIWORD(inf->dwFileVersionMS), swprintf(buff, L"%u.%u.%u.%u", HIWORD(inf->dwFileVersionMS),
LOWORD(inf->dwFileVersionMS), LOWORD(inf->dwFileVersionMS),
HIWORD(inf->dwFileVersionLS), HIWORD(inf->dwFileVersionLS),
LOWORD(inf->dwFileVersionLS)); LOWORD(inf->dwFileVersionLS));
TRACE("MS %x LS %x res %s \n", inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff)); TRACE("MS %x LS %x res %s \n", inf->dwFileVersionMS, inf->dwFileVersionLS, debugstr_w(buff));
SetDlgItemTextW(hwndDlg, 14001, buff); SetDlgItemTextW(hwndDlg, 14001, buff);
} }
if (VerQueryValueW(pBuf, const_cast<LPWSTR>(wTranslation), (LPVOID *)&lplangcode, &infolen)) if (VerQueryValueW(pBuf, L"VarFileInfo\\Translation", (LPVOID *)&lplangcode, &infolen))
{ {
/* FIXME find language from current locale / if not available, /* FIXME find language from current locale / if not available,
* default to english * default to english
@ -671,22 +633,22 @@ SH_FileVersionInitialize(HWND hwndDlg, WCHAR *lpfilename)
code = lplangcode->code; code = lplangcode->code;
} }
swprintf(buff, wFileDescriptionFormat, lang, code); swprintf(buff, L"\\StringFileInfo\\%04x%04x\\FileDescription", lang, code);
SH_FileVersionQuerySetText(hwndDlg, 14003, pBuf, buff, &str); SH_FileVersionQuerySetText(hwndDlg, 14003, pBuf, buff, &str);
swprintf(buff, wLegalCopyrightFormat, lang, code); swprintf(buff, L"\\StringFileInfo\\%04x%04x\\LegalCopyright", lang, code);
SH_FileVersionQuerySetText(hwndDlg, 14005, pBuf, buff, &str); SH_FileVersionQuerySetText(hwndDlg, 14005, pBuf, buff, &str);
/* listbox properties */ /* listbox properties */
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wCompanyName, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, L"CompanyName", lang, code);
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wFileVersion, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, L"FileVersion", lang, code);
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wInternalName, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, L"InternalName", lang, code);
/* FIXME insert language identifier */ /* FIXME insert language identifier */
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, L"OriginalFilename", lang, code);
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, L"ProductName", lang, code);
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, L"ProductVersion", lang, code);
SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)pBuf); SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)pBuf);
/* select first item */ /* select first item */
@ -746,7 +708,7 @@ SH_FileVersionDlgProc(HWND hwndDlg,
if (lresult == LB_ERR) if (lresult == LB_ERR)
break; break;
str = (WCHAR *) SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lresult, (LPARAM)NULL); str = (WCHAR *)SendMessageW(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lresult, (LPARAM)NULL);
if (str == NULL) if (str == NULL)
break; break;
@ -756,7 +718,7 @@ SH_FileVersionDlgProc(HWND hwndDlg,
return TRUE; return TRUE;
} }
break; break;
case WM_DESTROY: case WM_DESTROY:
buf = (LPVOID) GetWindowLongPtr(hwndDlg, DWL_USER); buf = (LPVOID) GetWindowLongPtr(hwndDlg, DWL_USER);
@ -810,10 +772,10 @@ SH_FileGeneralDlgProc(HWND hwndDlg,
SH_FileGeneralSetText(hwndDlg, lpstr); SH_FileGeneralSetText(hwndDlg, lpstr);
/* enumerate file extension from registry and application which opens it */ /* enumerate file extension from registry and application which opens it */
SH_FileGeneralSetFileType(hwndDlg, wcsrchr(lpstr, '.')); SH_FileGeneralSetFileType(hwndDlg, wcsrchr(lpstr, L'.'));
/* set opens with */ /* set opens with */
SH_FileGeneralOpensWith(hwndDlg, wcsrchr(lpstr, '.')); SH_FileGeneralOpensWith(hwndDlg, wcsrchr(lpstr, L'.'));
/* set file time create/modfied/accessed */ /* set file time create/modfied/accessed */
SH_FileGeneralSetFileSizeTime(hwndDlg, lpstr, NULL); SH_FileGeneralSetFileSizeTime(hwndDlg, lpstr, NULL);
@ -829,14 +791,13 @@ SH_FileGeneralDlgProc(HWND hwndDlg,
BOOL BOOL
CALLBACK CALLBACK
AddShellPropSheetExCallback(HPROPSHEETPAGE hPage, AddShellPropSheetExCallback(HPROPSHEETPAGE hPage, LPARAM lParam)
LPARAM lParam)
{ {
PROPSHEETHEADERW *pinfo = (PROPSHEETHEADERW *)lParam; PROPSHEETHEADERW *pInfo = (PROPSHEETHEADERW *)lParam;
if (pinfo->nPages < MAX_PROPERTY_SHEET_PAGE) if (pInfo->nPages < MAX_PROPERTY_SHEET_PAGE)
{ {
pinfo->phpage[pinfo->nPages++] = hPage; pInfo->phpage[pInfo->nPages++] = hPage;
return TRUE; return TRUE;
} }
@ -844,7 +805,7 @@ AddShellPropSheetExCallback(HPROPSHEETPAGE hPage,
} }
int int
EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA *hpsxa, IDataObject *pDataObj) EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pInfo, int NumPages, HPSXA *phpsxa, IDataObject *pDataObj)
{ {
WCHAR szName[MAX_PATH] = { 0 }; WCHAR szName[MAX_PATH] = { 0 };
WCHAR *pOffset; WCHAR *pOffset;
@ -884,13 +845,13 @@ EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA
TRACE("EnumPropSheetExt szName %s\n", debugstr_w(szName)); TRACE("EnumPropSheetExt szName %s\n", debugstr_w(szName));
hpsxa[0] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages, pDataObj); phpsxa[0] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages, pDataObj);
Pages = SHAddFromPropSheetExtArray(hpsxa[0], AddShellPropSheetExCallback, (LPARAM)pinfo); Pages = SHAddFromPropSheetExtArray(phpsxa[0], AddShellPropSheetExCallback, (LPARAM)pInfo);
hpsxa[1] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"*", NumPages-Pages, pDataObj); phpsxa[1] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"*", NumPages - Pages, pDataObj);
Pages += SHAddFromPropSheetExtArray(hpsxa[1], AddShellPropSheetExCallback, (LPARAM)pinfo); Pages += SHAddFromPropSheetExtArray(phpsxa[1], AddShellPropSheetExCallback, (LPARAM)pInfo);
hpsxa[2] = NULL; phpsxa[2] = NULL;
if (pOffset) if (pOffset)
{ {
@ -901,8 +862,8 @@ EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA
{ {
TRACE("EnumPropSheetExt szName %s, pOffset %s\n", debugstr_w(szName), debugstr_w(pOffset)); TRACE("EnumPropSheetExt szName %s, pOffset %s\n", debugstr_w(szName), debugstr_w(pOffset));
szName[(sizeof(szName) / sizeof(WCHAR)) - 1] = L'\0'; szName[(sizeof(szName) / sizeof(WCHAR)) - 1] = L'\0';
hpsxa[2] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages - Pages, pDataObj); phpsxa[2] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages - Pages, pDataObj);
Pages += SHAddFromPropSheetExtArray(hpsxa[2], AddShellPropSheetExCallback, (LPARAM)pinfo); Pages += SHAddFromPropSheetExtArray(phpsxa[2], AddShellPropSheetExCallback, (LPARAM)pInfo);
} }
} }
@ -915,16 +876,16 @@ EnumPropSheetExt(LPWSTR wFileName, PROPSHEETHEADERW *pinfo, int NumPages, HPSXA
* *
* called from ShellExecuteExW32 * called from ShellExecuteExW32
* *
* lpf contains (quoted) path of folder/file * pwszPath contains (quoted) path of folder/file
* *
* TODO: provide button change application type if file has registered type * TODO: provide button change application type if file has registered type
* make filename field editable and apply changes to filename on close * make filename field editable and apply changes to filename on close
*/ */
BOOL BOOL
SH_ShowPropertiesDialog(WCHAR *lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl)
{ {
PROPSHEETHEADERW pinfo; PROPSHEETHEADERW Info;
HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE];
WCHAR wFileName[MAX_PATH]; WCHAR wFileName[MAX_PATH];
DWORD dwHandle = 0; DWORD dwHandle = 0;
@ -935,30 +896,30 @@ SH_ShowPropertiesDialog(WCHAR *lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *api
HRESULT hResult; HRESULT hResult;
DWORD wLength; DWORD wLength;
TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(lpf)); TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(pwszPath));
if (lpf == NULL) if (pwszPath == NULL)
return FALSE; return FALSE;
if (!wcslen(lpf)) if (!wcslen(pwszPath))
return FALSE; return FALSE;
memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE); memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE);
if (lpf[0] == '"') if (pwszPath[0] == L'"')
{ {
/* remove quotes from lpf */ /* remove quotes from pwszPath */
LPCWSTR src = lpf + 1; LPCWSTR src = pwszPath + 1;
LPWSTR dst = wFileName; LPWSTR dst = wFileName;
while (*src && *src != '"') while (*src && *src != L'"')
*dst++ = *src++; *dst++ = *src++;
*dst = '\0'; *dst = L'\0';
} }
else else
{ {
wcscpy(wFileName, lpf); wcscpy(wFileName, pwszPath);
} }
// //
@ -984,33 +945,33 @@ SH_ShowPropertiesDialog(WCHAR *lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *api
} }
pFileName = wcsrchr(wFileName, '\\'); pFileName = wcsrchr(wFileName, L'\\');
if (!pFileName) if (!pFileName)
pFileName = wFileName; pFileName = wFileName;
else else
pFileName++; pFileName++;
memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); memset(&Info, 0x0, sizeof(PROPSHEETHEADERW));
pinfo.dwSize = sizeof(PROPSHEETHEADERW); Info.dwSize = sizeof(PROPSHEETHEADERW);
pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; Info.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE;
pinfo.phpage = hppages; Info.phpage = hppages;
pinfo.pszCaption = pFileName; Info.pszCaption = pFileName;
hppages[pinfo.nPages] = hppages[Info.nPages] =
SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG", SH_CreatePropertySheetPage("SHELL_FILE_GENERAL_DLG",
SH_FileGeneralDlgProc, SH_FileGeneralDlgProc,
(LPARAM)wFileName, (LPARAM)wFileName,
NULL); NULL);
if (hppages[pinfo.nPages]) if (hppages[Info.nPages])
pinfo.nPages++; Info.nPages++;
hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj); hResult = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj);
if (hResult == S_OK) if (hResult == S_OK)
{ {
if (!EnumPropSheetExt(wFileName, &pinfo, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj)) if (!EnumPropSheetExt(wFileName, &Info, MAX_PROPERTY_SHEET_PAGE - 1, hpsxa, pDataObj))
{ {
hpsxa[0] = NULL; hpsxa[0] = NULL;
hpsxa[1] = NULL; hpsxa[1] = NULL;
@ -1018,18 +979,18 @@ SH_ShowPropertiesDialog(WCHAR *lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *api
} }
} }
if (GetFileVersionInfoSizeW(lpf, &dwHandle)) if (GetFileVersionInfoSizeW(pwszPath, &dwHandle))
{ {
hppages[pinfo.nPages] = hppages[Info.nPages] =
SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG", SH_CreatePropertySheetPage("SHELL_FILE_VERSION_DLG",
SH_FileVersionDlgProc, SH_FileVersionDlgProc,
(LPARAM)wFileName, (LPARAM)wFileName,
NULL); NULL);
if (hppages[pinfo.nPages]) if (hppages[Info.nPages])
pinfo.nPages++; Info.nPages++;
} }
res = PropertySheetW(&pinfo); res = PropertySheetW(&Info);
if (hResult == S_OK) if (hResult == S_OK)
{ {

8
reactos/dll/win32/shell32/shell32_main.h
View file

@ -212,11 +212,11 @@ BOOL SHELL_IsShortcut(LPCITEMIDLIST);
INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
HPROPSHEETPAGE SH_CreatePropertySheetPage(LPCSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle); HPROPSHEETPAGE SH_CreatePropertySheetPage(LPCSTR pszResName, DLGPROC pfnDlgProc, LPARAM lParam, LPWSTR pwszTitle);
BOOL SH_ShowDriveProperties(WCHAR * drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); BOOL SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl);
BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive);
BOOL SH_ShowPropertiesDialog(LPWSTR lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl);
BOOL SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); BOOL SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl);
LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf); LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf);
EXTERN_C HRESULT WINAPI DoRegisterServer(void); EXTERN_C HRESULT WINAPI DoRegisterServer(void);