Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[peterw] 30309: - Change the default installation directory to PROGRAMFILES\RosBE.
by peterw＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: peterw Date: Sat Nov 10 01:44:14 2007 New Revision: 30309 URL: http://svn.reactos.org/svn/reactos?rev=30309&view=rev Log: - Change the default installation directory to PROGRAMFILES\RosBE. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 01:44:14 2007 @@ -10,7 +10,7 @@ ;; Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "RosBE-${PRODUCT_VERSION}.exe" -InstallDir "C:\RosBE" +InstallDir "$PROGRAMFILES\RosBE" InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show

1 0

[peterw] 30308: - Remove the terminal icon :P and use the rosbe.ico one.
by peterw＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: peterw Date: Sat Nov 10 01:21:17 2007 New Revision: 30308 URL: http://svn.reactos.org/svn/reactos?rev=30308&view=rev Log: - Remove the terminal icon :P and use the rosbe.ico one. Removed: trunk/tools/RosBE/RosBE-Windows/Icons/terminal.ico Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Removed: trunk/tools/RosBE/RosBE-Windows/Icons/terminal.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Icons/te… ============================================================================== Binary file - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 01:21:17 2007 @@ -213,7 +213,7 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\terminal.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" @@ -229,7 +229,7 @@ ;; Add our desktop shortcuts. ;; SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\terminal.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC11 @@ -239,7 +239,7 @@ ;; Add our quick launch shortcuts. ;; SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\terminal.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SectionEnd Section -Post SEC12 @@ -289,7 +289,6 @@ Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" Delete /REBOOTOK "$INSTDIR\readme.pdf" Delete /REBOOTOK "$INSTDIR\rosbe.ico" - Delete /REBOOTOK "$INSTDIR\terminal.ico" Delete /REBOOTOK "$INSTDIR\uninstall.ico" Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt"

1 0

