Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 51934: [SHELL32_NEW] - Merge 51423, 51426 and 51435 - Remove "Play" and "Preview" translations - they shouldn't be in shell32 - Pass an argument array to FormatMessage to insert the fil...
by gedmurphy＠svn.reactos.org 26 May '11

26 May '11

Author: gedmurphy Date: Thu May 26 21:11:36 2011 New Revision: 51934 URL: http://svn.reactos.org/svn/reactos?rev=51934&view=rev Log: [SHELL32_NEW] - Merge 51423, 51426 and 51435 - Remove "Play" and "Preview" translations - they shouldn't be in shell32 - Pass an argument array to FormatMessage to insert the filename details into error messages (instead of failing) Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp branches/shell32_new-bringup/dll/win32/shell32/shresdef.h branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -744,12 +744,11 @@ IDS_SYS_FILE "Ñèñòåìåí ôàéë" IDS_OPEN_VERB "Îòâàðÿíå" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Èçïúëíÿâàíå êàòî " IDS_EDIT_VERB "Îáðàáîòêà" IDS_FIND_VERB "Òúðñåíå" IDS_PRINT_VERB "Ðàçïå÷àòâàíå" - IDS_PLAY_VERB "Âúçïðîèçâåæäàíå" - IDS_PREVIEW_VERB "Ïðåãëåä" IDS_FILE_FOLDER "%u ôàéëà, %u ïàïêè" IDS_PRINTERS "Ïå÷àòà÷è" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -730,12 +730,11 @@ IDS_SYS_FILE "Systémový soubor" IDS_OPEN_VERB "Otevøít" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Spustit jako " IDS_EDIT_VERB "Upravit" IDS_FIND_VERB "Najít" IDS_PRINT_VERB "Tisknout" - IDS_PLAY_VERB "Pøehrát" - IDS_PREVIEW_VERB "Náhled" IDS_FILE_FOLDER "%u souborù, %u sloek" IDS_PRINTERS "Tiskárny" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -732,12 +732,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -747,12 +747,11 @@ IDS_SYS_FILE "Systemdatei" IDS_OPEN_VERB "Öffnen" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Ausführen als " IDS_EDIT_VERB "Bearbeiten" IDS_FIND_VERB "Finden" IDS_PRINT_VERB "Drucken" - IDS_PLAY_VERB "Abspielen" - IDS_PREVIEW_VERB "Vorschau" IDS_FILE_FOLDER "%u Dateien, %u Ordner" IDS_PRINTERS "Drucker" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -744,12 +744,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -754,12 +754,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -756,12 +756,11 @@ IDS_SYS_FILE "Archivo del sistema" IDS_OPEN_VERB "Abrir" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Ejecutar como ..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Buscar" IDS_PRINT_VERB "Imprimir" - IDS_PLAY_VERB "Reproducir" - IDS_PREVIEW_VERB "Vista previa" IDS_FILE_FOLDER "%u Archivos, %u Carpetas" IDS_PRINTERS "Impresoras" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -747,12 +747,11 @@ IDS_SYS_FILE "Fichier système" IDS_OPEN_VERB "Ouvrir" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Lancer en tant que " IDS_EDIT_VERB "Éditer" IDS_FIND_VERB "Chercher" IDS_PRINT_VERB "Imprimer" - IDS_PLAY_VERB "Lire" - IDS_PREVIEW_VERB "Apercevoir" IDS_FILE_FOLDER "%u fichiers, %u répertoires" IDS_PRINTERS "Imprimantes" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -754,12 +754,11 @@ IDS_SYS_FILE "File di sistema" IDS_OPEN_VERB "Apri" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Eseguire come " IDS_EDIT_VERB "Modifica" IDS_FIND_VERB "Cerca" IDS_PRINT_VERB "Stampa" - IDS_PLAY_VERB "Mostra" - IDS_PREVIEW_VERB "Anteprima" IDS_FILE_FOLDER "%u File, %u Cartelle" IDS_PRINTERS "Stampanti" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "VXe t@C" IDS_OPEN_VERB "J" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "ÊÌ[U[ÆµÄÀs " IDS_EDIT_VERB "ÒW" IDS_FIND_VERB "õ" IDS_PRINT_VERB "óü" - IDS_PLAY_VERB "Ä¶" - IDS_PREVIEW_VERB "vr[" IDS_FILE_FOLDER "%u ÂÌt@CA %u ÂÌtH_" IDS_PRINTERS "v^" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "Systemfil" IDS_OPEN_VERB "Åpne" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Kjør som" IDS_EDIT_VERB "Rediger" IDS_FIND_VERB "Finn" IDS_PRINT_VERB "Skriv ut" - IDS_PLAY_VERB "Spill" - IDS_PREVIEW_VERB "Forhåndsvis" IDS_FILE_FOLDER "%u filer, %u mapper" IDS_PRINTERS "Skrivere" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -751,12 +751,11 @@ IDS_SYS_FILE "Plik systemowy" IDS_OPEN_VERB "Otwórz" + IDS_EXPLORE_VERB "Eksploruj" IDS_RUNAS_VERB "Uruchom jako " IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" - IDS_PLAY_VERB "Odtwórz" - IDS_PREVIEW_VERB "Podgl¹d" IDS_FILE_FOLDER "%u Plików, %u Katalogów" IDS_PRINTERS "Drukarki" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -745,12 +745,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "Ficheiro de Sistema" IDS_OPEN_VERB "Abrir" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Executar como " IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" - IDS_PLAY_VERB "Reproduzir" - IDS_PREVIEW_VERB "Previzualizar" IDS_FILE_FOLDER "%u Ficheiros, %u Pastas" IDS_PRINTERS "Impressoras" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "FiÈier de sistem" IDS_OPEN_VERB "Deschidere" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Rulare ca " IDS_EDIT_VERB "Editare" IDS_FIND_VERB "CÄutare" IDS_PRINT_VERB "Imprimare" - IDS_PLAY_VERB "Redare" - IDS_PREVIEW_VERB "Previzualizare" IDS_FILE_FOLDER "%u fiÈiere, %u dosare" IDS_PRINTERS "Imprimante" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -668,10 +668,10 @@ IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Íåâîçìîæíî îòîáðàçèòü Äèàëîã Âûïîëíèòü Ôàéë (âíóòðåííÿÿ îøèáêà)" + IDS_RUNDLG_BROWSE_ERROR "Íåâîçìîæíî îòîáðàçèòü Äèàëîã Îáçîð (âíóòðåííÿÿ îøèáêà)" + IDS_RUNDLG_BROWSE_CAPTION "Îáçîð" + IDS_RUNDLG_BROWSE_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0Âñå ôàéëû (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû" @@ -722,8 +722,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî" IDS_EMPTY_BITBUCKET "Î÷èñòèòü êîðçèíó" IDS_PICK_ICON_TITLE "Âûáðàòü çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Âñå ôàéëû (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0Âñå ôàéëû (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð âèðòóàëüíîãî óñòðîéñòâà" IDS_BAT_FILE "Ïàêåòíûé ôàéë ReactOS" @@ -742,12 +742,11 @@ IDS_SYS_FILE "Ñèñòåìíûé ôàéë" IDS_OPEN_VERB "Îòêðûòü" + IDS_EXPLORE_VERB "Îòêðûòü â äåðåâå" IDS_RUNAS_VERB "Çàïóñòèòü êàê " IDS_EDIT_VERB "Èçìåíèòü" IDS_FIND_VERB "Ïîèñê" IDS_PRINT_VERB "Ïå÷àòü" - IDS_PLAY_VERB "Âîñïðîèçâåñòè" - IDS_PREVIEW_VERB "Ïðåäïðîñìîòð" IDS_FILE_FOLDER "%u ôàéëîâ, %u ïàïîê" IDS_PRINTERS "Ïðèíòåðû" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -749,12 +749,11 @@ IDS_SYS_FILE "Systémový súbor" IDS_OPEN_VERB "Otvori" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Spusti ako " IDS_EDIT_VERB "Upravi" IDS_FIND_VERB "Find" //Nájs, H¾ada, Vyh¾ada ??? IDS_PRINT_VERB "Tlaèi" - IDS_PLAY_VERB "Prehra" - IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukáka, Prezrie ??? IDS_FILE_FOLDER "súbory: %u, prieèinky: %u" IDS_PRINTERS "Tlaèiarne" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -682,10 +682,10 @@ IDS_LOGOFF_PROMPT "Âè õî÷åòå âèéòè ç ñèñòåìè?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Íåìîæëèâî â³äîáðàçèòè Ä³àëîã Çàïóñêó Ôàéëó (âíóòð³øíÿ ïîìèëêà)" + IDS_RUNDLG_BROWSE_ERROR "Íåìîæëèâî â³äîáðàçèòè Ä³àëîã Îãëÿäó (âíóòð³øíÿ ïîìèëêà)" + IDS_RUNDLG_BROWSE_CAPTION "Îãëÿä" + IDS_RUNDLG_BROWSE_FILTER "Âèêîíóâàí³ Ôàéëè (*.exe)\0*.exe\0Âñ³ Ôàéëè (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -736,8 +736,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíèé ïðîñò³ð" IDS_EMPTY_BITBUCKET "Î÷èñòèòè Êîøèê" IDS_PICK_ICON_TITLE "Âèáðàòè çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Âñ³ Ôàéëè (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0Âñ³ Ôàéëè (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð â³ðòóàëüíîãî ïðèñòðîþ" IDS_BAT_FILE "Ïàêåòíèé ôàéë ReactOS" @@ -756,12 +756,11 @@ IDS_SYS_FILE "Ñèñòåìíèé ôàéë" IDS_OPEN_VERB "Â³äêðèòè" + IDS_EXPLORE_VERB "Â³äêðèòè â äåðåâ³" IDS_RUNAS_VERB "Çàïóñòèòè ÿê " IDS_EDIT_VERB "Çì³íèòè" IDS_FIND_VERB "Ïîøóê" IDS_PRINT_VERB "Äðóê" - IDS_PLAY_VERB "Â³äòâîðèòè" - IDS_PREVIEW_VERB "Ïåðåãëÿä" IDS_FILE_FOLDER "%u ôàéë³â, %u ïàïîê" IDS_PRINTERS "Ïðèíòåðè" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -731,12 +731,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Thu May 26 21:11:36 2011 @@ -744,12 +744,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Thu May 26 21:11:36 2011 @@ -1426,15 +1426,22 @@ return retval; } -void do_error_dialog( UINT_PTR retval, HWND hwnd ) +void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename) { WCHAR msg[2048]; - int error_code=GetLastError(); + DWORD error_code = GetLastError(); + DWORD_PTR msgArguments[3] = { (DWORD_PTR)filename, 0, 0 }; if (retval == SE_ERR_NOASSOC) LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR)); else - FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL); + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, + NULL, + error_code, + LANG_USER_DEFAULT, + msg, + sizeof(msg)/sizeof(WCHAR), + (va_list*)msgArguments); MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } @@ -1596,7 +1603,7 @@ Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC; //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK) - do_error_dialog(retval, sei_tmp.hwnd); + do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); } HeapFree(GetProcessHeap(), 0, wszApplicationName); if (wszParameters != parametersBuffer) @@ -1824,7 +1831,7 @@ Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC; //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK) - do_error_dialog(retval, sei_tmp.hwnd); + do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); } HeapFree(GetProcessHeap(), 0, wszApplicationName); Modified: branches/shell32_new-bringup/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shresdef.h [iso-8859-1] Thu May 26 21:11:36 2011 @@ -153,8 +153,7 @@ #define IDS_EDIT_VERB 303 #define IDS_FIND_VERB 304 #define IDS_PRINT_VERB 305 -#define IDS_PLAY_VERB 306 -#define IDS_PREVIEW_VERB 307 + #define IDS_FILE_FOLDER 308 #define IDS_CREATELINK 309 #define IDS_INSTALLNEWFONT 310 Modified: branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp [iso-8859-1] Thu May 26 21:11:36 2011 @@ -646,10 +646,6 @@ idResource = IDS_FIND_VERB; else if (!wcsicmp(curEntry->szVerb, L"print")) idResource = IDS_PRINT_VERB; - else if (!wcsicmp(curEntry->szVerb, L"play")) - idResource = IDS_PLAY_VERB; - else if (!wcsicmp(curEntry->szVerb, L"preview")) - idResource = IDS_PREVIEW_VERB; else if (!wcsicmp(curEntry->szVerb, L"printto")) { curEntry = curEntry->Next;

