Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 35198: sorry, fix build
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 14:51:29 2008 New Revision: 35198 URL: http://svn.reactos.org/svn/reactos?rev=35198&view=rev Log: sorry, fix build Modified: trunk/reactos/dll/win32/shell32/pidl.h Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Fri Aug 8 14:51:29 2008 @@ -107,6 +107,7 @@ #define PT_IESPECIAL2 0xb1 #define PT_SHARE 0xc3 + #include "pshpack1.h" typedef BYTE PIDLTYPE; @@ -118,6 +119,14 @@ WORD offsComment; /*08*/ CHAR szName[1]; /*10*/ /* terminated by 0x00, followed by display name and comment string */ } PIDLCPanelStruct; + +typedef struct tagPIDLFontStruct +{ + BYTE dummy; + WORD offsFile; + WCHAR szName[1]; /*10*/ /* terminated by 0x00, followed by display name and comment string */ +} PIDLFontStruct; + typedef struct tagGUIDStruct { @@ -180,6 +189,7 @@ } htmlhelp; struct tagPIDLCPanelStruct cpanel; struct tagValueW valueW; + struct tagPIDLFontStruct cfont; }u; } PIDLDATA, *LPPIDLDATA; #include "poppack.h"

1 0

[janderwald] 35197: - add 3 resource strings
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 14:48:38 2008 New Revision: 35197 URL: http://svn.reactos.org/svn/reactos?rev=35197&view=rev Log: - add 3 resource strings Modified: 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/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.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-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.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/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,10 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" + IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" IDS_DELETEITEM_CAPTION "Confirm file deletion" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -616,6 +616,9 @@ IDS_SELECT "Vybrat" IDS_OPEN "Otevøít" IDS_CREATELINK "Vytvoøit zástupc&e" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Nelze vytvoøit novou sloku, protoe pøístup byl odepøen." IDS_CREATEFOLDER_CAPTION "Chyba pøi pokusu vytvoøit nový adresáø" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -616,6 +616,9 @@ IDS_SELECT "Auswählen" IDS_OPEN "Öffnen" IDS_CREATELINK "&Verknüpfung erstellen" + IDS_COPY "Kopieren" + IDS_DELETE "Löschen" + IDS_PROPERTIES "Eigenschaften" IDS_CREATEFOLDER_DENIED "Es konnte kein neues Verzeichnis erstellt werden: Zugriff verweigert." IDS_CREATEFOLDER_CAPTION "Es trat ein Fehler beim Erstellen eines neuen Verzeichnisses auf." Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "ÅðéëïãÞ" IDS_OPEN "¢íïéãìá" IDS_CREATELINK "Äçìéïõñãßá &óõíôüìåõóçò" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Äåí Þôáí äõíáôÞ ç äçìéïõñãßá ôïõ öáêÝëïõ: Äåí åðéôñÝðåôáé ç ðñüóâáóç." IDS_CREATEFOLDER_CAPTION "ÓöÜëìá êáôÜ ôçí äçìéïõñãßá íÝïõ öáêÝëïõ" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -615,6 +615,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -616,6 +616,9 @@ IDS_SELECT "Seleccionar" IDS_OPEN "Abrir" IDS_CREATELINK "C&rear acceso directo" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "No se puede crear nueva carpeta: Permiso denegado." IDS_CREATEFOLDER_CAPTION "Error durante la creación de una nueva carpeta" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Valitse" IDS_OPEN "Avaa" IDS_CREATELINK "Lu&o Linkki" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivät riitä." IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -618,6 +618,9 @@ IDS_SELECT "Sélectionner" IDS_OPEN "Ouvrir" IDS_CREATELINK "Créer un &lien" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -617,6 +617,9 @@ IDS_SELECT "Kiválaszt" IDS_OPEN "Megnyit" IDS_CREATELINK "Parancsikon létrehozása" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Nem hozható létre új mappa: Nincs hozzá engedélyed." IDS_CREATEFOLDER_CAPTION "Hiba a mappa létrehozásakor" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -615,6 +615,9 @@ IDS_SELECT "Selezione" IDS_OPEN "Apri" IDS_CREATELINK "&Crea Collegamento" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Ið" IDS_OPEN "J" IDS_CREATELINK "V[gJbgÌì¬(&L)" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Vµ¢tH_ðì¬Å«Ü¹ñÅµ½: ANZX ª èÜ¹ñB" IDS_CREATEFOLDER_CAPTION "Vµ¢tH_Ìì¬ÉG[ª¶µÜµ½" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -593,6 +593,9 @@ IDS_SELECT "Velg" IDS_OPEN "Åpne" IDS_CREATELINK "&Opprett snarvei" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -620,6 +620,9 @@ IDS_SELECT "Zaznacz" IDS_OPEN "Otwórz" IDS_CREATELINK "Utwórz &Skrót" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Nie mogê utworzyæ nowego katalogu: Brak dostêpu." IDS_CREATEFOLDER_CAPTION "B³¹d przy tworzeniu nowego katalogu." 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -616,6 +616,9 @@ IDS_SELECT "Selecionar" IDS_OPEN "Abrir" IDS_CREATELINK "Criar a&talho" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Não pode criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -616,6 +616,9 @@ IDS_SELECT "Seleccionar" IDS_OPEN "Abrir" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Não é possível criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -613,6 +613,9 @@ IDS_SELECT "&Âûáðàòü" IDS_OPEN "&Îòêðûòü" IDS_CREATELINK "Ñîçäàòü &ÿðëûê" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -620,6 +620,9 @@ IDS_SELECT "Vybra" IDS_OPEN "Otvori" IDS_CREATELINK "Vytvori o&dkaz" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Nie je moné vytvori nový prieèinok: Prístup zamietnutý." IDS_CREATEFOLDER_CAPTION "Chyba poèas vytvárania nového prieèinka" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -614,6 +614,9 @@ IDS_SELECT "Seç" IDS_OPEN "Aç" IDS_CREATELINK "Kýsayol O&luþtur" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Yeni dizin oluþturulamýyor: Eriþim engellendi." IDS_CREATEFOLDER_CAPTION "Dizin oluþturma sýrasýnda hata" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -615,6 +615,9 @@ IDS_SELECT "Âè&áðàòè" IDS_OPEN "Â³&äêðèòè" IDS_CREATELINK "Ñòâîðèòè &ÿðëèê" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: Â³äìîâà ó äîñòóï³." IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ ïàïêè" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -603,6 +603,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "´´½¨¿ì½Ý·½Ê½(&L)" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -615,6 +615,9 @@ IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "Create &Link" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Aug 8 14:48:38 2008 @@ -150,6 +150,9 @@ #define IDS_SHV_COLUMN13 312 #define IDS_SHV_COLUMN_WORKGROUP 313 #define IDS_SHV_NETWORKLOCATION 314 +#define IDS_COPY 315 +#define IDS_DELETE 316 +#define IDS_PROPERTIES 317 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

