Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 11:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
- Use file description in version block instead of filename for application name in Open With menu

svn path=/trunk/; revision=54770
This commit is contained in:
Rafal Harabien 2011-12-27 21:58:55 +00:00
parent c969ec94e4
commit f8e647e8a2
1 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

64
reactos/dll/win32/shell32/openwithmenu.cpp
View file

@ -47,8 +47,8 @@ typedef struct
typedef struct typedef struct
{ {
HICON hIcon; HICON hIcon;
WCHAR szAppName[MAX_PATH]; WCHAR wszAppPath[MAX_PATH];
WCHAR szManufacturer[MANUFACTURER_NAME_SIZE]; WCHAR wszManufacturer[MANUFACTURER_NAME_SIZE];
} OPEN_ITEM_CONTEXT, *POPEN_ITEM_CONTEXT; } OPEN_ITEM_CONTEXT, *POPEN_ITEM_CONTEXT;
typedef struct _LANGANDCODEPAGE_ typedef struct _LANGANDCODEPAGE_
@ -522,10 +522,10 @@ ExecuteOpenItem(POPEN_ITEM_CONTEXT pItemContext, LPCWSTR pwszPath)
/* Build the command line. Don't use applcation name as first parameter of /* Build the command line. Don't use applcation name as first parameter of
CreateProcessW, because it have to be an absolute path. */ CreateProcessW, because it have to be an absolute path. */
StringCbPrintfW(wszBuf, sizeof(wszBuf), L"\"%s\" \"%s\"", pItemContext->szAppName, pwszPath); StringCbPrintfW(wszBuf, sizeof(wszBuf), L"\"%s\" \"%s\"", pItemContext->wszAppPath, pwszPath);
/* Start the application now */ /* Start the application now */
TRACE("AppName %ls Path %ls\n", pItemContext->szAppName, pwszPath); TRACE("AppName %ls Path %ls\n", pItemContext->wszAppPath, pwszPath);
if (CreateProcessW(NULL, wszBuf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) if (CreateProcessW(NULL, wszBuf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
{ {
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
@ -595,12 +595,12 @@ OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
OPENASINFO *poainfo = (OPENASINFO*)GetWindowLongPtr(hwndDlg, DWLP_USER); OPENASINFO *poainfo = (OPENASINFO*)GetWindowLongPtr(hwndDlg, DWLP_USER);
/* store settings in HKCU path */ /* store settings in HKCU path */
StoreNewSettings(poainfo->pcszFile, pItemContext->szAppName); StoreNewSettings(poainfo->pcszFile, pItemContext->wszAppPath);
if (SendDlgItemMessage(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) if (SendDlgItemMessage(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED)
{ {
/* set programm as default handler */ /* set programm as default handler */
SetProgramAsDefaultHandler(poainfo->pcszFile, pItemContext->szAppName); SetProgramAsDefaultHandler(poainfo->pcszFile, pItemContext->wszAppPath);
} }
if (poainfo->oaifInFlags & OAIF_EXEC) if (poainfo->oaifInFlags & OAIF_EXEC)
@ -668,10 +668,10 @@ OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
/* paint manufacturer description */ /* paint manufacturer description */
cyOffset += mt.tmHeight + 2; cyOffset += mt.tmHeight + 2;
preColor = SetTextColor(lpdis->hDC, RGB(192, 192, 192)); preColor = SetTextColor(lpdis->hDC, RGB(192, 192, 192));
if (pItemContext->szManufacturer[0]) if (pItemContext->wszManufacturer[0])
TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->szManufacturer, wcslen(pItemContext->szManufacturer)); TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->wszManufacturer, wcslen(pItemContext->wszManufacturer));
else else
TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->szAppName, wcslen(pItemContext->szAppName)); TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->wszAppPath, wcslen(pItemContext->wszAppPath));
SetTextColor(lpdis->hDC, preColor); SetTextColor(lpdis->hDC, preColor);
SetBkColor(lpdis->hDC, preBkColor); SetBkColor(lpdis->hDC, preBkColor);
break; break;
@ -747,8 +747,8 @@ HRESULT WINAPI COpenWithMenu::HandleMenuMsg(
return E_NOTIMPL; return E_NOTIMPL;
} }
VOID static VOID
GetManufacturer(LPCWSTR pwszAppName, POPEN_ITEM_CONTEXT pContext) LoadFileInfo(LPCWSTR pwszAppPath, POPEN_ITEM_CONTEXT pContext, LPWSTR pwszAppName, unsigned cchAppName)
{ {
UINT cbSize; UINT cbSize;
LPVOID pBuf; LPVOID pBuf;
@ -758,10 +758,10 @@ GetManufacturer(LPCWSTR pwszAppName, POPEN_ITEM_CONTEXT pContext)
WCHAR *pResult; WCHAR *pResult;
/* Clear manufacturer */ /* Clear manufacturer */
pContext->szManufacturer[0] = 0; pContext->wszManufacturer[0] = 0;
/* query version info size */ /* query version info size */
cbSize = GetFileVersionInfoSizeW(pwszAppName, NULL); cbSize = GetFileVersionInfoSizeW(pwszAppPath, NULL);
if (!cbSize) if (!cbSize)
return; return;
@ -771,7 +771,7 @@ GetManufacturer(LPCWSTR pwszAppName, POPEN_ITEM_CONTEXT pContext)
return; return;
/* query version info */ /* query version info */
if(!GetFileVersionInfoW(pwszAppName, 0, cbSize, pBuf)) if(!GetFileVersionInfoW(pwszAppPath, 0, cbSize, pBuf))
{ {
HeapFree(GetProcessHeap(), 0, pBuf); HeapFree(GetProcessHeap(), 0, pBuf);
return; return;
@ -788,38 +788,34 @@ GetManufacturer(LPCWSTR pwszAppName, POPEN_ITEM_CONTEXT pContext)
wCode = lpLangCode->code; wCode = lpLangCode->code;
} }
/* Query name */
swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\FileDescription", wLang, wCode);
if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cbSize))
StringCchCopyNW(pwszAppName, cchAppName, pResult, cbSize);
/* Query manufacturer */ /* Query manufacturer */
swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\CompanyName", wLang, wCode); swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\CompanyName", wLang, wCode);
if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cbSize)) if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cbSize))
StringCbCopyNW(pContext->szManufacturer, sizeof(pContext->szManufacturer), pResult, cbSize); StringCbCopyNW(pContext->wszManufacturer, sizeof(pContext->wszManufacturer), pResult, cbSize);
HeapFree(GetProcessHeap(), 0, pBuf); HeapFree(GetProcessHeap(), 0, pBuf);
} }
static VOID static VOID
InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppName) InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppPath)
{ {
POPEN_ITEM_CONTEXT pItemContext; POPEN_ITEM_CONTEXT pItemContext;
WCHAR *pwszExt; WCHAR wszAppName[256];
WCHAR wszFileName[_MAX_FNAME];
/* Allocate new item context */
pItemContext = (OPEN_ITEM_CONTEXT *)HeapAlloc(GetProcessHeap(), 0, sizeof(OPEN_ITEM_CONTEXT)); pItemContext = (OPEN_ITEM_CONTEXT *)HeapAlloc(GetProcessHeap(), 0, sizeof(OPEN_ITEM_CONTEXT));
if (!pItemContext) if (!pItemContext)
return; return;
/* Store app path and icon */ /* Store app path and icon */
wcscpy(pItemContext->szAppName, pwszAppName); wcscpy(pItemContext->wszAppPath, pwszAppPath);
pItemContext->hIcon = ExtractIconW(shell32_hInstance, pwszAppName, 0); pItemContext->hIcon = ExtractIconW(shell32_hInstance, pwszAppPath, 0);
pItemContext->szManufacturer[0] = 0; LoadFileInfo(pwszAppPath, pItemContext, wszAppName, _countof(wszAppName));
/* Extract path name */
_wsplitpath(pwszAppName, NULL, NULL, wszFileName, NULL);
/* Build application name from filename. FIXME: do it properly */
pwszExt = wcsrchr(wszFileName, '.');
if (pwszExt)
pwszExt[0] = L'\0';
wszFileName[0] = towupper(wszFileName[0]);
/* Add item to the list */ /* Add item to the list */
if (pContext->bMenu) if (pContext->bMenu)
@ -832,8 +828,8 @@ InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppName)
mii.fType = MFT_STRING; //MFT_OWNERDRAW; mii.fType = MFT_STRING; //MFT_OWNERDRAW;
mii.fState = MFS_ENABLED; mii.fState = MFS_ENABLED;
mii.wID = pContext->idCmd; mii.wID = pContext->idCmd;
mii.dwTypeData = wszFileName; mii.dwTypeData = wszAppName;
mii.cch = wcslen(wszFileName); mii.cch = wcslen(wszAppName);
mii.dwItemData = (ULONG_PTR)pItemContext; mii.dwItemData = (ULONG_PTR)pItemContext;
mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(pItemContext->hIcon); mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(pItemContext->hIcon);
@ -844,9 +840,7 @@ InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppName)
{ {
LRESULT Index; LRESULT Index;
/* get manufacturer */ Index = SendMessageW(pContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)wszAppName);
GetManufacturer(pwszAppName, pItemContext);
Index = SendMessageW(pContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)wszFileName);
if (Index != LB_ERR) if (Index != LB_ERR)
SendMessageW(pContext->hDlgCtrl, LB_SETITEMDATA, Index, (LPARAM)pItemContext); SendMessageW(pContext->hDlgCtrl, LB_SETITEMDATA, Index, (LPARAM)pItemContext);
} }