1 0

[rharabien] 51933: [FASTFAT] - Use constant instead of magic number
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 20:59:48 2011 New Revision: 51933 URL: http://svn.reactos.org/svn/reactos?rev=51933&view=rev Log: [FASTFAT] - Use constant instead of magic number Modified: trunk/reactos/drivers/filesystems/fastfat/fat.c Modified: trunk/reactos/drivers/filesystems/fastfat/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] Thu May 26 20:59:48 2011 @@ -66,7 +66,7 @@ ChunkSize = CACHEPAGESIZE(DeviceExt); FATOffset = CurrentCluster * 2; Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, MAP_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; }

1 0

[rharabien] 51932: [VERSION] - Remove redundant file
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 20:52:59 2011 New Revision: 51932 URL: http://svn.reactos.org/svn/reactos?rev=51932&view=rev Log: [VERSION] - Remove redundant file Removed: trunk/reactos/dll/win32/version/ver.spec Removed: trunk/reactos/dll/win32/version/ver.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/ver.spec… ============================================================================== --- trunk/reactos/dll/win32/version/ver.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/ver.spec (removed) @@ -1,12 +1,0 @@ -#1 DLLENTRYPOINT -2 pascal GetFileResourceSize(str str str ptr) GetFileResourceSize16 -3 pascal GetFileResource(str str str long long ptr) GetFileResource16 -6 pascal GetFileVersionInfoSize(str ptr) GetFileVersionInfoSize16 -7 pascal GetFileVersionInfo(str long long ptr) GetFileVersionInfo16 -8 pascal VerFindFile(word str str str ptr ptr ptr ptr) VerFindFile16 -9 pascal VerInstallFile(word str str str str str ptr ptr) VerInstallFile16 -10 pascal VerLanguageName(word ptr word) VerLanguageName16 -11 pascal VerQueryValue(segptr str ptr ptr) VerQueryValue16 -20 stub GETFILEVERSIONINFORAW -#21 VERFTHK_THUNKDATA16 -#22 VERTHKSL_THUNKDATA16