[janderwald] 30307: - readd MFT_SEPERATOR to background context menu - add shell new implementation
by janderwald＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: janderwald Date: Fri Nov 9 22:49:18 2007 New Revision: 30307 URL: http://svn.reactos.org/svn/reactos?rev=30307&view=rev Log: - readd MFT_SEPERATOR to background context menu - add shell new implementation Added: trunk/reactos/dll/win32/shell32/shv_item_new.c (with props) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Ïîñòàâÿíå", FCIDM_SHVIEW_INSERT MENUITEM "Ïîñòàâÿíå êàòî âðúçêà", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Fri Nov 9 22:49:18 2007 @@ -55,6 +55,7 @@ MENUITEM SEPARATOR MENUITEM "V&loit", FCIDM_SHVIEW_INSERT MENUITEM "Vloit zást&upce", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "&Vlastnosti", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Fri Nov 9 22:49:18 2007 @@ -56,6 +56,7 @@ MENUITEM SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Fri Nov 9 22:49:18 2007 @@ -55,6 +55,7 @@ MENUITEM SEPARATOR MENUITEM "Pegar", FCIDM_SHVIEW_INSERT MENUITEM "Pegar acceso directo", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Propiedades", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Liitä", FCIDM_SHVIEW_INSERT MENUITEM "Liitä Linkiksi", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Fri Nov 9 22:49:18 2007 @@ -58,6 +58,7 @@ MENUITEM SEPARATOR MENUITEM "Coller", FCIDM_SHVIEW_INSERT MENUITEM "Coller comme un lien", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Propriétés", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Fri Nov 9 22:49:18 2007 @@ -57,6 +57,7 @@ MENUITEM SEPARATOR MENUITEM "Beillesztés", FCIDM_SHVIEW_INSERT MENUITEM "Parancsikon beillesztése", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Beállítások", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Fri Nov 9 22:49:18 2007 @@ -55,6 +55,7 @@ MENUITEM SEPARATOR MENUITEM "Incolla", FCIDM_SHVIEW_INSERT MENUITEM "Crea Collegamento", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Proprietà", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "\\èt¯", FCIDM_SHVIEW_INSERT MENUITEM "V[gJbgÌ\\èt¯", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "vpeB", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Fri Nov 9 22:49:18 2007 @@ -55,6 +55,7 @@ MENUITEM SEPARATOR MENUITEM "W&klej", FCIDM_SHVIEW_INSERT MENUITEM "Wklej s&krót", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "W³aciwoci", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Fri Nov 9 22:49:18 2007 @@ -56,6 +56,7 @@ MENUITEM SEPARATOR MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT MENUITEM "Colar a&talho", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Fri Nov 9 22:49:18 2007 @@ -56,6 +56,7 @@ MENUITEM SEPARATOR MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT MENUITEM "Colar a&talho", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Fri Nov 9 22:49:18 2007 @@ -55,6 +55,7 @@ MENUITEM SEPARATOR MENUITEM "&Âñòàâèòü", FCIDM_SHVIEW_INSERT MENUITEM "Âñòàâèòü &ÿðëûê", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Ñâî&éñòâà", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Yapýþtýr", FCIDM_SHVIEW_INSERT MENUITEM "Kýsayol Yapýþtýr", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Özellikler", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Âñòàâèòè", FCIDM_SHVIEW_INSERT MENUITEM "Âñòàâèòè Ïîñèëàííÿ", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Âëàñòèâîñò³", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Fri Nov 9 22:49:18 2007 @@ -54,6 +54,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Fri Nov 9 22:49:18 2007 @@ -55,6 +55,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Fri Nov 9 22:49:18 2007 @@ -55,6 +55,7 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Fri Nov 9 22:49:18 2007 @@ -69,4 +69,5 @@ <file>drive.c</file> <file>recyclebin.c</file> <file>she_ocmenu.c</file> + <file>shv_item_new.c</file> </module> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Fri Nov 9 22:49:18 2007 @@ -82,6 +82,7 @@ LPCLASSFACTORY IClassFactory_Constructor(REFCLSID); IContextMenu2 * ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, LPCITEMIDLIST *aPidls, UINT uItemCount); +HRESULT WINAPI INewItem_Constructor(LPSHELLFOLDER pSFParent, REFIID riid, LPVOID *ppv); IContextMenu2 * ISvStaticItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, LPCITEMIDLIST *apidl, UINT cidl, HKEY hKey); IContextMenu2 * ISvBgCm_Constructor(LPSHELLFOLDER pSFParent, BOOL bDesktop); LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER); Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Fri Nov 9 22:49:18 2007 @@ -49,6 +49,7 @@ IShellFolder* pSFParent; LONG ref; BOOL bDesktop; + IContextMenu2 * icm_new; } BgCmImpl; static const IContextMenu2Vtbl cmvt; @@ -183,6 +184,7 @@ MENUITEMINFOW mii; HRESULT hr; + IContextMenu2 * icm; BgCmImpl *This = (BgCmImpl *)iface; TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", @@ -218,6 +220,24 @@ mii.fType = 0; SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERT, FALSE, &mii); SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERTLINK, FALSE, &mii); + } + + /* + * FIXME + * load other shell extensions + */ + + if (SUCCEEDED(INewItem_Constructor(This->pSFParent, &IID_IContextMenu2, (LPVOID*)&icm))) + { + if (SUCCEEDED(IContextMenu_QueryContextMenu(icm, hMenu, 10, idCmdFirst, idCmdLast, uFlags))) + { + This->icm_new = icm; + _InsertMenuItem(hMenu, 11, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); + } + else + { + This->icm_new = NULL; + } } if (This->bDesktop) @@ -389,6 +409,10 @@ break; default: + + if (This->icm_new && SUCCEEDED(IContextMenu2_InvokeCommand(This->icm_new, lpcmi))) + return S_OK; + /* if it's an id just pass it to the parent shv */ if (hWndSV) SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0),0 ); break; @@ -448,6 +472,11 @@ TRACE("ISVBgCm_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + if (This->icm_new) + { + IContextMenu2_HandleMenuMsg(This->icm_new, uMsg, wParam, lParam); + } + return E_NOTIMPL; } Added: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c (added) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c Fri Nov 9 22:49:18 2007 @@ -1,0 +1,828 @@ +/* + * PROJECT: shell32 + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shell32/shv_item_new.c + * PURPOSE: provides new shell item service + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +//#define YDEBUG +#include "wine/debug.h" + +#include "windef.h" +#include "wingdi.h" +#include "pidl.h" +#include "shlobj.h" +#include "shtypes.h" +#include "shell32_main.h" +#include "shellfolder.h" +#include "undocshell.h" +#include "shlwapi.h" +#include "stdio.h" +#include "winuser.h" +#include "shresdef.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef enum +{ + SHELLNEW_TYPE_COMMAND = 1, + SHELLNEW_TYPE_DATA = 2, + SHELLNEW_TYPE_FILENAME = 4, + SHELLNEW_TYPE_NULLFILE = 8 +}SHELLNEW_TYPE; + + +typedef struct __SHELLNEW_ITEM__ +{ + SHELLNEW_TYPE Type; + LPWSTR szExt; + LPWSTR szTarget; + LPWSTR szDesc; + LPWSTR szIcon; + struct __SHELLNEW_ITEM__ * Next; +}SHELLNEW_ITEM, *PSHELLNEW_ITEM; + +typedef struct +{ + const IContextMenu2Vtbl *lpVtblContextMenu; + LPSHELLFOLDER pSFParent; + PSHELLNEW_ITEM s_SnHead; +}INewMenuImpl; + +static const GUID CLSID_NewMenu = {0xD969A300, 0xE7FF, 0x11d0, {0xA9, 0x3B, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19} }; +static const IContextMenu2Vtbl cmvt; +static WCHAR szNew[100]; + + +static +BOOL +GetKeyDescription(LPWSTR szKeyName, LPWSTR szResult) +{ + HKEY hKey; + DWORD dwDesc, dwError; + WCHAR szDesc[100]; + + static const WCHAR szFriendlyTypeName[] = { '\\','F','r','i','e','n','d','l','y','T','y','p','e','N','a','m','e',0 }; + + TRACE("GetKeyDescription: keyname %s\n", debugstr_w(szKeyName)); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0, KEY_READ | KEY_QUERY_VALUE,&hKey) != ERROR_SUCCESS) + return FALSE; + + if (RegLoadMUIStringW(hKey,szFriendlyTypeName,szResult,MAX_PATH,&dwDesc,0,NULL) == ERROR_SUCCESS) + { + TRACE("result %s\n", debugstr_w(szResult)); + RegCloseKey(hKey); + return TRUE; + } + /* fetch default value */ + dwDesc = sizeof(szDesc); + dwError = RegGetValueW(hKey,NULL,NULL, RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); + if(dwError == ERROR_SUCCESS) + { + if (wcsncmp(szDesc, szKeyName, dwDesc / sizeof(WCHAR))) + { + /* recurse for to a linked key */ + if (!GetKeyDescription(szDesc, szResult)) + { + /* use description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* use default value as description */ + wcscpy(szResult, szDesc); + } + } + else + { + /* registry key w/o default key?? */ + TRACE("RegGetValue failed with %x\n", dwError); + wcscpy(szResult, szKeyName); + } + + RegCloseKey(hKey); + return TRUE; +} + + +PSHELLNEW_ITEM LoadItem(LPWSTR szKeyName) +{ + HKEY hKey; + DWORD dwIndex; + WCHAR szName[MAX_PATH]; + WCHAR szCommand[MAX_PATH]; + WCHAR szDesc[MAX_PATH] = {0}; + WCHAR szIcon[MAX_PATH] = {0}; + DWORD dwName, dwCommand; + LONG result; + PSHELLNEW_ITEM pNewItem; + + static const WCHAR szShellNew[] = { '\\','S','h','e','l','l','N','e','w',0 }; + static const WCHAR szCmd[] = { 'C','o','m','m','a','n','d',0 }; + static const WCHAR szData[] = { 'D','a','t','a',0 }; + static const WCHAR szFileName[] = { 'F','i','l','e','N','a','m','e', 0 }; + static const WCHAR szNullFile[] = { 'N','u','l','l','F','i','l','e', 0 }; + + + wcscpy(szName, szKeyName); + GetKeyDescription(szKeyName, szDesc); + wcscat(szName, szShellNew); + result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szName,0,KEY_READ,&hKey); + + //TRACE("LoadItem dwName %d keyname %s szName %s szDesc %s szIcon %s\n", dwName, debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); + + if (result != ERROR_SUCCESS) + { + return NULL; + } + + dwIndex = 0; + pNewItem = NULL; + + do + { + dwName = MAX_PATH; + dwCommand = MAX_PATH; + result = RegEnumValueW(hKey,dwIndex,szName,&dwName,NULL,NULL,(LPBYTE)szCommand, &dwCommand); + if (result == ERROR_SUCCESS) + { + long type = -1; + LPWSTR szTarget = szCommand; + //TRACE("szName %s szCommand %s\n", debugstr_w(szName), debugstr_w(szCommand)); + if (!wcsicmp(szName, szCmd)) + { + type = SHELLNEW_TYPE_COMMAND; + }else if (!wcsicmp(szName, szData)) + { + type = SHELLNEW_TYPE_DATA; + } + else if (!wcsicmp(szName, szFileName)) + { + type = SHELLNEW_TYPE_FILENAME; + } + else if (!wcsicmp(szName, szNullFile)) + { + type = SHELLNEW_TYPE_NULLFILE; + szTarget = NULL; + } + if (type != -1) + { + pNewItem = HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); + pNewItem->Type = type; + if (szTarget) + pNewItem->szTarget = wcsdup(szTarget); + else + pNewItem->szTarget = NULL; + + pNewItem->szDesc = wcsdup(szDesc); + pNewItem->szIcon = wcsdup(szIcon); + pNewItem->szExt = wcsdup(szKeyName); + pNewItem->Next = NULL; + break; + } + } + dwIndex++; + }while(result != ERROR_NO_MORE_ITEMS); + RegCloseKey(hKey); + return pNewItem; +} + + +BOOL +LoadShellNewItems(INewMenuImpl * This) +{ + DWORD dwIndex; + WCHAR szName[MAX_PATH]; + LONG result; + PSHELLNEW_ITEM pNewItem; + PSHELLNEW_ITEM pCurItem = NULL; + static WCHAR szLnk[] = { '.','l','n','k',0 }; + + /* insert do new folder action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szNew, sizeof(szNew) / sizeof(WCHAR))) + szNew[0] = 0; + szNew[199] = 0; + + dwIndex = 0; + do + { + result = RegEnumKeyW(HKEY_CLASSES_ROOT,dwIndex,szName,MAX_PATH); + if (result == ERROR_SUCCESS) + { + pNewItem = LoadItem(szName); + if (pNewItem) + { + if (!wcsicmp(pNewItem->szExt, szLnk)) + { + if (This->s_SnHead) + { + pNewItem->Next = This->s_SnHead; + This->s_SnHead = pNewItem; + } + else + { + This->s_SnHead = pCurItem = pNewItem; + } + } + else + { + if (pCurItem) + { + pCurItem->Next = pNewItem; + pCurItem = pNewItem; + } + else + { + pCurItem = This->s_SnHead = pNewItem; + } + } + } + } + dwIndex++; + }while(result != ERROR_NO_MORE_ITEMS); + + if (This->s_SnHead == NULL) + return FALSE; + else + return TRUE; +} + +UINT +InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu, INewMenuImpl * This) +{ + MENUITEMINFOW mii; + PSHELLNEW_ITEM pCurItem; + UINT i; + WCHAR szBuffer[100]; + + if (This->s_SnHead == NULL) + { + if (!LoadShellNewItems(This)) + return 0; + } + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + + /* insert do new shortcut action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + szBuffer[0] = 0; + szBuffer[199] = 0; + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + mii.fType = MFT_STRING; + mii.dwTypeData = szNew; + mii.cch = strlenW(mii.dwTypeData); + mii.wID = idFirst++; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + + /* insert do new shortcut action */ + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) + szBuffer[0] = 0; + szBuffer[199] = 0; + mii.dwTypeData = szBuffer; + mii.cch = strlenW(mii.dwTypeData); + mii.wID = idFirst++; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + + /* insert seperator for custom new action */ + mii.fMask = MIIM_TYPE | MIIM_ID; + mii.fType = MFT_SEPARATOR; + mii.wID = -1; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + /* + * FIXME + * implement loading of icons + * and using MFT_OWNERDRAWN + */ + mii.fType = MFT_STRING; + mii.fState = MFS_ENABLED; + + pCurItem = This->s_SnHead; + i = 0; + + while(pCurItem) + { + if (i >= 1) + { + TRACE("szDesc %s\n", debugstr_w(pCurItem->szDesc)); + mii.dwTypeData = pCurItem->szDesc; + mii.cch = strlenW(mii.dwTypeData); + mii.wID = idFirst++; + InsertMenuItemW(hMenu, idMenu++, TRUE, &mii); + } + pCurItem = pCurItem->Next; + i++; + } + return (i+2); +} + +HRESULT +DoShellNewCmd(INewMenuImpl * This, LPCMINVOKECOMMANDINFO lpcmi) +{ + PSHELLNEW_ITEM pCurItem = This->s_SnHead; + IPersistFolder3 * psf; + LPITEMIDLIST pidl; + STRRET strTemp; + WCHAR szTemp[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + WCHAR szPath[MAX_PATH]; + STARTUPINFOW sInfo; + PROCESS_INFORMATION pi; + UINT i, target; + HANDLE hFile; + DWORD dwWritten, dwError; + + static const WCHAR szP1[] = { '%', '1', 0 }; + static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 }; + + i = 1; + target = LOWORD(lpcmi->lpVerb); + + while(pCurItem) + { + if (i == target) + break; + + pCurItem = pCurItem->Next; + i++; + } + + if (!pCurItem) + return E_UNEXPECTED; + + if (IShellFolder2_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) + { + ERR("Failed to get interface IID_IPersistFolder2\n"); + return E_FAIL; + } + if (IPersistFolder2_GetCurFolder(psf, &pidl) != S_OK) + { + ERR("IPersistFolder2_GetCurFolder failed\n"); + return E_FAIL; + } + + if (IShellFolder2_GetDisplayNameOf(This->pSFParent, pidl, SHGDN_FORPARSING, &strTemp) != S_OK) + { + ERR("IShellFolder_GetDisplayNameOf failed\n"); + return E_FAIL; + } + StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); + + switch(pCurItem->Type) + { + case SHELLNEW_TYPE_COMMAND: + { + LPWSTR ptr; + LPWSTR szCmd; + + if (!ExpandEnvironmentStringsW(pCurItem->szTarget, szBuffer, MAX_PATH)) + { + TRACE("ExpandEnvironmentStrings failed\n"); + break; + } + + ptr = wcsstr(szBuffer, szP1); + if (ptr) + { + ptr[1] = 's'; + sprintfW(szTemp, szBuffer, szPath); + ptr = szTemp; + } + else + { + ptr = szBuffer; + } + + ZeroMemory(&sInfo, sizeof(sInfo)); + sInfo.cb = sizeof(sizeof(sInfo)); + szCmd = wcsdup(ptr); + if (!szCmd) + break; + if (CreateProcessW(NULL, szCmd, NULL, NULL,FALSE,0,NULL,NULL,&sInfo, &pi)) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + free(szCmd); + break; + } + case SHELLNEW_TYPE_DATA: + case SHELLNEW_TYPE_FILENAME: + case SHELLNEW_TYPE_NULLFILE: + { + i = 2; + + PathAddBackslashW(szPath); + wcscat(szPath, szNew); + wcscat(szPath, L" "); + wcscat(szPath, pCurItem->szDesc); + wcscpy(szBuffer, szPath); + wcscat(szBuffer, pCurItem->szExt); + do + { + hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) + break; + dwError = GetLastError(); + + TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError); + sprintfW(szBuffer, szFormat, szPath, i, pCurItem->szExt); + i++; + }while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS); + + if (hFile == INVALID_HANDLE_VALUE) + return E_FAIL; + + if (pCurItem->Type == SHELLNEW_TYPE_DATA) + { + i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH*2, NULL, NULL); + if (i) + { + WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL); + } + } + CloseHandle(hFile); + if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) + { + if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE)) + break; + } + TRACE("Notifying fs %s\n", debugstr_w(szBuffer)); + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL); + break; + } + } + return S_OK; +} +/************************************************************************** +* DoMeasureItem +*/ +HRESULT +DoMeasureItem(INewMenuImpl *This, HWND hWnd, MEASUREITEMSTRUCT * lpmis) +{ + PSHELLNEW_ITEM pCurItem; + PSHELLNEW_ITEM pItem; + UINT i; + HDC hDC; + SIZE size; + + TRACE("DoMeasureItem entered with id %x\n", lpmis->itemID); + + pCurItem = This->s_SnHead; + + i = 1; + pItem = NULL; + while(pCurItem) + { + if (i == lpmis->itemID) + { + pItem = pCurItem; + break; + } + pCurItem = pCurItem->Next; + i++; + } + + if (!pItem) + { + TRACE("DoMeasureItem no item found\n"); + return E_FAIL; + } + hDC = GetDC(hWnd); + GetTextExtentPoint32W(hDC, pCurItem->szDesc, strlenW(pCurItem->szDesc), &size); + lpmis->itemWidth = size.cx + 32; + lpmis->itemHeight = max(size.cy, 20); + ReleaseDC (hWnd, hDC); + return S_OK; +} +/************************************************************************** +* DoDrawItem +*/ +HRESULT +DoDrawItem(INewMenuImpl *This, HWND hWnd, DRAWITEMSTRUCT * drawItem) +{ + PSHELLNEW_ITEM pCurItem; + PSHELLNEW_ITEM pItem; + UINT i; + pCurItem = This->s_SnHead; + + TRACE("DoDrawItem entered with id %x\n", drawItem->itemID); + + i = 1; + pItem = NULL; + while(pCurItem) + { + if (i == drawItem->itemID) + { + pItem = pCurItem; + break; + } + pCurItem = pCurItem->Next; + i++; + } + + if (!pItem) + return E_FAIL; + + drawItem->rcItem.left += 20; + + DrawTextW(drawItem->hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &drawItem->rcItem, 0); + return S_OK; +} + +/************************************************************************** +* DoNewFolder +*/ +static void DoNewFolder( + INewMenuImpl *This, + IShellView *psv) +{ + ISFHelper * psfhlp; + WCHAR wszName[MAX_PATH]; + + IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); + if (psfhlp) + { + LPITEMIDLIST pidl; + ISFHelper_GetUniqueName(psfhlp, wszName, MAX_PATH); + ISFHelper_AddFolder(psfhlp, 0, wszName, &pidl); + + if(psv) + { + /* if we are in a shellview do labeledit */ + IShellView_SelectItem(psv, + pidl,(SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE + |SVSI_FOCUSED|SVSI_SELECT)); + } + SHFree(pidl); + + ISFHelper_Release(psfhlp); + } +} + + +#if 0 +static inline INewMenuImpl *impl_from_IShellExtInit( IShellExtInit *iface ) +{ + return (INewMenuImpl *)((char*)iface - FIELD_OFFSET(INewMenuImpl, lpvtblShellExtInit)); +} +#endif + +static inline INewMenuImpl *impl_from_IContextMenu( IContextMenu2 *iface ) +{ + return (INewMenuImpl *)((char*)iface - FIELD_OFFSET(INewMenuImpl, lpVtblContextMenu)); +} + +static HRESULT WINAPI INewItem_fnQueryInterface(INewMenuImpl * This, REFIID riid, LPVOID *ppvObj) +{ + TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IContextMenu) || + IsEqualIID(riid, &IID_IContextMenu2)) + { + *ppvObj = &This->lpVtblContextMenu; + } +#if 0 + else if(IsEqualIID(riid, &IID_IShellExtInit)) + { + *ppvObj = &This->lpvtblShellExtInit; + } +#endif + + if(*ppvObj) + { + IUnknown_AddRef((IUnknown*)*ppvObj); + TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI INewItem_fnAddRef(INewMenuImpl *iface) +{ + /* INewItem service is singleton */ + return 2; +} + +static ULONG WINAPI INewItem_fnRelease(INewMenuImpl *This) +{ + /* INewItem service is singleton */ + return 1; +} + +static +HRESULT +WINAPI +INewItem_IContextMenu_fnQueryInterface( IContextMenu2* iface, REFIID riid, void** ppvObject ) +{ + INewMenuImpl *This = impl_from_IContextMenu(iface); + return INewItem_fnQueryInterface(This, riid, ppvObject); +} + +static +ULONG +WINAPI +INewItem_IContextMenu_fnAddRef(IContextMenu2 *iface) +{ + INewMenuImpl *This = impl_from_IContextMenu(iface); + return INewItem_fnAddRef(This); +} + +static +ULONG +WINAPI +INewItem_IContextMenu_fnRelease(IContextMenu2 *iface) +{ + INewMenuImpl *This = impl_from_IContextMenu(iface); + return INewItem_fnRelease(This); +} + +static +HRESULT +WINAPI +INewItem_IContextMenu_fnQueryContextMenu(IContextMenu2 *iface, + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + WCHAR szBuffer[200]; + MENUITEMINFOW mii; + HMENU hSubMenu; + int id = 1; + INewMenuImpl *This = impl_from_IContextMenu(iface); + + TRACE("%p %p %u %u %u %u\n", This, + hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); + + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, szBuffer, 200)) + { + szBuffer[0] = 0; + } + szBuffer[199] = 0; + + hSubMenu = CreateMenu(); + memset( &mii, 0, sizeof(mii) ); + mii.cbSize = sizeof (mii); + mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; + mii.fType = MFT_STRING; + mii.wID = idCmdFirst + id++; + mii.dwTypeData = szBuffer; + mii.cch = strlenW( mii.dwTypeData ); + mii.fState = MFS_ENABLED; + + if (hSubMenu) + { + id += InsertShellNewItems( hSubMenu, idCmdFirst, 0, This); + mii.fMask |= MIIM_SUBMENU; + mii.hSubMenu = hSubMenu; + } + + + if (!InsertMenuItemW( hmenu, indexMenu, TRUE, &mii )) + return E_FAIL; + + return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id ); +} + +static +HRESULT +WINAPI +INewItem_IContextMenu_fnInvokeCommand( IContextMenu2* iface, + LPCMINVOKECOMMANDINFO lpici ) +{ + LPSHELLBROWSER lpSB; + LPSHELLVIEW lpSV = NULL; + HRESULT hr; + INewMenuImpl *This = impl_from_IContextMenu(iface); + + if((lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER,0,0))) + { + IShellBrowser_QueryActiveShellView(lpSB, &lpSV); + } + + if (LOWORD(lpici->lpVerb) == 0) + { + DoNewFolder(This, lpSV); + } + + hr = DoShellNewCmd(This, lpici); + if (SUCCEEDED(hr) && lpSV) + { + IShellView_Refresh(lpSV); + } + + TRACE("INewItem_IContextMenu_fnInvokeCommand %x\n", hr); + return hr; +} + +static +HRESULT +WINAPI +INewItem_IContextMenu_fnGetCommandString( IContextMenu2* iface, + UINT_PTR idCmd, + UINT uType, + UINT* pwReserved, + LPSTR pszName, + UINT cchMax ) +{ + INewMenuImpl *This = impl_from_IContextMenu(iface); + + FIXME("%p %lu %u %p %p %u\n", This, + idCmd, uType, pwReserved, pszName, cchMax ); + + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +INewItem_IContextMenu_fnHandleMenuMsg(IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + INewMenuImpl *This = impl_from_IContextMenu(iface); + DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; + MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; + + TRACE("INewItem_IContextMenu_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + +#if 0 + switch(uMsg) + { + case WM_MEASUREITEM: + return DoMeasureItem(This, (HWND)wParam, lpmis); + break; + case WM_DRAWITEM: + return DoDrawItem(This, (HWND)wParam, lpids); + break; + } +#else + return S_OK; +#endif + + return E_UNEXPECTED; +} + +static const IContextMenu2Vtbl cmvt = +{ + INewItem_IContextMenu_fnQueryInterface, + INewItem_IContextMenu_fnAddRef, + INewItem_IContextMenu_fnRelease, + INewItem_IContextMenu_fnQueryContextMenu, + INewItem_IContextMenu_fnInvokeCommand, + INewItem_IContextMenu_fnGetCommandString, + INewItem_IContextMenu_fnHandleMenuMsg +}; + +HRESULT WINAPI INewItem_Constructor(LPSHELLFOLDER pSFParent, REFIID riid, LPVOID *ppv) +{ + INewMenuImpl * ow; + HRESULT res; + static INewMenuImpl *cached_ow; + + if (!cached_ow) + { + ow = LocalAlloc(LMEM_ZEROINIT, sizeof(INewMenuImpl)); + if (!ow) + { + return E_OUTOFMEMORY; + } + + ow->lpVtblContextMenu = &cmvt; + ow->s_SnHead = NULL; + + if (InterlockedCompareExchangePointer((void *)&cached_ow, ow, NULL) != NULL) + { + /* some other thread already been here */ + LocalFree( ow ); + } + } + + TRACE("(%p)->()\n",cached_ow); + if (cached_ow->pSFParent) + { + IShellFolder_Release(cached_ow->pSFParent); + } + cached_ow->pSFParent = pSFParent; + IShellFolder_AddRef(pSFParent); + + res = INewItem_fnQueryInterface( cached_ow, riid, ppv ); + return res; +} Propchange: trunk/reactos/dll/win32/shell32/shv_item_new.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 30306: Silence some warnings when compiling taskmgr with MSVC2005
by cfinck＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: cfinck Date: Fri Nov 9 22:46:01 2007 New Revision: 30306 URL: http://svn.reactos.org/svn/reactos?rev=30306&view=rev Log: Silence some warnings when compiling taskmgr with MSVC2005 Modified: trunk/reactos/base/applications/taskmgr/column.c trunk/reactos/base/applications/taskmgr/dbgchnl.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/precomp.h Modified: trunk/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.c (original) +++ trunk/reactos/base/applications/taskmgr/column.c Fri Nov 9 22:46:01 2007 @@ -105,7 +105,7 @@ void SaveColumnSettings(void) { HDITEM hditem; - unsigned int i, n; + int i, n; WCHAR text[260]; LRESULT size; @@ -121,7 +121,7 @@ SendMessageW(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); /* Get visible columns */ - for (i=0; i<SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) { + for (i = 0; i < SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) { memset(&hditem, 0, sizeof(HDITEM)); hditem.mask = HDI_TEXT|HDI_WIDTH; @@ -130,7 +130,7 @@ SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem); - for (n=0; n<COLUMN_NMAX; n++) { + for (n = 0; n < COLUMN_NMAX; n++) { LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR)); if (_wcsicmp(text, szTemp) == 0) { Modified: trunk/reactos/base/applications/taskmgr/dbgchnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/dbgchnl.c (original) +++ trunk/reactos/base/applications/taskmgr/dbgchnl.c Fri Nov 9 22:46:01 2007 @@ -237,7 +237,7 @@ void* buf_addr; WCHAR buffer[32]; void* addr; - const WCHAR** cache = NULL; + WCHAR** cache = NULL; unsigned i, j, num_cache, used_cache; addr = get_symbol(hProcess, "first_dll", "libwine.so"); Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c Fri Nov 9 22:46:01 2007 @@ -386,7 +386,8 @@ int PerfGetIndexByProcessId(DWORD dwProcessId) { - int Index, FoundIndex = -1; + int FoundIndex = -1; + ULONG Index; EnterCriticalSection(&PerfDataCriticalSection); Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c Fri Nov 9 22:46:01 2007 @@ -441,8 +441,8 @@ /* * Get the memory usage */ - CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); + CommitChargeTotal = PerfDataGetCommitChargeTotalK(); + CommitChargeLimit = PerfDataGetCommitChargeLimitK(); nBarsUsed1 = CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0; PhysicalMemoryTotal = PerfDataGetPhysicalMemoryTotalK(); Modified: trunk/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/precomp.h (original) +++ trunk/reactos/base/applications/taskmgr/precomp.h Fri Nov 9 22:46:01 2007 @@ -5,17 +5,18 @@ #error Task-Manager uses NDK functions, so it can only be compiled with Unicode support enabled! #endif +#include <ctype.h> +#include <math.h> +#include <stdlib.h> +#include <stdio.h> + #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <aclapi.h> #include <commctrl.h> #include <shellapi.h> -#include <aclapi.h> -#include <stdlib.h> -#include <math.h> -#include <stdio.h> -#include <ctype.h> #include "column.h" #include "taskmgr.h" @@ -35,4 +36,5 @@ #include "priority.h" #include "run.h" #include "trayicon.h" + #endif /* __PRECOMP_H */