1 0

[fireball] 35196: - Leftover from the winesync.
by fireball＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: fireball Date: Fri Aug 8 14:23:07 2008 New Revision: 35196 URL: http://svn.reactos.org/svn/reactos?rev=35196&view=rev Log: - Leftover from the winesync. Modified: trunk/reactos/dll/win32/mpr/pwcache.c Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] Fri Aug 8 14:23:07 2008 @@ -74,7 +74,7 @@ * WNetCachePassword [MPR.@] Saves password in cache * * NOTES - * only the parameter count is verifyed + * Only the parameter count is verified * * ---- everything below this line might be wrong (js) ----- * RETURNS @@ -221,7 +221,7 @@ * WNetEnumCachedPasswords [MPR.@] * * NOTES - * the parameter count is verifyed + * The parameter count is verified * * This function is a huge security risk, as virii and such can use * it to grab all the passwords in the cache. It's bad enough to

1 0

[fireball] 35195: - Fix a typo. - Stubplement one missing function. - SVN maintenance.
by fireball＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: fireball Date: Fri Aug 8 14:20:26 2008 New Revision: 35195 URL: http://svn.reactos.org/svn/reactos?rev=35195&view=rev Log: - Fix a typo. - Stubplement one missing function. - SVN maintenance. Modified: trunk/reactos/subsystems/csr/csr.rc (props changed) trunk/reactos/subsystems/csr/csrsrv/api.c (props changed) trunk/reactos/subsystems/csr/csrsrv/csrsrv.def (props changed) trunk/reactos/subsystems/csr/csrsrv/csrsrv.rc (props changed) trunk/reactos/subsystems/csr/csrsrv/init.c (props changed) trunk/reactos/subsystems/csr/csrsrv/process.c (props changed) trunk/reactos/subsystems/csr/csrsrv/server.c (props changed) trunk/reactos/subsystems/csr/csrsrv/session.c (contents, props changed) trunk/reactos/subsystems/csr/csrsrv/srv.h (contents, props changed) trunk/reactos/subsystems/csr/csrsrv/status.h (contents, props changed) trunk/reactos/subsystems/csr/csrsrv/thread.c (props changed) trunk/reactos/subsystems/csr/csrsrv/wait.c (props changed) trunk/reactos/subsystems/csr/main.c (contents, props changed) trunk/reactos/subsystems/win/winsrv/init.c (props changed) Propchange: trunk/reactos/subsystems/csr/csr.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/api.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/csrsrv.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/csrsrv.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/process.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/server.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/subsystems/csr/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/sess… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/session.c [iso-8859-1] Fri Aug 8 14:20:26 2008 @@ -21,7 +21,7 @@ PSB_API_ROUTINE CsrServerSbApiDispatch[5] = { CsrSbCreateSession, - CsrSbForeignSessionComplete, + CsrSbTerminateSession, CsrSbForeignSessionComplete, CsrSbCreateProcess, NULL @@ -30,7 +30,7 @@ PCHAR CsrServerSbApiName[5] = { "SbCreateSession", - "SbTerminateSEssion", + "SbTerminateSession", "SbForeignSessionComplete", "SbCreateProcess", "Unknown Csr Sb Api Number" Propchange: trunk/reactos/subsystems/csr/csrsrv/session.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/subsystems/csr/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/srv.… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/srv.h [iso-8859-1] Fri Aug 8 14:20:26 2008 @@ -124,6 +124,10 @@ BOOLEAN NTAPI +CsrSbTerminateSession(IN PSB_API_MESSAGE ApiMessage); + +BOOLEAN +NTAPI CsrSbForeignSessionComplete(IN PSB_API_MESSAGE ApiMessage); BOOLEAN Propchange: trunk/reactos/subsystems/csr/csrsrv/srv.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/subsystems/csr/csrsrv/status.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/stat… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/status.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/status.h [iso-8859-1] Fri Aug 8 14:20:26 2008 @@ -59,7 +59,7 @@ * CsrMoveSatisfiedWait 753E7909 20 - wait.c - IMPLEMENTED * CsrNotifyWait 753E782F 21 - wait.c - IMPLEMENTED * CsrPopulateDosDevices 753E37A5 22 - init.c - IMPLEMENTED - * CsrQueryApiPort 753E4E42 23 - api.c - IMPLEMENTED + * CsrQueryApiPort 753E4E42 23 - api.c - UNIMPLEMENTED * CsrReferenceThread 753E61E5 24 - thread.c - IMPLEMENTED * CsrRevertToSelf 753E615A 25 - thread.c - IMPLEMENTED * CsrServerInitialization 753E3D75 26 - server.c - IMPLEMENTED @@ -84,7 +84,7 @@ /* Public SB API Interface Status (session.c) * CsrSbCreateSession - IMPLEMENTED * CsrSbForeignSessionComplete - IMPLEMENTED - * CsrSbTerminateSession - IMPLEMENTED + * CsrSbTerminateSession - UNIMPLEMENTED * CsrSbCreateProcess - UNIMPLEMENTED */ Propchange: trunk/reactos/subsystems/csr/csrsrv/status.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/thread.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/csr/csrsrv/wait.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/subsystems/csr/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/main.c?rev=… ============================================================================== --- trunk/reactos/subsystems/csr/main.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/main.c [iso-8859-1] Fri Aug 8 14:20:26 2008 @@ -80,7 +80,7 @@ ProcessUserModeIOPL, NULL, 0); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { /* Raise a hard error */ DPRINT1("CSRSS: Could not raise IOPL: %x\n", Status); Propchange: trunk/reactos/subsystems/csr/main.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win/winsrv/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[janderwald] 35194: * fully implement enumeration of details for virtual font shell folder
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 14:15:27 2008 New Revision: 35194 URL: http://svn.reactos.org/svn/reactos?rev=35194&view=rev Log: * fully implement enumeration of details for virtual font shell folder Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Fri Aug 8 14:15:27 2008 @@ -217,7 +217,7 @@ tmp.u.cfont.dummy = 0xFF; tmp.u.cfont.offsFile = wcslen(pszFont) + 1; - size = (tmp.u.cfont.offsFile + wcslen(pszFile) + 1) * sizeof(WCHAR); + size += (tmp.u.cfont.offsFile + wcslen(pszFile) + 1) * sizeof(WCHAR); pidl = (LPITEMIDLIST)SHAlloc(size + 4); if (!pidl) @@ -639,6 +639,7 @@ PIDLFontStruct * pfont; HANDLE hFile; LARGE_INTEGER FileSize; + SHFILEINFOW fi; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd); @@ -668,13 +669,26 @@ switch(iColumn) { case COLUMN_TYPE: + pfont = _ILGetFontStruct(pidl); + if (pfont) + { + if (SHGetFileInfoW(pfont->szName + pfont->offsFile, 0, &fi, sizeof(fi), SHGFI_TYPENAME)) + { + psd->str.u.pOleStr = CoTaskMemAlloc((wcslen(fi.szTypeName)+1) * sizeof(WCHAR)); + if (!psd->str.u.pOleStr) + return E_OUTOFMEMORY; + wcscpy(psd->str.u.pOleStr, fi.szTypeName); + psd->str.uType = STRRET_WSTR; + return S_OK; + } + } break; case COLUMN_SIZE: pfont = _ILGetFontStruct(pidl); if (pfont) { - hFile = CreateFileW(pfont->szName + pfont->offsFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); - if (hFile) + hFile = CreateFileW(pfont->szName + pfont->offsFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) { if (GetFileSizeEx(hFile, &FileSize)) {