1 0

[rharabien] 51931: [BOOTDATA] - Add Start Menu shell32 class to registry so LiveCD has it. It's needed for explorer-new. [FREELDR] - Fix rbuild file
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 20:39:52 2011 New Revision: 51931 URL: http://svn.reactos.org/svn/reactos?rev=51931&view=rev Log: [BOOTDATA] - Add Start Menu shell32 class to registry so LiveCD has it. It's needed for explorer-new. [FREELDR] - Fix rbuild file Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Thu May 26 20:39:52 2011 @@ -317,6 +317,10 @@ HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}","",0x00000000,"Shell Drag and Drop helper" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}","",0x00000000,"Shell Start Menu" +HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" +HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}\InProcServer32","ThreadingModel",0x00000000,"Apartment" ; Folder Options CPL HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}","",0x00000000,"Folder Options" Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Thu May 26 20:39:52 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="setupldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)> +<module name="setupldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)"> <linkerscript>freeldr_$(ARCH).lnk</linkerscript> <bootstrap installbase="loader" /> <library>freeldr_startup</library>

1 0

[cgutman] 51930: [NTOSKRNL] - Implement the kernel side of surprise device removal including sending the appropriate IRPs and notifying the user-mode PnP manager - Fix the completely broken GUID_DE...
by cgutman＠svn.reactos.org 26 May '11