1 0

[peterw] 30305: - Rename reactos.ico to rosbe.ico and add a trash icon from trunk for the uninstall icon.
by peterw＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: peterw Date: Fri Nov 9 21:40:14 2007 New Revision: 30305 URL: http://svn.reactos.org/svn/reactos?rev=30305&view=rev Log: - Rename reactos.ico to rosbe.ico and add a trash icon from trunk for the uninstall icon. Added: trunk/tools/RosBE/RosBE-Windows/Icons/rosbe.ico - copied unchanged from r30297, trunk/tools/RosBE/RosBE-Windows/Icons/reactos.ico trunk/tools/RosBE/RosBE-Windows/Icons/uninstall.ico (with props) Removed: trunk/tools/RosBE/RosBE-Windows/Icons/reactos.ico Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Removed: trunk/tools/RosBE/RosBE-Windows/Icons/reactos.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Icons/re… ============================================================================== Binary file - no diff available. Added: trunk/tools/RosBE/RosBE-Windows/Icons/uninstall.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Icons/un… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/Icons/uninstall.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Fri Nov 9 21:40:14 2007 @@ -50,8 +50,8 @@ ;; MUI Settings ;; !define MUI_ABORTWARNING -!define MUI_ICON "Icons\reactos.ico" -!define MUI_UNICON "Icons\reactos.ico" +!define MUI_ICON "Icons\rosbe.ico" +!define MUI_UNICON "Icons\uninstall.ico" !define MUI_COMPONENTSPAGE_NODESC !define MUI_WELCOMEPAGE_TITLE_3LINES @@ -288,8 +288,9 @@ Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" Delete /REBOOTOK "$INSTDIR\readme.pdf" - Delete /REBOOTOK "$INSTDIR\reactos.ico" + Delete /REBOOTOK "$INSTDIR\rosbe.ico" Delete /REBOOTOK "$INSTDIR\terminal.ico" + Delete /REBOOTOK "$INSTDIR\uninstall.ico" Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" Delete /REBOOTOK "$INSTDIR\LICENSE.txt"