1 0

[sginsberg] 35193: - Fix a typo
by sginsberg＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: sginsberg Date: Fri Aug 8 14:08:27 2008 New Revision: 35193 URL: http://svn.reactos.org/svn/reactos?rev=35193&view=rev Log: - Fix a typo Modified: trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] Fri Aug 8 14:08:27 2008 @@ -55,7 +55,7 @@ *ValueListToRelease = HCELL_NIL; *IndexIsCached = FALSE; - /* Get the hive and value ceche */ + /* Get the hive and value cache */ Hive = Kcb->KeyHive; ChildList = &Kcb->ValueCache; KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell);

1 0

[arty] 35192: Merge aicom-network-fixes up to 35189
by arty＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: arty Date: Fri Aug 8 13:38:16 2008 New Revision: 35192 URL: http://svn.reactos.org/svn/reactos?rev=35192&view=rev Log: Merge aicom-network-fixes up to 35189 Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 8 13:38:16 2008 @@ -291,7 +291,11 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -345,7 +349,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called. AddressHandle (0x%X) ConnectionObject (0x%X)\n", AddressHandle, ConnectionObject)); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -398,6 +405,12 @@ NTSTATUS Status; AFD_DbgPrint(MAX_TRACE, ("Called\n")); + + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -463,7 +476,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -524,6 +540,11 @@ NTSTATUS Status; KEVENT Event; PIRP Irp; + + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -573,6 +594,11 @@ NTSTATUS Status; KEVENT Event; PIRP Irp; + + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -797,6 +823,12 @@ NTSTATUS Status = STATUS_SUCCESS; PMDL Mdl; + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } + DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); @@ -877,6 +909,12 @@ PDEVICE_OBJECT DeviceObject; PMDL Mdl; + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } + DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); @@ -975,6 +1013,12 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PMDL Mdl; + + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad tranport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -1064,6 +1108,12 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PMDL Mdl; + + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); @@ -1143,9 +1193,12 @@ KEVENT Event; PIRP Irp; - DeviceObject = IoGetRelatedDeviceObject(TransportObject); - KeInitializeEvent(&Event, NotificationEvent, FALSE); + + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject));