26 May '11

Author: cgutman Date: Thu May 26 20:39:15 2011 New Revision: 51930 URL: http://svn.reactos.org/svn/reactos?rev=51930&view=rev Log: [NTOSKRNL] - Implement the kernel side of surprise device removal including sending the appropriate IRPs and notifying the user-mode PnP manager - Fix the completely broken GUID_DEVICE_ARRIVAL notification (we were sending it for the parent not the children and we were sending regardless of whether any device had actually arrived) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu May 26 20:39:15 2011 @@ -123,6 +123,21 @@ IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); return STATUS_SUCCESS; +} + +VOID +NTAPI +IopSendSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_SURPRISE_REMOVAL; + + /* Drivers should never fail a IRP_MN_SURPRISE_REMOVAL request */ + IopSynchronousCall(DeviceObject, &Stack, &Dummy); } VOID @@ -1566,6 +1581,44 @@ return STATUS_SUCCESS; } +static +VOID +IopHandleDeviceRemoval( + IN PDEVICE_NODE DeviceNode, + IN PDEVICE_RELATIONS DeviceRelations) +{ + PDEVICE_NODE Child = DeviceNode->Child, NextChild; + ULONG i; + BOOLEAN Found; + + while (Child != NULL) + { + NextChild = Child->Sibling; + Found = FALSE; + + for (i = 0; i < DeviceRelations->Count; i++) + { + if (IopGetDeviceNode(DeviceRelations->Objects[i]) == Child) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + IopSendSurpriseRemoval(Child->PhysicalDeviceObject); + + /* Tell the user-mode PnP manager that a device was removed */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL, + &Child->InstancePath); + + IopSendRemoveDevice(Child->PhysicalDeviceObject); + } + + Child = NextChild; + } +} NTSTATUS IopEnumerateDevice( @@ -1583,12 +1636,6 @@ DPRINT("DeviceObject 0x%p\n", DeviceObject); - DPRINT("Sending GUID_DEVICE_ARRIVAL\n"); - - /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, - &DeviceNode->InstancePath); - DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); Stack.Parameters.QueryDeviceRelations.Type = BusRelations; @@ -1613,6 +1660,11 @@ } DPRINT("Got %u PDOs\n", DeviceRelations->Count); + + /* + * Send removal IRPs for devices that have disappeared + */ + IopHandleDeviceRemoval(DeviceNode, DeviceRelations); /* * Create device nodes for all discovered devices @@ -1633,6 +1685,12 @@ &ChildDeviceNode); if (NT_SUCCESS(Status)) { + DPRINT("Sending GUID_DEVICE_ARRIVAL\n"); + + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &ChildDeviceNode->InstancePath); + /* Mark the node as enumerated */ ChildDeviceNode->Flags |= DNF_ENUMERATED;