1 0

[jimtabor] 30304: No need for dca here if the ScreenDeviceContext is set inaccessible. So free the dca.
by jimtabor＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: jimtabor Date: Fri Nov 9 21:05:41 2007 New Revision: 30304 URL: http://svn.reactos.org/svn/reactos?rev=30304&view=rev Log: No need for dca here if the ScreenDeviceContext is set inaccessible. So free the dca. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Fri Nov 9 21:05:41 2007 @@ -304,7 +304,8 @@ IntDestroyPrimarySurface(); return FALSE; } - DC_SetOwnership(ScreenDeviceContext, NULL); + DC_FreeDcAttr(ScreenDeviceContext); // Free the dcattr! + DC_SetOwnership(ScreenDeviceContext, NULL); // This hDC is inaccessible! /* Setup the cursor */ co_IntLoadDefaultCursors(); @@ -316,7 +317,7 @@ IntEndDesktopGraphics(VOID) { if (NULL != ScreenDeviceContext) - { + { // No need to allocate a new dcattr. DC_SetOwnership(ScreenDeviceContext, PsGetCurrentProcess()); NtGdiDeleteObjectApp(ScreenDeviceContext); ScreenDeviceContext = NULL;

1 0

[peterw] 30303: - Fix Typo.
by peterw＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: peterw Date: Fri Nov 9 21:03:34 2007 New Revision: 30303 URL: http://svn.reactos.org/svn/reactos?rev=30303&view=rev Log: - Fix Typo. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Fri Nov 9 21:03:34 2007 @@ -142,7 +142,7 @@ echo either of the options is not given you will be prompted for it. echo. echo FILE - This can be either a fully specified path or just the - echo file name [you can use partial name ie. ntdll*] of + echo file name [you can use a partial name ie. ntdll*] of echo the executable to be analyzed. When using just a file echo the current directory and all sub-directories are echo searched.