1 0

[janderwald] 35191: - implement enumerating of font items
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 13:34:51 2008 New Revision: 35191 URL: http://svn.reactos.org/svn/reactos?rev=35191&view=rev Log: - implement enumerating of font items Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Fri Aug 8 13:34:51 2008 @@ -205,6 +205,102 @@ return hr; } +static LPITEMIDLIST _ILCreateFontItem(LPWSTR pszFont, LPWSTR pszFile) +{ + PIDLDATA tmp; + LPITEMIDLIST pidl; + PIDLFontStruct * p; + int size0 = (char*)&tmp.u.cfont.szName-(char*)&tmp.u.cfont; + int size = size0; + + tmp.type = 0x00; + tmp.u.cfont.dummy = 0xFF; + tmp.u.cfont.offsFile = wcslen(pszFont) + 1; + + size = (tmp.u.cfont.offsFile + wcslen(pszFile) + 1) * sizeof(WCHAR); + + pidl = (LPITEMIDLIST)SHAlloc(size + 4); + if (!pidl) + return pidl; + + pidl->mkid.cb = size+2; + memcpy(pidl->mkid.abID, &tmp, 2+size0); + + p = &((PIDLDATA*)pidl->mkid.abID)->u.cfont; + wcscpy(p->szName, pszFont); + wcscpy(p->szName + tmp.u.cfont.offsFile, pszFile); + + *(WORD*)((char*)pidl+(size+2)) = 0; + return pidl; +} + +static PIDLFontStruct * _ILGetFontStruct(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + + if (pdata && pdata->type==0x00) + return (PIDLFontStruct*)&(pdata->u.cfont); + + return NULL; +} + + + +/************************************************************************** + * CreateFontsEnumListss() + */ +static BOOL CreateFontsEnumList(IEnumIDList *list, DWORD dwFlags) +{ + WCHAR szPath[MAX_PATH]; + WCHAR szName[LF_FACESIZE+20]; + WCHAR szFile[MAX_PATH]; + LPWSTR pszPath; + UINT Length; + LONG ret; + DWORD dwType, dwName, dwFile, dwIndex; + LPITEMIDLIST pidl; + HKEY hKey; + + if (dwFlags & SHCONTF_NONFOLDERS) + { + if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_FONTS, FALSE)) + return FALSE; + + pszPath = PathAddBackslashW(szPath); + if (!pszPath) + return FALSE; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", 0, KEY_READ, &hKey)!= ERROR_SUCCESS) + return FALSE; + + Length = pszPath - szPath; + dwIndex = 0; + do + { + dwName = sizeof(szName)/sizeof(WCHAR); + dwFile = sizeof(szFile)/sizeof(WCHAR); + ret = RegEnumValueW(hKey, dwIndex++, szName, &dwName, NULL, &dwType, (LPVOID)szFile, &dwFile); + if (ret == ERROR_SUCCESS) + { + szFile[(sizeof(szFile)/sizeof(WCHAR))-1] = L'\0'; + if (dwType == REG_SZ && wcslen(szFile) + Length + 1< (sizeof(szPath)/sizeof(WCHAR))) + { + wcscpy(&szPath[Length], szFile); + pidl = _ILCreateFontItem(szName, szPath); + TRACE("pidl %p name %s path %s\n", pidl, debugstr_w(szName), debugstr_w(szPath)); + if (pidl) + { + if (!AddToEnumList(list, pidl)) + SHFree(pidl); + } + } + } + }while(ret != ERROR_NO_MORE_ITEMS); + RegCloseKey(hKey); + + } + return TRUE; +} + /************************************************************************** * ISF_Fonts_fnEnumObjects */ @@ -217,6 +313,8 @@ hwndOwner, dwFlags, ppEnumIDList); *ppEnumIDList = IEnumIDList_Constructor(); + if(*ppEnumIDList) + CreateFontsEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); @@ -436,14 +534,26 @@ LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + PIDLFontStruct * pfont; + + TRACE("ISF_Fonts_fnGetDisplayNameOf (%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) return E_INVALIDARG; - return E_NOTIMPL; + pfont = _ILGetFontStruct(pidl); + if (!pfont) + return E_INVALIDARG; + + strRet->u.pOleStr = CoTaskMemAlloc((wcslen(pfont->szName)+1) * sizeof(WCHAR)); + if (!strRet->u.pOleStr) + return E_OUTOFMEMORY; + + wcscpy(strRet->u.pOleStr, pfont->szName); + strRet->uType = STRRET_WSTR; + + return S_OK; } /************************************************************************** @@ -526,6 +636,9 @@ IGenericSFImpl *This = (IGenericSFImpl *)iface; WCHAR buffer[MAX_PATH] = {0}; HRESULT hr = E_FAIL; + PIDLFontStruct * pfont; + HANDLE hFile; + LARGE_INTEGER FileSize; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd); @@ -544,7 +657,58 @@ } if (iColumn == COLUMN_NAME) + { + psd->str.uType = STRRET_WSTR; return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str); + } + + psd->str.uType = STRRET_CSTR; + psd->str.u.cStr[0] = '\0'; + + switch(iColumn) + { + case COLUMN_TYPE: + break; + case COLUMN_SIZE: + pfont = _ILGetFontStruct(pidl); + if (pfont) + { + hFile = CreateFileW(pfont->szName + pfont->offsFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hFile) + { + if (GetFileSizeEx(hFile, &FileSize)) + { + if (StrFormatByteSizeW(FileSize.QuadPart, buffer, sizeof(buffer)/sizeof(WCHAR))) + { + psd->str.u.pOleStr = CoTaskMemAlloc(wcslen(buffer) + 1); + if (!psd->str.u.pOleStr) + return E_OUTOFMEMORY; + wcscpy(psd->str.u.pOleStr, buffer); + psd->str.uType = STRRET_WSTR; + CloseHandle(hFile); + return S_OK; + } + } + CloseHandle(hFile); + } + } + break; + case COLUMN_FILENAME: + pfont = _ILGetFontStruct(pidl); + if (pfont) + { + psd->str.u.pOleStr = CoTaskMemAlloc((wcslen(pfont->szName + pfont->offsFile) + 1) * sizeof(WCHAR)); + if (psd->str.u.pOleStr) + { + psd->str.uType = STRRET_WSTR; + wcscpy(psd->str.u.pOleStr, pfont->szName + pfont->offsFile); + return S_OK; + } + else + return E_OUTOFMEMORY; + } + break; + } FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);

