[rharabien] 54696: [SHELL32] - Move "Open With" context menu handler registration to shell32 - Improve Polish translation
Author: rharabien Date: Mon Dec 19 11:37:46 2011 New Revision: 54696
URL: http://svn.reactos.org/svn/reactos?rev=54696&view=rev Log: [SHELL32] - Move "Open With" context menu handler registration to shell32 - Improve Polish translation
Added: trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/openwithmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shresdef.h
Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386.... ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -4,10 +4,8 @@ [AddReg] HKLM,"SOFTWARE\Classes",,0x00000010
- ; Default key HKCR,"*","",0x00000000,"" -HKCR,"*\shellex\ContextMenuHandlers\Open With","",0x00000000,"{09799AFB-AD67-11d1-ABCD-00C04FC30936}"
; Folders HKCR,"Folder","",0x00000000,"Folder" @@ -333,10 +331,6 @@ HKCR,"CLSID{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000
; Open With shell extension -HKCR,"CLSID{09799AFB-AD67-11d1-ABCD-00C04FC30936}","",0x00000000,"Open With Context Menu Handler" -HKCR,"CLSID{09799AFB-AD67-11d1-ABCD-00C04FC30936}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID{09799AFB-AD67-11d1-ABCD-00C04FC30936}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID{09799AFB-AD67-11d1-ABCD-00C04FC30936}\shellex\MayChangeDefaultMenu","",0x00000000,"" HKCR,"SystemFileAssociations","",0x00000000,"" HKCR,"Applications","",0x00000000,""
Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-P... ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -721,7 +721,7 @@ IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Dysk sieciowy"
- IDS_OPEN_WITH "Otwórz z" + IDS_OPEN_WITH "Otwórz za pomocÄ " IDS_OPEN_WITH_CHOOSE "Wybierz program..."
IDS_SHELL_ABOUT_AUTHORS "&Autorzy"
Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwithm... ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -1049,7 +1049,7 @@ return E_OUTOFMEMORY; } if (_ILIsDesktop(pidl) || _ILIsMyDocuments(pidl) || _ILIsControlPanel(pidl) || _ILIsNetHood(pidl) || - _ILIsBitBucket(pidl) || _ILIsDrive(pidl) || _ILIsCPanelStruct(pidl) || _ILIsFolder(pidl)) + _ILIsBitBucket(pidl) || _ILIsDrive(pidl) || _ILIsCPanelStruct(pidl) || _ILIsFolder(pidl)) { TRACE("pidl is a folder\n"); SHFree((void*)pidl); @@ -1076,7 +1076,7 @@ pszExt = wcsrchr(szPath, L'.'); if (pszExt && !_wcsicmp(pszExt, szShortCut)) { - FIXME("pidl is a shortcut\n"); + TRACE("pidl is a shortcut\n"); return E_FAIL; }
@@ -1105,7 +1105,6 @@
if (poainfo->pcszClass == NULL && poainfo->pcszFile == NULL) return E_FAIL; -
hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(OPEN_WITH_PROGRAMM_DLG), hwndParent, OpenWithProgrammDlg, (LPARAM)poainfo); if (hwnd == NULL)
Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwithm... ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -51,7 +51,7 @@ // IShellExtInit virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID);
- DECLARE_NO_REGISTRY() + DECLARE_REGISTRY_RESOURCEID(IDR_OPENWITHMENU) DECLARE_NOT_AGGREGATABLE(COpenWithMenu)
DECLARE_PROTECT_FINAL_CONSTRUCT()
Added: trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/o... ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -1,0 +1,34 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {09799AFB-AD67-11d1-ABCD-00C04FC30936} = s 'Open With Context Menu Handler' + { + val InfoTip = e '@%%SystemRoot%%\system32\SHELL32.dll,-22924' + val LocalizedString = e '@%%SystemRoot%%\system32\SHELL32.dll,-22985' + DefaultIcon = e '%%SystemRoot%%\system32\SHELL32.dll,-210' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + shellex + { + MayChangeDefaultMenu + { + } + } + } + } + NoRemove * + { + NoRemove shellex + { + NoRemove ContextMenuHandlers + { + ForceRemove Open With = s '{09799AFB-AD67-11d1-ABCD-00C04FC30936}' + { + } + } + } + } +}
Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.r... ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -20,3 +20,4 @@ IDR_SHELLFSFOLDER REGISTRY "res\rgs\shellfsfolder.rgs" IDR_SHELLLINK REGISTRY "res\rgs\shelllink.rgs" IDR_STARTMENU REGISTRY "res\rgs\startmenu.rgs" +IDR_OPENWITHMENU REGISTRY "res\rgs\openwithmenu.rgs"
Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef.... ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -471,5 +471,6 @@ #define IDR_SHELLFSFOLDER 143 #define IDR_SHELLLINK 144 #define IDR_STARTMENU 145 +#define IDR_OPENWITHMENU 146
#endif
-
rharabien＠svn.reactos.org