1 0

[peterw] 30302: - Remove references to tools that will no longer be included.
by peterw＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: peterw Date: Fri Nov 9 20:51:02 2007 New Revision: 30302 URL: http://svn.reactos.org/svn/reactos?rev=30302&view=rev Log: - Remove references to tools that will no longer be included. Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/README.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt Fri Nov 9 20:51:02 2007 @@ -9,23 +9,7 @@ - NASM is licensed under the LGPLv2.1. -- tee is licensed under the GPLv2. - -- test is licensed under the GPLv2 or later. - -- cut is licensed under the GPLv2 or later. - -- grep is licensed under the GPLv2 or later. - -- sed is licensed under the GPLv2 or later. - -- pcre is licensed under the GPLv2 or later. - - svn is licensed under the Apache/BSD-style open source license. - -- libiconv is licensed under the LGPLv2. - -- libintl is licensed under the LGPLv2.1 and is part of the GNU gettext package. *** The complete text of the GNU GENERAL PUBLIC LICENSE v2 Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/README.txt Fri Nov 9 20:51:02 2007 @@ -39,12 +39,6 @@ NSIS (Nullsoft Scriptable Install System) http://nsis.sourceforge.net -The GnuWin32 Project (tee/test/sed/grep and their dependencies were obtained here) -http://gnuwin32.sourceforge.net - -Olof's Tools (cut) -http://www.ltr-data.se - Subversion Client http://subversion.tigris.org

1 0

[greatlrd] 30301: Update the documentation adding lite more code
by greatlrd＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: greatlrd Date: Fri Nov 9 20:33:02 2007 New Revision: 30301 URL: http://svn.reactos.org/svn/reactos?rev=30301&view=rev Log: Update the documentation adding lite more code Modified: branches/reactx/reactos/dll/directx/ksuser/ksuser.c branches/reactx/reactos/dll/directx/ksuser/ksuser.h Modified: branches/reactx/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.c (original) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.c Fri Nov 9 20:33:02 2007 @@ -20,17 +20,16 @@ /*++ * @name KsCreateAllocator * @implemented -* -* The function KsCreateAllocator -* -* @param -* -* @param -* -* @param ACCESS_MASK DesiredAccess -* Desrided access -* -* @param +* The function KsCreateAllocator creates a handle to an allocator for the given sink connection handle +* +* @param HANDLE ConnectionHandle +* Handle to the sink connection on which to create the allocator +* +* @param PKSALLOCATOR_FRAMING AllocatorFraming +* the input param we using to alloc our framing +* +* @param PHANDLE AllocatorHandle +* Our new handle that we have alloc * * @return * Return NTSTATUS error code or sussess code. @@ -59,16 +58,16 @@ * @name KsCreateClock * @implemented * -* The function KsCreateClock -* -* @param -* -* @param -* -* @param ACCESS_MASK DesiredAccess -* Desrided access -* -* @param +* The function KsCreateClock creates handle to clock instance +* +* @param HANDLE ConnectionHandle +* Handle to use to create the clock +* +* @param PKSCLOCK_CREATE ClockCreate +* paramenter to use to create the clock +* +* @param PHANDLE ClockHandle +* The new handle * * @return * Return NTSTATUS error code or sussess code. @@ -92,42 +91,58 @@ ClockHandle); } - - /*++ * @name KsCreatePin * @implemented * -* The function KsCreatePin -* -* @param -* -* @param -* +* The function KsCreatePin passes a connection request to device and create pin instance +* +* @param HANDLE FilterHandle +* handle of the filter initiating the create request +* +* @param PKSPIN_CONNECT Connect +* Pointer to a KSPIN_CONNECT structure that contains parameters for the requested connection. +* This should be followed in memory by a KSDATAFORMAT data structure, describing the data format +* requested for the connection. + * @param ACCESS_MASK DesiredAccess * Desrided access * -* @param -* -* @return -* Return NTSTATUS error code or sussess code. -* -* @remarks. -* none -* -*--*/ +* @param PHANDLE ConnectionHandle +* connection handle passed +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* The flag in PKSDATAFORMAT is not really document, +* to find it u need api mointor allot api and figout +* how it works, only flag I have found is the +* KSDATAFORMAT_ATTRIBUTES flag, it doing a Align +* of LONLONG size, it also round up it. +* +*--*/ + KSDDKAPI NTSTATUS NTAPI KsCreatePin(HANDLE FilterHandle, PKSPIN_CONNECT Connect, ACCESS_MASK DesiredAccess, - OUT PHANDLE ConnectionHandle) -{ + PHANDLE ConnectionHandle) +{ + ULONG BufferSize = sizeof(KSPIN_CONNECT); + PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ( ((ULONG)Connect) + ((ULONG)sizeof(KSPIN_CONNECT)) ) ); + + if (DataFormat->Flags & KSDATAFORMAT_ATTRIBUTES) + { + BufferSize += (ROUND_UP(DataFormat->FormatSize,sizeof(LONGLONG)) + DataFormat->FormatSize); + } + return KsiCreateObjectType(FilterHandle, KSSTRING_Pin, Connect, - sizeof(KSPIN_CONNECT), + BufferSize, DesiredAccess, ConnectionHandle); Modified: branches/reactx/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ksus… ============================================================================== --- branches/reactx/reactos/dll/directx/ksuser/ksuser.h (original) +++ branches/reactx/reactos/dll/directx/ksuser/ksuser.h Fri Nov 9 20:33:02 2007 @@ -3,6 +3,7 @@ #define _KSDDK_ #include <windows.h> +#include <reactos/helper.h> #ifndef NTSTATUS #define NTSTATUS DWORD

1 0