1 0

[arty] 35190: Patches by Gregor Schneider <grschneider at gmail dot com> Added serial support, some bugfixes.
by arty＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: arty Date: Fri Aug 8 13:03:59 2008 New Revision: 35190 URL: http://svn.reactos.org/svn/reactos?rev=35190&view=rev Log: Patches by Gregor Schneider <grschneider at gmail dot com> Added serial support, some bugfixes. Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/Pipe/Pipe.csproj trunk/tools/reactosdbg/RosDBG/BackTrace.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/RosDBG/Settings.cs Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -4,6 +4,7 @@ using System.Text; using System.Net; using System.Net.Sockets; +using System.IO.Ports; using AbstractPipe; using DebugProtocol; using KDBGProtocol; @@ -68,7 +69,7 @@ public class DebugConnection { #region Primary State - public enum Mode { ClosedMode, SocketMode } + public enum Mode { ClosedMode, SocketMode, SerialMode } public Mode ConnectionMode { get { return mConnectionMode; } @@ -104,6 +105,10 @@ SocketAsyncEventArgs mAsyncConnect; AsyncCallback mDnsLookup; IAsyncResult mDnsAsyncResult; + #endregion + + #region Serial Mode Members + SerialPort mSerialPort; #endregion public event DebugRegisterChangeEventHandler DebugRegisterChangeEvent; @@ -154,6 +159,33 @@ mDnsAsyncResult = Dns.BeginGetHostEntry(host, mDnsLookup, this); } + public void Start(int baudrate, string port) + { + Close(); + ConnectionMode = Mode.SerialMode; + mSerialPort = new SerialPort(port, baudrate, Parity.None, 8, StopBits.One); + mSerialPort.Handshake = Handshake.None; + try + { + //opening could fail for occupied, not existing or misconfigured ports + mSerialPort.Open(); + //create pipe and kdb instances, connect internal receive pipe + mMedium = new SerialPipe(mSerialPort); + mMedium.PipeReceiveEvent += PipeReceiveEvent; + mKdb = new KDBG(mMedium); + //set up tab handlers + mKdb.RegisterChangeEvent += RegisterChangeEvent; + mKdb.ModuleListEvent += ModuleListEvent; + mKdb.MemoryUpdateEvent += MemoryUpdateEvent; + Running = true; + } + catch (Exception) + { + ConnectionMode = Mode.ClosedMode; + //error signal? + } + } + public void Close() { switch (ConnectionMode) @@ -161,6 +193,11 @@ case Mode.SocketMode: mSocket.Close(); mSocket = null; + break; + case Mode.SerialMode: + mSerialPort.Close(); + mSerialPort = null; + Running = false; break; } @@ -231,7 +268,7 @@ DebugModuleChangedEvent(this, new DebugModuleChangedEventArgs((uint)args.Address, args.Module)); } - void RegisterChangeEvent(object sender, RegisterChangeEventArgs args) + void RegisterChangeEvent(object sender, RegisterChangeEventArgs args) { args.Registers.CopyTo(mRegisters.RegisterSet); Running = false; Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -287,7 +287,10 @@ { mCommandBuffer.Add(command); if (mCommandBuffer.Count == 1) + { mConnection.Write(command + "\r"); + mCommandBuffer.RemoveAt(0); //useful??? + } } } Modified: trunk/tools/reactosdbg/Pipe/Pipe.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/Pipe.csproj?… ============================================================================== --- trunk/tools/reactosdbg/Pipe/Pipe.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/Pipe.csproj [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -45,6 +45,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="serialpipe.cs" /> <Compile Include="pipe.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="socketpipe.cs" /> Modified: trunk/tools/reactosdbg/RosDBG/BackTrace.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/BackTrace.… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/BackTrace.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -135,8 +135,11 @@ private void StackFrames_SelectedIndexChanged(object sender, EventArgs e) { - string []parsedEntry = ((string)StackFrames.SelectedItem).Split(new char [] {' '}); - mSelectedAddr = ulong.Parse(parsedEntry[0], NumberStyles.HexNumber); + if (StackFrames.SelectedItem != null) //crashed with argumentnullexception + { + string[] parsedEntry = ((string)StackFrames.SelectedItem).Split(new char[] { ' ' }); + mSelectedAddr = ulong.Parse(parsedEntry[0], NumberStyles.HexNumber); + } } private void StackFrames_MouseDoubleClick(object sender, MouseEventArgs e) Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -131,6 +131,7 @@ this.connectSerialToolStripMenuItem.Name = "connectSerialToolStripMenuItem"; this.connectSerialToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.connectSerialToolStripMenuItem.Text = "Connect Serial ..."; + this.connectSerialToolStripMenuItem.Click += new System.EventHandler(this.connectSerialToolStripMenuItem_Click); // // connectPipeToolStripMenuItem // Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -251,6 +251,16 @@ mSourceRoot = Settings.SourceDirectory; mSymbolContext.ReactosOutputPath = Settings.OutputDirectory; } + + private void connectSerialToolStripMenuItem_Click(object sender, EventArgs e) + { + SerialTargetSelect targetSelect = new SerialTargetSelect(); + if (targetSelect.ShowDialog() == DialogResult.OK) + { + mConnection.Close(); + mConnection.Start(targetSelect.Baudrate, targetSelect.Port); + } + } } public class InteractiveInputEventArgs : EventArgs Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -166,6 +166,10 @@ <DependentUpon>Settings.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> + <EmbeddedResource Include="SerialTargetSelect.resx"> + <DependentUpon>SerialTargetSelect.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> <EmbeddedResource Include="SourceView.resx"> <DependentUpon>SourceView.cs</DependentUpon> <SubType>Designer</SubType> @@ -211,6 +215,12 @@ </Compile> <Compile Include="Settings.Designer.cs"> <DependentUpon>Settings.cs</DependentUpon> + </Compile> + <Compile Include="SerialTargetSelect.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="SerialTargetSelect.Designer.cs"> + <DependentUpon>SerialTargetSelect.cs</DependentUpon> </Compile> <Compile Include="SourceView.cs"> <SubType>UserControl</SubType> @@ -272,4 +282,4 @@ <PropertyGroup> <PostBuildEvent>copy $(SolutionDir)dbghelptest\dbghelp.dll $(TargetDir)</PostBuildEvent> </PropertyGroup> -</Project> +</Project> Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Fri Aug 8 13:03:59 2008 @@ -7,7 +7,6 @@ using System.Text; using System.Configuration; using System.Windows.Forms; -using System.ComponentModel; using System.Drawing.Design; namespace RosDBG