1 0

[rharabien] 51929: [USETUP] - Fix polish translation
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 20:33:58 2011 New Revision: 51929 URL: http://svn.reactos.org/svn/reactos?rev=51929&view=rev Log: [USETUP] - Fix polish translation Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu May 26 20:33:58 2011 @@ -266,7 +266,7 @@ { 8, 11, - "oprogramowanie, b©d¥ce cz©sci¥ system ReactOS podlega wi©c", + "oprogramowanie, b©d¥ce cz©ci¥ systemu ReactOS podlega wi©c", TEXT_STYLE_NORMAL }, { @@ -332,7 +332,7 @@ { 8, 25, - "dotycz¥ce kopiowania w «r¢dach. Nie ma ¯ADNEJ gwarancji", + "dotycz¥ce kopiowania w «r¢dach. Nie ma ½ADNEJ gwarancji", TEXT_STYLE_NORMAL }, { @@ -717,7 +717,7 @@ { 10, 8, - "Upewnij si© ze w Nap©dzie A: nie ma dyskietki i", + "Upewnij si© ¾e w Nap©dzie A: nie ma dyskietki i", TEXT_STYLE_NORMAL }, { @@ -902,7 +902,7 @@ { 6, 9, - "katalog do kt¢rego chcesz zainstalowa system ReactOS:", + "katalog, do kt¢rego chcesz zainstalowa system ReactOS:", TEXT_STYLE_NORMAL }, { @@ -1334,7 +1334,7 @@ }, { //ERROR_LOAD_COMPUTER, - "Instalator nie m¢g zaadowa listy typ¢w komputea\ra.\n", + "Instalator nie m¢g zaadowa listy typ¢w komputera.\n", "ENTER = Restart komputera" }, { @@ -1415,7 +1415,7 @@ }, { //ERROR_INITIALIZE_REGISTRY, - "Instalator nie by w stanie ustawic inicjalizacji rejestru.", + "Instalator nie by w stanie ustawi inicjalizacji rejestru.", "ENTER = Restart komputera" }, { @@ -1617,7 +1617,7 @@ {STRING_CHOOSENEWPARTITION, "Wybrane: utworzenie nowej partycji na"}, {STRING_HDDSIZE, - "Prosz© wprowadzi rozmiar nowej partycji, w megabajtach."}, + "Prosz© wprowadzi rozmiar nowej partycji w megabajtach."}, {STRING_CREATEPARTITION, " ENTER = Utworzenie Partycji ESC = Anulowanie F3 = Wyjcie"}, {STRING_PARTFORMAT, @@ -1633,7 +1633,7 @@ {STRING_REBOOTCOMPUTER, "ENTER = Restart komputera"}, {STRING_TXTSETUPFAILED, - "Instalator nie by w stanie odnale« sekji '%S'\nw pliku TXTSETUP.SIF.\n"}, + "Instalator nie by w stanie odnale« sekcji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1651,15 +1651,15 @@ {STRING_CODEPAGEINFOUPDATE, " Dodawanie informacji o stronie kodowej do rejestru..."}, {STRING_DONE, - " Ukoñczone..."}, + " Ukoäczone..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Restart komputera"}, {STRING_CONSOLEFAIL1, "Otwarcie konsoli nieudane\n\n"}, {STRING_CONSOLEFAIL2, - "Najcz©stsz¥ tego przyczyn¥ jest u¾ycie klawiatury USB,\n"}, + "Najcz©stsz¥ tego przyczyn¥ jest u¾ycie klawiatury USB.\n"}, {STRING_CONSOLEFAIL3, - "kt¢re nie s¥ w peni obsugiwane.\n"}, + "Nie s¥ obecnie w peni obsugiwane.\n"}, {STRING_FORMATTINGDISK, "Instalator formatuje tw¢j dysk"}, {STRING_CHECKINGDISK,