[janderwald] 30300: - move FCIDM_SHVIEW_NEW, FCIDM_SHVIEW_NEWFOLDER, FCIDM_SHVIEW_NEWLINK, from menu to resource strings - delete new file object from background contextmenu code as this code this should be implemented as context menu extension
by janderwald＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: janderwald Date: Fri Nov 9 20:24:10 2007 New Revision: 30300 URL: http://svn.reactos.org/svn/reactos?rev=30300&view=rev Log: - move FCIDM_SHVIEW_NEW, FCIDM_SHVIEW_NEWFOLDER, FCIDM_SHVIEW_NEWLINK, from menu to resource strings - delete new file object from background contextmenu code as this code this should be implemented as context menu extension Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Ïîñòàâÿíå", FCIDM_SHVIEW_INSERT MENUITEM "Ïîñòàâÿíå êàòî âðúçêà", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Íîâè" - BEGIN - MENUITEM "Íîâà &ïàïêà", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Íîâà &âðúçêà", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Íîâè" + FCIDM_SHVIEW_NEWFOLDER "Íîâà &ïàïêà" + FCIDM_SHVIEW_NEWLINK "Íîâà &âðúçêà" +END Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Fri Nov 9 20:24:10 2007 @@ -55,14 +55,6 @@ MENUITEM SEPARATOR MENUITEM "V&loit", FCIDM_SHVIEW_INSERT MENUITEM "Vloit zást&upce", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "&Nový" - BEGIN - MENUITEM "Nová &sloka", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Nový &zástupce", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "&Vlastnosti", FCIDM_SHVIEW_PROPERTIES END END @@ -436,4 +428,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "&Nový" + FCIDM_SHVIEW_NEWFOLDER "Nová &sloka" + FCIDM_SHVIEW_NEWLINK "Nový &zástupce" +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Fri Nov 9 20:24:10 2007 @@ -56,14 +56,6 @@ MENUITEM SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Neu" - BEGIN - MENUITEM "Neues Ver&zeichnis", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Neuer Ver&weis", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END END @@ -436,4 +428,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Autoren" IDS_SHELL_ABOUT_BACK "< &Zurück" -END + FCIDM_SHVIEW_NEW "Neu" + FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" + FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Fri Nov 9 20:24:10 2007 @@ -55,14 +55,6 @@ MENUITEM SEPARATOR MENUITEM "Pegar", FCIDM_SHVIEW_INSERT MENUITEM "Pegar acceso directo", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Nuevo" - BEGIN - MENUITEM "Nueva &carpeta", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Nuevo &acceso directo", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Propiedades", FCIDM_SHVIEW_PROPERTIES END END @@ -436,4 +428,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Nuevo" + FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" + FCIDM_SHVIEW_NEWLINK "Nuevo &acceso directo" +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Liitä", FCIDM_SHVIEW_INSERT MENUITEM "Liitä Linkiksi", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Uusi" - BEGIN - MENUITEM "Uusi &Kansio", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Uusi &Linkki", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Uusi" + FCIDM_SHVIEW_NEWFOLDER "Uusi &Kansio" + FCIDM_SHVIEW_NEWLINK "Uusi &Linkki" +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Fri Nov 9 20:24:10 2007 @@ -58,14 +58,6 @@ MENUITEM SEPARATOR MENUITEM "Coller", FCIDM_SHVIEW_INSERT MENUITEM "Coller comme un lien", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Nouveau" - BEGIN - MENUITEM "Nouveau d&ossier", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Nouveau &lien", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Propriétés", FCIDM_SHVIEW_PROPERTIES END END @@ -439,4 +431,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Nouveau" + FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" + FCIDM_SHVIEW_NEWLINK "Nouveau &lien" +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Fri Nov 9 20:24:10 2007 @@ -57,14 +57,6 @@ MENUITEM SEPARATOR MENUITEM "Beillesztés", FCIDM_SHVIEW_INSERT MENUITEM "Parancsikon beillesztése", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Ú&j" - BEGIN - MENUITEM "&Mappa", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "&Parancsikon", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Beállítások", FCIDM_SHVIEW_PROPERTIES END END @@ -438,4 +430,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Ú&j" + FCIDM_SHVIEW_NEWFOLDER "&Mappa" + FCIDM_SHVIEW_NEWLINK "&Parancsikon" +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Fri Nov 9 20:24:10 2007 @@ -55,14 +55,6 @@ MENUITEM SEPARATOR MENUITEM "Incolla", FCIDM_SHVIEW_INSERT MENUITEM "Crea Collegamento", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Nuovo" - BEGIN - MENUITEM "Nuova &Cartella", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Nuovo &Collegamento", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Proprietà", FCIDM_SHVIEW_PROPERTIES END END @@ -436,4 +428,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Nuovo" + FCIDM_SHVIEW_NEWFOLDER "Nuova &Cartella" + FCIDM_SHVIEW_NEWLINK "Nuovo &Collegamento" +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "\\èt¯", FCIDM_SHVIEW_INSERT MENUITEM "V[gJbgÌ\\èt¯", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "VKì¬" - BEGIN - MENUITEM "tH_(&F)", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "V[gJbg(&L)", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "vpeB", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "VKì¬" + FCIDM_SHVIEW_NEWFOLDER "tH_(&F)" + FCIDM_SHVIEW_NEWLINK "V[gJbg(&L)" +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT MENUITEM "Lim inn som snarvei", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Ny" - BEGIN - MENUITEM "Ny &mappe", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Ny &snarvei", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Ny" + FCIDM_SHVIEW_NEWFOLDER "Ny &mappe" + FCIDM_SHVIEW_NEWLINK "Ny &snarvei" +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Fri Nov 9 20:24:10 2007 @@ -55,14 +55,6 @@ MENUITEM SEPARATOR MENUITEM "W&klej", FCIDM_SHVIEW_INSERT MENUITEM "Wklej s&krót", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "&Nowy" - BEGIN - MENUITEM "&Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "&Skrót", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "W³aciwoci", FCIDM_SHVIEW_PROPERTIES END END @@ -436,4 +428,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "&Nowy" + FCIDM_SHVIEW_NEWFOLDER "&Folder" + FCIDM_SHVIEW_NEWLINK "&Skrót" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Fri Nov 9 20:24:10 2007 @@ -56,14 +56,6 @@ MENUITEM SEPARATOR MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT MENUITEM "Colar a&talho", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Novo" - BEGIN - MENUITEM "&Pasta", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "&Atalho", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END END @@ -437,4 +429,8 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Novo" + FCIDM_SHVIEW_NEWFOLDER "&Pasta" + FCIDM_SHVIEW_NEWLINK "&Atalho" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Fri Nov 9 20:24:10 2007 @@ -56,14 +56,6 @@ MENUITEM SEPARATOR MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT MENUITEM "Colar a&talho", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Novo" - BEGIN - MENUITEM "&Pasta", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "&Atalho", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END END @@ -437,4 +429,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Novo" + FCIDM_SHVIEW_NEWFOLDER "&Pasta" + FCIDM_SHVIEW_NEWLINK "&Atalho" +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Fri Nov 9 20:24:10 2007 @@ -55,14 +55,6 @@ MENUITEM SEPARATOR MENUITEM "&Âñòàâèòü", FCIDM_SHVIEW_INSERT MENUITEM "Âñòàâèòü &ÿðëûê", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Ñîçäàòü" - BEGIN - MENUITEM "&Ïàïêà", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "&ßðëûê", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Ñâî&éñòâà", FCIDM_SHVIEW_PROPERTIES END END @@ -434,4 +426,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Àâòîðû" IDS_SHELL_ABOUT_BACK "< &Íàçàä" -END + FCIDM_SHVIEW_NEW "Ñîçäàòü" + FCIDM_SHVIEW_NEWFOLDER "&Ïàïêà" + FCIDM_SHVIEW_NEWLINK "&ßðëûê" +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Yapýþtýr", FCIDM_SHVIEW_INSERT MENUITEM "Kýsayol Yapýþtýr", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Yeni" - BEGIN - MENUITEM "Yeni &Dizin", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Yeni &Kýsayol", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Özellikler", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Yeni" + FCIDM_SHVIEW_NEWFOLDER "Yeni &Dizin" + FCIDM_SHVIEW_NEWLINK "Yeni &Kýsayol" +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Âñòàâèòè", FCIDM_SHVIEW_INSERT MENUITEM "Âñòàâèòè Ïîñèëàííÿ", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "Ñòâîðèòè" - BEGIN - MENUITEM "Íîâà &Òåêà", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Íîâå &Ïîñèëàííÿ", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Âëàñòèâîñò³", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "Ñòâîðèòè" + FCIDM_SHVIEW_NEWFOLDER "Íîâà &Òåêà" + FCIDM_SHVIEW_NEWLINK "Íîâå &Ïîñèëàííÿ" +END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Fri Nov 9 20:24:10 2007 @@ -54,14 +54,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -435,4 +427,7 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" -END + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Fri Nov 9 20:24:10 2007 @@ -55,14 +55,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -436,6 +428,9 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Fri Nov 9 20:24:10 2007 @@ -55,14 +55,6 @@ MENUITEM SEPARATOR MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END END @@ -436,6 +428,9 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" + FCIDM_SHVIEW_NEW "New" + FCIDM_SHVIEW_NEWFOLDER "New &Folder" + FCIDM_SHVIEW_NEWLINK "New &Link" END #pragma code_page(default) 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 (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Fri Nov 9 20:24:10 2007 @@ -105,6 +105,7 @@ #define IDS_OPEN_WITH_CHOOSE 143 #define IDS_SHELL_ABOUT_AUTHORS 144 #define IDS_SHELL_ABOUT_BACK 145 +#define FCIDM_SHVIEW_NEW 146 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964 Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Fri Nov 9 20:24:10 2007 @@ -49,493 +49,10 @@ IShellFolder* pSFParent; LONG ref; BOOL bDesktop; - UINT iIdShellNewFirst; - UINT iIdShellNewLast; } BgCmImpl; -typedef enum -{ - SHELLNEW_TYPE_COMMAND = 1, - SHELLNEW_TYPE_DATA = 2, - SHELLNEW_TYPE_FILENAME = 4, - SHELLNEW_TYPE_NULLFILE = 8 -}SHELLNEW_TYPE; - - -typedef struct __SHELLNEW_ITEM__ -{ - SHELLNEW_TYPE Type; - LPWSTR szExt; - LPWSTR szTarget; - LPWSTR szDesc; - LPWSTR szIcon; - struct __SHELLNEW_ITEM__ * Next; -}SHELLNEW_ITEM, *PSHELLNEW_ITEM; - - static const IContextMenu2Vtbl cmvt; -static PSHELLNEW_ITEM s_SnHead = NULL; - -static -BOOL -GetKeyDescription(LPWSTR szKeyName, LPWSTR szResult) -{ - HKEY hKey; - DWORD dwDesc, dwError; - WCHAR szDesc[100]; - - static const WCHAR szFriendlyTypeName[] = { '\\','F','r','i','e','n','d','l','y','T','y','p','e','N','a','m','e',0 }; - - TRACE("GetKeyDescription: keyname %s\n", debugstr_w(szKeyName)); - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0, KEY_READ | KEY_QUERY_VALUE,&hKey) != ERROR_SUCCESS) - return FALSE; - - if (RegLoadMUIStringW(hKey,szFriendlyTypeName,szResult,MAX_PATH,&dwDesc,0,NULL) == ERROR_SUCCESS) - { - TRACE("result %s\n", debugstr_w(szResult)); - RegCloseKey(hKey); - return TRUE; - } - /* fetch default value */ - dwDesc = sizeof(szDesc); - dwError = RegGetValueW(hKey,NULL,NULL, RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); - if(dwError == ERROR_SUCCESS) - { - if (wcsncmp(szDesc, szKeyName, dwDesc / sizeof(WCHAR))) - { - /* recurse for to a linked key */ - if (!GetKeyDescription(szDesc, szResult)) - { - /* use description */ - wcscpy(szResult, szDesc); - } - } - else - { - /* use default value as description */ - wcscpy(szResult, szDesc); - } - } - else - { - /* registry key w/o default key?? */ - TRACE("RegGetValue failed with %x\n", dwError); - wcscpy(szResult, szKeyName); - } - - RegCloseKey(hKey); - return TRUE; -} - - -PSHELLNEW_ITEM LoadItem(LPWSTR szKeyName) -{ - HKEY hKey; - DWORD dwIndex; - WCHAR szName[MAX_PATH]; - WCHAR szCommand[MAX_PATH]; - WCHAR szDesc[MAX_PATH] = {0}; - WCHAR szIcon[MAX_PATH] = {0}; - DWORD dwName, dwCommand; - LONG result; - PSHELLNEW_ITEM pNewItem; - - static const WCHAR szShellNew[] = { '\\','S','h','e','l','l','N','e','w',0 }; - static const WCHAR szCmd[] = { 'C','o','m','m','a','n','d',0 }; - static const WCHAR szData[] = { 'D','a','t','a',0 }; - static const WCHAR szFileName[] = { 'F','i','l','e','N','a','m','e', 0 }; - static const WCHAR szNullFile[] = { 'N','u','l','l','F','i','l','e', 0 }; - - wcscpy(szName, szKeyName); - GetKeyDescription(szKeyName, szDesc); - wcscat(szName, szShellNew); - result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szName,0,KEY_READ,&hKey); - - //TRACE("LoadItem dwName %d keyname %s szName %s szDesc %s szIcon %s\n", dwName, debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); - - if (result != ERROR_SUCCESS) - { - return NULL; - } - - dwIndex = 0; - pNewItem = NULL; - - do - { - dwName = MAX_PATH; - dwCommand = MAX_PATH; - result = RegEnumValueW(hKey,dwIndex,szName,&dwName,NULL,NULL,(LPBYTE)szCommand, &dwCommand); - if (result == ERROR_SUCCESS) - { - long type = -1; - LPWSTR szTarget = szCommand; - //TRACE("szName %s szCommand %s\n", debugstr_w(szName), debugstr_w(szCommand)); - if (!wcsicmp(szName, szCmd)) - { - type = SHELLNEW_TYPE_COMMAND; - }else if (!wcsicmp(szName, szData)) - { - type = SHELLNEW_TYPE_DATA; - } - else if (!wcsicmp(szName, szFileName)) - { - type = SHELLNEW_TYPE_FILENAME; - } - else if (!wcsicmp(szName, szNullFile)) - { - type = SHELLNEW_TYPE_NULLFILE; - szTarget = NULL; - } - if (type != -1) - { - pNewItem = HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); - pNewItem->Type = type; - if (szTarget) - pNewItem->szTarget = wcsdup(szTarget); - else - pNewItem->szTarget = NULL; - - pNewItem->szDesc = wcsdup(szDesc); - pNewItem->szIcon = wcsdup(szIcon); - pNewItem->szExt = wcsdup(szKeyName); - pNewItem->Next = NULL; - break; - } - } - dwIndex++; - }while(result != ERROR_NO_MORE_ITEMS); - RegCloseKey(hKey); - return pNewItem; -} - - -BOOL -LoadShellNewItems() -{ - DWORD dwIndex; - WCHAR szName[MAX_PATH]; - LONG result; - PSHELLNEW_ITEM pNewItem; - PSHELLNEW_ITEM pCurItem = NULL; - static WCHAR szLnk[] = { '.','l','n','k',0 }; - - dwIndex = 0; - do - { - result = RegEnumKeyW(HKEY_CLASSES_ROOT,dwIndex,szName,MAX_PATH); - if (result == ERROR_SUCCESS) - { - pNewItem = LoadItem(szName); - if (pNewItem) - { - if (!wcsicmp(pNewItem->szExt, szLnk)) - { - if (s_SnHead) - { - pNewItem->Next = s_SnHead; - s_SnHead = pNewItem; - } - else - { - s_SnHead = pCurItem = pNewItem; - } - } - else - { - if (pCurItem) - { - pCurItem->Next = pNewItem; - pCurItem = pNewItem; - } - else - { - pCurItem = s_SnHead = pNewItem; - } - } - } - } - dwIndex++; - }while(result != ERROR_NO_MORE_ITEMS); - - if (s_SnHead == NULL) - return FALSE; - else - return TRUE; -} -VOID -InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu, BgCmImpl * This) -{ - MENUITEMINFOW mii; - PSHELLNEW_ITEM pCurItem; - UINT i; - if (s_SnHead == NULL) - { - if (!LoadShellNewItems()) - return; - - } - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - - This->iIdShellNewFirst = idFirst; - - /* - * FIXME: small hack for new shortcut - */ - - mii.fMask = MIIM_ID; - mii.wID = idFirst; - SetMenuItemInfoW(hMenu, 1, TRUE, &mii); - idFirst++; - - mii.fMask = MIIM_TYPE | MIIM_ID; - mii.fType = MFT_SEPARATOR; - mii.wID = -1; - InsertMenuItemW(hMenu, -1, TRUE, &mii); - - - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; - mii.fType = MFT_OWNERDRAW; - mii.fState = MFS_ENABLED; - - pCurItem = s_SnHead; - i = 0; - - while(pCurItem) - { - if (i >= 1) - { - mii.dwTypeData = pCurItem->szDesc; - mii.cch = strlenW(mii.dwTypeData); - mii.wID = idFirst; - InsertMenuItemW(hMenu, idMenu, TRUE, &mii); - idMenu++; - idFirst++; - } - pCurItem = pCurItem->Next; - i++; - } - This->iIdShellNewLast = idFirst; -} -VOID -DoShellNewCmd(BgCmImpl * This, LPCMINVOKECOMMANDINFO lpcmi) -{ - PSHELLNEW_ITEM pCurItem = s_SnHead; - IPersistFolder3 * psf; - LPITEMIDLIST pidl; - STRRET strTemp; - WCHAR szTemp[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - WCHAR szPath[MAX_PATH]; - STARTUPINFOW sInfo; - PROCESS_INFORMATION pi; - UINT i, target; - HANDLE hFile; - DWORD dwWritten, dwError; - - static const WCHAR szNew[] = { 'N','e','w',' ',0 }; //FIXME - static const WCHAR szP1[] = { '%', '1', 0 }; - static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 }; - - i = This->iIdShellNewFirst; - target = LOWORD(lpcmi->lpVerb); - - while(pCurItem) - { - if (i == target) - break; - - pCurItem = pCurItem->Next; - i++; - } - - if (!pCurItem) - return; - - if (This->bDesktop) - { - if (!SHGetSpecialFolderPathW(0, szPath, CSIDL_DESKTOPDIRECTORY, FALSE)) - { - ERR("Failed to get desktop folder location"); - return; - } - } - else - { - if (IShellFolder2_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) - { - ERR("Failed to get interface IID_IPersistFolder2\n"); - return; - } - if (IPersistFolder2_GetCurFolder(psf, &pidl) != S_OK) - { - ERR("IPersistFolder2_GetCurFolder failed\n"); - return; - } - - if (IShellFolder2_GetDisplayNameOf(This->pSFParent, pidl, SHGDN_FORPARSING, &strTemp) != S_OK) - { - ERR("IShellFolder_GetDisplayNameOf failed\n"); - return; - } - StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); - } - switch(pCurItem->Type) - { - case SHELLNEW_TYPE_COMMAND: - { - LPWSTR ptr; - LPWSTR szCmd; - - if (!ExpandEnvironmentStringsW(pCurItem->szTarget, szBuffer, MAX_PATH)) - { - TRACE("ExpandEnvironmentStrings failed\n"); - break; - } - - ptr = wcsstr(szBuffer, szP1); - if (ptr) - { - ptr[1] = 's'; - sprintfW(szTemp, szBuffer, szPath); - ptr = szTemp; - } - else - { - ptr = szBuffer; - } - - ZeroMemory(&sInfo, sizeof(sInfo)); - sInfo.cb = sizeof(sizeof(sInfo)); - szCmd = wcsdup(ptr); - if (!szCmd) - break; - if (CreateProcessW(NULL, szCmd, NULL, NULL,FALSE,0,NULL,NULL,&sInfo, &pi)) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - free(szCmd); - break; - } - case SHELLNEW_TYPE_DATA: - case SHELLNEW_TYPE_FILENAME: - case SHELLNEW_TYPE_NULLFILE: - { - i = 2; - - PathAddBackslashW(szPath); - wcscat(szPath, szNew); - wcscat(szPath, pCurItem->szDesc); - wcscpy(szBuffer, szPath); - wcscat(szBuffer, pCurItem->szExt); - do - { - hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile != INVALID_HANDLE_VALUE) - break; - dwError = GetLastError(); - - TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError); - sprintfW(szBuffer, szFormat, szPath, i, pCurItem->szExt); - i++; - }while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS); - - if (hFile == INVALID_HANDLE_VALUE) - return; - - if (pCurItem->Type == SHELLNEW_TYPE_DATA) - { - i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH*2, NULL, NULL); - if (i) - { - WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL); - } - } - CloseHandle(hFile); - if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) - { - if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE)) - break; - } - TRACE("Notifying fs %s\n", debugstr_w(szBuffer)); - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL); - break; - } - } -} -HRESULT -DoMeasureItem(BgCmImpl *This, HWND hWnd, MEASUREITEMSTRUCT * lpmis) -{ - PSHELLNEW_ITEM pCurItem; - PSHELLNEW_ITEM pItem; - UINT i; - HDC hDC; - SIZE size; - - TRACE("DoMeasureItem entered with id %x\n", lpmis->itemID); - - pCurItem = s_SnHead; - - i = This->iIdShellNewFirst; - pItem = NULL; - while(pCurItem) - { - if (i == lpmis->itemID) - { - pItem = pCurItem; - break; - } - pCurItem = pCurItem->Next; - i++; - } - - if (!pItem) - return E_FAIL; - - hDC = GetDC(hWnd); - GetTextExtentPoint32W(hDC, pCurItem->szDesc, strlenW(pCurItem->szDesc), &size); - lpmis->itemWidth = size.cx + 32; - lpmis->itemHeight = max(size.cy, 20); - ReleaseDC (hWnd, hDC); - return S_OK; -} - -HRESULT -DoDrawItem(BgCmImpl *This, HWND hWnd, DRAWITEMSTRUCT * drawItem) -{ - PSHELLNEW_ITEM pCurItem; - PSHELLNEW_ITEM pItem; - UINT i; - pCurItem = s_SnHead; - - TRACE("DoDrawItem entered with id %x\n", drawItem->itemID); - - i = This->iIdShellNewFirst; - pItem = NULL; - while(pCurItem) - { - if (i == drawItem->itemID) - { - pItem = pCurItem; - break; - } - pCurItem = pCurItem->Next; - i++; - } - - if (!pItem) - return E_FAIL; - - drawItem->rcItem.left += 20; - - DrawTextW(drawItem->hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &drawItem->rcItem, 0); - return S_OK; -} BOOL HasClipboardData() { @@ -693,13 +210,6 @@ } DestroyMenu(hMyMenu); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU; - if (GetMenuItemInfoW(hMenu, 10, TRUE, &mii)) - { - InsertShellNewItems(mii.hSubMenu, 0x6000, 0x6000, This); - } - if (!HasClipboardData()) { mii.cbSize = sizeof(mii); @@ -720,36 +230,6 @@ return hr; } -/************************************************************************** -* DoNewFolder -*/ -static void DoNewFolder( - IContextMenu2 *iface, - IShellView *psv) -{ - BgCmImpl *This = (BgCmImpl *)iface; - ISFHelper * psfhlp; - WCHAR wszName[MAX_PATH]; - - IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); - if (psfhlp) - { - LPITEMIDLIST pidl; - ISFHelper_GetUniqueName(psfhlp, wszName, MAX_PATH); - ISFHelper_AddFolder(psfhlp, 0, wszName, &pidl); - - if(psv) - { - /* if we are in a shellview do labeledit */ - IShellView_SelectItem(psv, - pidl,(SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE - |SVSI_FOCUSED|SVSI_SELECT)); - } - SHFree(pidl); - - ISFHelper_Release(psfhlp); - } -} /************************************************************************** * DoPaste @@ -876,11 +356,7 @@ { TRACE("%s\n",lpcmi->lpVerb); - if (! strcmp(lpcmi->lpVerb,CMDSTR_NEWFOLDERA)) - { - DoNewFolder(iface, lpSV); - } - else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLISTA)) + if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLISTA)) { if(hWndSV) SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(FCIDM_SHVIEW_LISTVIEW,0),0 ); } @@ -900,11 +376,6 @@ case FCIDM_SHVIEW_REFRESH: if (lpSV) IShellView_Refresh(lpSV); break; - - case FCIDM_SHVIEW_NEWFOLDER: - DoNewFolder(iface, lpSV); - break; - case FCIDM_SHVIEW_INSERT: DoPaste(iface); break; @@ -918,16 +389,6 @@ break; default: - if (LOWORD(lpcmi->lpVerb) >= This->iIdShellNewFirst && LOWORD(lpcmi->lpVerb) <= This->iIdShellNewLast) - { - DoShellNewCmd(This, lpcmi); - if (lpSV) - { - IShellView_Refresh(lpSV); - } - break; - } - /* if it's an id just pass it to the parent shv */ if (hWndSV) SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0),0 ); break; @@ -963,8 +424,7 @@ if(HIWORD(idCommand)) { if (!strcmp((LPSTR)idCommand, CMDSTR_VIEWLISTA) || - !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || - !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) + !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA)) { return NOERROR; } @@ -985,22 +445,8 @@ LPARAM lParam) { BgCmImpl *This = (BgCmImpl *)iface; - DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; - MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; TRACE("ISVBgCm_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); - - switch(uMsg) - { - case WM_MEASUREITEM: - if (lpmis->itemID >= This->iIdShellNewFirst && lpmis->itemID <= This->iIdShellNewLast) - return DoMeasureItem(This, (HWND)wParam, lpmis); - break; - case WM_DRAWITEM: - if (lpmis->itemID >= This->iIdShellNewFirst && lpmis->itemID <= This->iIdShellNewLast) - return DoDrawItem(This, (HWND)wParam, lpids); - break; - } return E_NOTIMPL; }

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007