1 0

[cgutman] 35189: - Remove ASSERTs and return STATUS_INVALID_PARAMETER - Should fix Christoph's problem with ROS crashing when closing emule
by cgutman＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: cgutman Date: Fri Aug 8 12:50:00 2008 New Revision: 35189 URL: http://svn.reactos.org/svn/reactos?rev=35189&view=rev Log: - Remove ASSERTs and return STATUS_INVALID_PARAMETER - Should fix Christoph's problem with ROS crashing when closing emule Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 8 12:50:00 2008 @@ -291,7 +291,11 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -345,7 +349,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called. AddressHandle (0x%X) ConnectionObject (0x%X)\n", AddressHandle, ConnectionObject)); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -399,7 +406,11 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(ConnectionObject); + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); if (!DeviceObject) { @@ -465,7 +476,10 @@ AFD_DbgPrint(MAX_TRACE, ("Called\n")); - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -527,7 +541,10 @@ KEVENT Event; PIRP Irp; - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -578,7 +595,10 @@ KEVENT Event; PIRP Irp; - assert(FileObject); + if (!FileObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n")); + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(FileObject); if (!DeviceObject) { @@ -803,7 +823,11 @@ NTSTATUS Status = STATUS_SUCCESS; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -885,7 +909,11 @@ PDEVICE_OBJECT DeviceObject; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -986,7 +1014,11 @@ NTSTATUS Status; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad tranport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } DeviceObject = IoGetRelatedDeviceObject(TransportObject); if (!DeviceObject) { @@ -1077,7 +1109,11 @@ NTSTATUS Status; PMDL Mdl; - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + *Irp = NULL; + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject)); @@ -1159,7 +1195,10 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); - assert(TransportObject); + if (!TransportObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); + return STATUS_INVALID_PARAMETER; + } AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject));

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