1 0

[cgutman] 51928: [PCI] - Inform the PnP manager that we don't support stopping devices by failing the IRP_MN_QUERY_STOP_DEVICE IRP instead of the IRP_MN_STOP_DEVICE IRP (which is not allowed)
by cgutman＠svn.reactos.org 26 May '11

26 May '11

Author: cgutman Date: Thu May 26 19:51:12 2011 New Revision: 51928 URL: http://svn.reactos.org/svn/reactos?rev=51928&view=rev Log: [PCI] - Inform the PnP manager that we don't support stopping devices by failing the IRP_MN_QUERY_STOP_DEVICE IRP instead of the IRP_MN_STOP_DEVICE IRP (which is not allowed) Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] Thu May 26 19:51:12 2011 @@ -547,10 +547,6 @@ case IRP_MN_QUERY_REMOVE_DEVICE: Status = STATUS_NOT_IMPLEMENTED; break; - - case IRP_MN_QUERY_STOP_DEVICE: - Status = STATUS_NOT_IMPLEMENTED; - break; #endif case IRP_MN_START_DEVICE: DPRINT("IRP_MN_START_DEVICE received\n"); @@ -561,12 +557,17 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; - case IRP_MN_STOP_DEVICE: - /* Currently not supported */ + + case IRP_MN_QUERY_STOP_DEVICE: + /* We don't support stopping yet */ Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; + + case IRP_MN_STOP_DEVICE: + /* We can't fail this one so we fail the QUERY_STOP request that precedes it */ + break; #if 0 case IRP_MN_SURPRISE_REMOVAL: Status = STATUS_NOT_IMPLEMENTED;

1 0

[cgutman] 51927: [NDIS] - Fix handling of some PnP IRPs - Handle IRP_MN_STOP_DEVICE as it travels down the stack not up - Only complete the IRP_MN_QUERY_XXX_DEVICE IRPs if we fail them otherwise pa...
by cgutman＠svn.reactos.org 26 May '11

26 May '11

Author: cgutman Date: Thu May 26 19:34:39 2011 New Revision: 51927 URL: http://svn.reactos.org/svn/reactos?rev=51927&view=rev Log: [NDIS] - Fix handling of some PnP IRPs - Handle IRP_MN_STOP_DEVICE as it travels down the stack not up - Only complete the IRP_MN_QUERY_XXX_DEVICE IRPs if we fail them otherwise pass them down the device stack - Handle IRP_MN_CANCEL_XXX_DEVICE as it travels back up the stack not on its way down - Append our flags when handling IRP_MN_QUERY_PNP_DEVICE_STATE and pass it down the device stack Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu May 26 19:34:39 2011 @@ -2218,48 +2218,54 @@ NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device start\n")); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; + return Status; case IRP_MN_STOP_DEVICE: - Status = NdisIForwardIrpAndWait(Adapter, Irp); - if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) - { - Status = NdisIPnPStopDevice(DeviceObject, Irp); - } - else - NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device stop\n")); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = NdisIPnPStopDevice(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + NDIS_DbgPrint(MIN_TRACE, ("WARNING: Ignoring halt device failure! Passing the IRP down anyway\n")); + Irp->IoStatus.Status = STATUS_SUCCESS; break; case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: Status = NdisIPnPQueryStopDevice(DeviceObject, Irp); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status != STATUS_SUCCESS) + { + IoCompleteRequest(Irp, IO_NO_INCREMENT); + NDIS_DbgPrint(MIN_TRACE, ("Failing miniport halt request\n")); + return Status; + } break; case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE: - Status = NdisIPnPCancelStopDevice(DeviceObject, Irp); + Status = NdisIForwardIrpAndWait(Adapter, Irp); + if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + { + Status = NdisIPnPCancelStopDevice(DeviceObject, Irp); + } + else + { + NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed cancel stop/remove request\n")); + } Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; + return Status; case IRP_MN_QUERY_PNP_DEVICE_STATE: Status = NDIS_STATUS_SUCCESS; Irp->IoStatus.Status = Status; Irp->IoStatus.Information |= Adapter->NdisMiniportBlock.PnPFlags; - IoCompleteRequest(Irp, IO_NO_INCREMENT); break; default: - IoSkipCurrentIrpStackLocation(Irp); - Status = IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp); break; } - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp); }

1 0

[sserapion] 51926: fix fixes.
by sserapion＠svn.reactos.org 26 May '11

26 May '11

Author: sserapion Date: Thu May 26 18:51:04 2011 New Revision: 51926 URL: http://svn.reactos.org/svn/reactos?rev=51926&view=rev Log: fix fixes. Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c [iso-8859-1] Thu May 26 18:51:04 2011 @@ -30,9 +30,9 @@ NTOWFv1(const PWCHAR password, PUCHAR result) { - ULONG i, len = wcslen(password) * sizeof(WCHAR); + ULONG i, len = wcslen(password); WCHAR pass[14]; - memcpy(pass, password, len); + memcpy(pass, password, len * sizeof(WCHAR)); for(i = len; i<14; i++) { pass[i] = L'0'; @@ -44,11 +44,11 @@ NTOWFv2(const PWCHAR password, const PWCHAR user, const PWCHAR domain, PUCHAR result) { UCHAR response_key_nt_v1 [16]; - ULONG len_user = (user ? wcslen(user) : 0) * sizeof(WCHAR); - ULONG len_domain = (domain ? wcslen(domain) : 0) * sizeof(WCHAR); + ULONG len_user = user ? wcslen(user) : 0; + ULONG len_domain = domain ? wcslen(domain) : 0; WCHAR user_upper[len_user + 1]; - ULONG len_user_u = len_user; - ULONG len_domain_u = len_domain; + ULONG len_user_u = len_user * sizeof(WCHAR); + ULONG len_domain_u = len_domain * sizeof(WCHAR); WCHAR buff[len_user + len_domain]; ULONG i; @@ -324,9 +324,9 @@ pNtResponse->Flags = 0; pNtResponse->MsgWord = 0; + NtQuerySystemTime((PLARGE_INTEGER)&pNtResponse->TimeStamp); NtlmGenerateRandomBits(pNtResponse->ChallengeFromClient, MSV1_0_CHALLENGE_LENGTH); - memcpy(pNtResponse->Buffer, pServerName->Buffer, pServerName->Length); NtlmNtResponse(pUserName, @@ -361,6 +361,7 @@ { HMAC_MD5_CTX ctx; + HMACMD5Init(&ctx, (PUCHAR)NtpUserSessionKey, sizeof(*NtpUserSessionKey)); HMACMD5Update(&ctx, ChallengeToClient, MSV1_0_CHALLENGE_LENGTH); HMACMD5Update(&ctx, ChallengeFromClient, MSV1_0_CHALLENGE_LENGTH);

1 0

[rharabien] 51925: [TASKMGR] - Simplify opening settings registry key
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 18:19:17 2011 New Revision: 51925 URL: http://svn.reactos.org/svn/reactos?rev=51925&view=rev Log: [TASKMGR] - Simplify opening settings registry key Modified: trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/taskmgr.c 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Thu May 26 18:19:17 2011 @@ -179,7 +179,7 @@ ULONG cwcUserName; /* Get new system time */ - status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); + status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), NULL); if (!NT_SUCCESS(status)) return; Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Thu May 26 18:19:17 2011 @@ -759,19 +759,10 @@ void SaveSettings(void) { HKEY hKey; - WCHAR szSubKey1[] = L"Software"; - WCHAR szSubKey2[] = L"Software\\ReactOS"; - WCHAR szSubKey3[] = L"Software\\ReactOS\\TaskManager"; + WCHAR szSubKey[] = L"Software\\ReactOS\\TaskManager"; /* Open (or create) the key */ - hKey = NULL; - RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey1, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - RegCloseKey(hKey); - hKey = NULL; - RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey2, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - RegCloseKey(hKey); - hKey = NULL; - if (RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey3, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return; /* Save the settings */ RegSetValueExW(hKey, L"Preferences", 0, REG_BINARY, (LPBYTE)&TaskManagerSettings, sizeof(TASKMANAGER_SETTINGS));

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs