Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[gadamopoulos] 72398: [SHELL32] - Fail to delete any file if one is invalid. - Patch by andy-123 CORE-9959

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Aug 20 09:43:09 2016 New Revision: 72398 URL: http://svn.reactos.org/svn/reactos?rev=72398&view=rev Log: [SHELL32] - Fail to delete any file if one is invalid. - Patch by andy-123 CORE-9959 Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Aug 20 09:43:09 2016 @@ -1480,6 +1480,19 @@ return 0; } + /* Check files. Do not delete one if one file does not exists */ + for (i = 0; i < flFrom->dwNumFiles; i++) + { + fileEntry = &flFrom->feFiles[i]; + + if ((HANDLE)fileEntry->attributes == INVALID_HANDLE_VALUE) + { + // This is a windows 2003 server specific value which has been removed. + // Later versions of windows return ERROR_FILE_NOT_FOUND. + return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + } + } + for (i = 0; i < flFrom->dwNumFiles; i++) { bPathExists = TRUE; @@ -1527,7 +1540,7 @@ { // This is a windows 2003 server specific value which ahs been removed. // Later versions of windows return ERROR_FILE_NOT_FOUND. - return 1026; + return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; } else {

8 years, 2 months

[gadamopoulos] 72397: [SHELL32] - Show an error message when creating a directory fails. - Patch by Jared Smudde CORE-11661

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Aug 20 09:34:25 2016 New Revision: 72397 URL: http://svn.reactos.org/svn/reactos?rev=72397&view=rev Log: [SHELL32] - Show an error message when creating a directory fails. - Patch by Jared Smudde CORE-11661 Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/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/he-IL.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/ro-RO.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/sq-AL.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/shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "ÐÑÐµÐ¸Ð¼ÐµÐ½ÑÐ²Ð°Ð½Ðµ" IDS_PASTE "ÐÐ¼ÑÐºÐ²Ð°Ð½Ðµ" - IDS_CREATEFOLDER_DENIED "Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð½Ð¾Ð²Ð° Ð¿Ð°Ð¿ÐºÐ° Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾: Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÑÑÐ½Ð¸ Ð¿ÑÐ°Ð²Ð°." - IDS_CREATEFOLDER_CAPTION "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð° Ð¿Ð°Ð¿ÐºÐ°" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "ÐÐ¾ÑÐ²ÑÑÐ´ÐµÑÐµ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð°" IDS_DELETEFOLDER_CAPTION "ÐÐ¾ÑÐ²ÑÑÐ´ÐµÑÐµ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°ÑÐ°" IDS_DELETEITEM_TEXT "Ð¡Ð¸Ð³ÑÑÐµÐ½ Ð»Ð¸ ÑÑÐµ, ÑÐµ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¸Ð·ÑÑÐ¸ÐµÑÐµ '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -688,8 +688,8 @@ IDS_RENAME "PÅejmenovat" IDS_PASTE "VloÅ¾it" - IDS_CREATEFOLDER_DENIED "Nelze vytvoÅit novou sloÅ¾ku, protoÅ¾e pÅÃstup byl odepÅen." - IDS_CREATEFOLDER_CAPTION "Chyba pÅi pokusu vytvoÅit novou sloÅ¾ku" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Potvrdit odstranÄnÃ souboru" IDS_DELETEFOLDER_CAPTION "Potvrdit odstranÄnÃ sloÅ¾ky" IDS_DELETEITEM_TEXT "Opravdu chcete odstranit '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -688,8 +688,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Kan ikke oprette ny mappe: Tilladelse Afvist." - IDS_CREATEFOLDER_CAPTION "Fejl ved oprettelse ad ny mappe" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "BekrÃ¦ft sletning af fil" IDS_DELETEFOLDER_CAPTION "BekrÃ¦ft sletning af mappe" IDS_DELETEITEM_TEXT "Er du sikker pÃ¥ du vil slette '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -683,8 +683,8 @@ IDS_RENAME "Umbenennen" IDS_PASTE "EinfÃ¼gen" - 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." + IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" + IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." IDS_DELETEITEM_CAPTION "BestÃ¤tigung: Objekt lÃ¶schen" IDS_DELETEFOLDER_CAPTION "BestÃ¤tigung: Verzeichnis lÃ¶schen" IDS_DELETEITEM_TEXT "Sind Sie sich sicher, dass Sie '%1' lÃ¶schen mÃ¶chten?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "ÎÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÎ® Î· Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÏÎ¿Ï ÏÎ±ÎºÎÎ»Î¿Ï: ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î· ÏÏÏÏÎ²Î±ÏÎ·." - IDS_CREATEFOLDER_CAPTION "Î£ÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ·Î½ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î½ÎÎ¿Ï ÏÎ±ÎºÎÎ»Î¿Ï" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎµÎ¯Î¿Ï" IDS_DELETEFOLDER_CAPTION "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï ÏÎ±ÎºÎÎ»Î¿Ï" IDS_DELETEITEM_TEXT "ÎÎ¯ÏÏÎµ Î²ÎÎ²Î±Î¹Î¿Î¹ ÏÏÎ¹ Î¸ÎÎ»ÎµÏÎµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏÎµÏÎµ ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ '%1';" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -684,8 +684,8 @@ IDS_RENAME "Renombrar" IDS_PASTE "Insertar" - IDS_CREATEFOLDER_DENIED "No se puede crear una nueva carpeta: Permiso denegado." - IDS_CREATEFOLDER_CAPTION "Error durante la creaciÃ³n de una nueva carpeta" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirmar eliminaciÃ³n de archivos" IDS_DELETEFOLDER_CAPTION "Confirmar eliminaciÃ³n de carpetas" IDS_DELETEITEM_TEXT "Â¿Seguro que desea eliminar '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivÃ¤t riitÃ¤." - IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Vahvista tiedoston tuhoaminen" IDS_DELETEFOLDER_CAPTION "Vahvista kansion tuhoaminen" IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Renommer" IDS_PASTE "InsÃ©rer" - 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" + IDS_CREATEFOLDER_DENIED "Impossible de crÃ©er le dossier '%1'" + IDS_CREATEFOLDER_CAPTION "Impossible de crÃ©er un dossier" IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" IDS_DELETEITEM_TEXT "Ãtes-vous sÃ»r de vouloir supprimer '%1' ?" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "×©× × ×©×" IDS_PASTE "××× ×¡" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Nem hozhatÃ³ lÃ©tre Ãºj mappa: Nincs hozzÃ¡ engedÃ©lyed." - IDS_CREATEFOLDER_CAPTION "Hiba a mappa lÃ©trehozÃ¡sakor" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "ÃllomÃ¡ny tÃ¶rlÃ©se" IDS_DELETEFOLDER_CAPTION "Mappa tÃ¶rlÃ©se" IDS_DELETEITEM_TEXT "Biztosan tÃ¶rÃ¶lni szeretnÃ©d?: '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rinomina" IDS_PASTE "Inserisci" - IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." - IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confermare la cancellazione del file" IDS_DELETEFOLDER_CAPTION "Confermare la cancellazione della cartella" IDS_DELETEITEM_TEXT "Sei sicuro di voler cancellare '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "ååã®å¤æ´" IDS_PASTE "æ¿å¥" - IDS_CREATEFOLDER_DENIED "æ°ãããã©ã«ããä½æã§ãã¾ããã§ãã: ã¢ã¯ã»ã¹æ¨©ãããã¾ããã" - IDS_CREATEFOLDER_CAPTION "æ°ãããã©ã«ãã®ä½æä¸ã«ã¨ã©ã¼ãçºçãã¾ãã" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "ãã¡ã¤ã«åé¤ã®ç¢ºèª" IDS_DELETEFOLDER_CAPTION "ãã©ã«ãåé¤ã®ç¢ºèª" IDS_DELETEITEM_TEXT "'%1' ãåé¤ãã¦ãããããã§ãã?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Endre navn" IDS_PASTE "Sett inn" - IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." - IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Bekreft filsletting" IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" IDS_DELETEITEM_TEXT "Virkelig slette Â«%1Â»?" 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] Sat Aug 20 09:34:25 2016 @@ -686,8 +686,8 @@ IDS_RENAME "ZmieÅ nazwÄ" IDS_PASTE "WÅÃ³Å¼" - IDS_CREATEFOLDER_DENIED "Nie mogÄ utworzyÄ nowego katalogu: Brak dostÄpu." - IDS_CREATEFOLDER_CAPTION "BÅÄd przy tworzeniu nowego katalogu." + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "PotwierdÅº usuniÄcia pliku" IDS_DELETEFOLDER_CAPTION "PotwierdÅº usuniÄcie katalogu" IDS_DELETEITEM_TEXT "Czy jesteÅ pewien, Å¼e chcesz usunÄÄ '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Renomear" IDS_PASTE "Inserir" - IDS_CREATEFOLDER_DENIED "NÃ£o pode criar nova pasta: PermissÃ£o negada." - IDS_CREATEFOLDER_CAPTION "Erro durante a criaÃ§Ã£o da nova pasta" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirmar exclusÃ£o de arquivo" IDS_DELETEFOLDER_CAPTION "Confirmar exclusÃ£o de pasta" IDS_DELETEITEM_TEXT "VocÃª tem certeza que deseja excluir '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Renaomear" IDS_PASTE "Inserir" - IDS_CREATEFOLDER_DENIED "NÃ£o Ã© possÃvel criar nova pasta: PermissÃ£o negada." - IDS_CREATEFOLDER_CAPTION "Erro durante a criaÃ§Ã£o da nova pasta" + IDS_CREATEFOLDER_DENIED "Impossivel de Criar Pasta '%1'" + IDS_CREATEFOLDER_CAPTION "Impossivel de Criar Pasta" IDS_DELETEITEM_CAPTION "Confirmar exclusÃ£o do ficheiro" IDS_DELETEFOLDER_CAPTION "Confirmar exclusÃ£o da pasta" IDS_DELETEITEM_TEXT "Tem certeza que deseja excluir '%1'?" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sat Aug 20 09:34:25 2016 @@ -684,8 +684,8 @@ IDS_RENAME "Rede&numeÈte" IDS_PASTE "&LipeÈte" - IDS_CREATEFOLDER_DENIED "Nu s-a putut crea dosar nou: Acces respins." - IDS_CREATEFOLDER_CAPTION "Eroare la crearea unui nou dosar" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirmarea Ètergerii fiÈierului" IDS_DELETEFOLDER_CAPTION "Confirmarea Ètergerii dosarului" IDS_DELETEITEM_TEXT "Sigur doriÈi sÄ ÈtergeÈi â%1â?" 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] Sat Aug 20 09:34:25 2016 @@ -684,8 +684,8 @@ IDS_RENAME "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ" IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÑ" - IDS_CREATEFOLDER_DENIED "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ð¿ÐºÐ¸" - IDS_CREATEFOLDER_CAPTION "ÐÑÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ð¿ÐºÐ¸" + IDS_CREATEFOLDER_DENIED "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¿Ð°Ð¿ÐºÑ '%1'" + IDS_CREATEFOLDER_CAPTION "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¿Ð°Ð¿ÐºÑ" IDS_DELETEITEM_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°" IDS_DELETEFOLDER_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¿ÐºÐ¸" IDS_DELETEITEM_TEXT "Ð£Ð´Ð°Ð»Ð¸ÑÑ '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "PremenovaÅ¥" IDS_PASTE "VloÅ¾iÅ¥" - IDS_CREATEFOLDER_DENIED "Nie je moÅ¾nÃ© vytvoriÅ¥ novÃ½ prieÄinok: PrÃstup zamietnutÃ½." - IDS_CREATEFOLDER_CAPTION "Chyba poÄas vytvÃ¡rania novÃ©ho prieÄinka" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Potvrdenie odstrÃ¡nenia sÃºboru" IDS_DELETEFOLDER_CAPTION "Potvrdenie odstrÃ¡nenia prieÄinka" IDS_DELETEITEM_TEXT "Naozaj chcete vymazaÅ¥ '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sat Aug 20 09:34:25 2016 @@ -686,8 +686,8 @@ IDS_RENAME "RiemÃ«rto" IDS_PASTE "Fut" - IDS_CREATEFOLDER_DENIED "NÃ« pamundÃ«si pÃ«r tÃ« krijuar dosje tÃ« re: Ndalohet hyrja." - IDS_CREATEFOLDER_CAPTION "Gabim gjatÃ« krijimit tÃ« njÃ« dosje tÃ« re" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Konfirmo fshirjen e dokumentit" IDS_DELETEFOLDER_CAPTION "Konfirmo fshirjen e dosjes" IDS_DELETEITEM_TEXT "Jeni te sigurte qe doni te fshini '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Rename" IDS_PASTE "Paste" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "Yeniden AdlandÄ±r" IDS_PASTE "YerleÅtir" - IDS_CREATEFOLDER_DENIED "Yeni dizin oluÅturulamÄ±yor: EriÅim engellendi." - IDS_CREATEFOLDER_CAPTION "Dizin oluÅturma sÄ±rasÄ±nda hata" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Dosya silmeyi onayla" IDS_DELETEFOLDER_CAPTION "Dizin silmeyi onayla" IDS_DELETEITEM_TEXT "'%1' Ã¶Äesini silmek istediÄinizden emin misiniz?" 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] Sat Aug 20 09:34:25 2016 @@ -682,8 +682,8 @@ IDS_RENAME "ÐÐµÑÐµÐ¹Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸" IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÐ¸" - IDS_CREATEFOLDER_DENIED "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¿Ð°Ð¿ÐºÑ: ÐÑÐ´Ð¼Ð¾Ð²Ð° Ñ Ð´Ð¾ÑÑÑÐ¿Ñ." - IDS_CREATEFOLDER_CAPTION "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ Ð¿Ð°Ð¿ÐºÐ¸" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð»ÑÑÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»Ñ" IDS_DELETEFOLDER_CAPTION "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð»ÑÑÐµÐ½Ð½Ñ Ð¿Ð°Ð¿ÐºÐ¸" IDS_DELETEITEM_TEXT "ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -689,8 +689,8 @@ IDS_RENAME "éå½å" IDS_PASTE "è´´ä¸" - IDS_CREATEFOLDER_DENIED "æ æ³åå»ºæ°æä»¶å¤¹ï¼ æéè¢«æç»ã" - IDS_CREATEFOLDER_CAPTION "åå»ºæ°æä»¶å¤¹æ¶åºé" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "ç¡®è®¤æä»¶å é¤" IDS_DELETEFOLDER_CAPTION "ç¡®è®¤æä»¶å¤¹å é¤" IDS_DELETEITEM_TEXT "ç¡®å®è¦å é¤ '%1'?" 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] Sat Aug 20 09:34:25 2016 @@ -690,8 +690,8 @@ IDS_RENAME "éæ°å½å" IDS_PASTE "æå¥" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" + IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Aug 20 09:34:25 2016 @@ -878,9 +878,9 @@ if (ret && hWnd && (ERROR_CANCELLED != ret)) { - /* We failed and should show a dialog box */ - FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); - ret = ERROR_CANCELLED; /* Error has been already presented to user (not really yet!) */ + ShellMessageBoxW(shell32_hInstance, hWnd, MAKEINTRESOURCEW(IDS_CREATEFOLDER_DENIED), MAKEINTRESOURCEW(IDS_CREATEFOLDER_CAPTION), + MB_ICONEXCLAMATION | MB_OK, path); + ret = ERROR_CANCELLED; } }

8 years, 2 months

[jgardou] 72396: [SERVICES] - Properly invalidate service handles when closing/freeing them Dedicated to Hermès and any regression chaser. FalsePositives--

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Aug 19 22:15:53 2016 New Revision: 72396 URL: http://svn.reactos.org/svn/reactos?rev=72396&view=rev Log: [SERVICES] - Properly invalidate service handles when closing/freeing them Dedicated to Hermès and any regression chaser. FalsePositives-- Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Aug 19 22:15:53 2016 @@ -21,6 +21,7 @@ #define MANAGER_TAG 0x72674D68 /* 'hMgr' */ #define SERVICE_TAG 0x63765368 /* 'hSvc' */ +#define INVALID_TAG 0xAABBCCDD typedef struct _SCMGR_HANDLE { @@ -952,7 +953,8 @@ { DPRINT("Found manager handle\n"); - /* FIXME: add handle cleanup code */ + /* Make sure we don't access stale memory if someone tries to use this handle again. */ + hManager->Handle.Tag = INVALID_TAG; HeapFree(GetProcessHeap(), 0, hManager); hManager = NULL; @@ -972,7 +974,8 @@ /* Get the pointer to the service record */ lpService = hService->ServiceEntry; - /* FIXME: add handle cleanup code */ + /* Make sure we don't access stale memory if someone tries to use this handle again. */ + hService->Handle.Tag = INVALID_TAG; /* Free the handle */ HeapFree(GetProcessHeap(), 0, hService);

8 years, 2 months

[jgardou] 72395: [NTOS/MM] - Implement copy on write support in ARM3 page fault handler CORE-8541 #resolve #comment committed in r72395

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Aug 19 17:24:53 2016 New Revision: 72395 URL: http://svn.reactos.org/svn/reactos?rev=72395&view=rev Log: [NTOS/MM] - Implement copy on write support in ARM3 page fault handler CORE-8541 #resolve #comment committed in r72395 Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Aug 19 17:24:53 2016 @@ -880,6 +880,18 @@ #endif +FORCEINLINE +VOID +MI_MAKE_TRANSITION_PTE(_Out_ PMMPTE NewPte, + _In_ PFN_NUMBER Page, + _In_ ULONG Protection) +{ + NewPte->u.Long = 0; + NewPte->u.Trans.Transition = 1; + NewPte->u.Trans.Protection = Protection; + NewPte->u.Trans.PageFrameNumber = Page; +} + // // Returns if the page is physically resident (ie: a large page) // FIXFIX: CISC/x86 only? @@ -2169,6 +2181,15 @@ IN PMMVAD Vad ); +VOID +NTAPI +MiDeletePte( + IN PMMPTE PointerPte, + IN PVOID VirtualAddress, + IN PEPROCESS CurrentProcess, + IN PMMPTE PrototypePte +); + ULONG NTAPI MiMakeSystemAddressValid( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Aug 19 17:24:53 2016 @@ -519,6 +519,71 @@ /* Now get rid of it */ MiReleaseSystemPtes(ZeroPte, 1, SystemPteSpace); +} + +VOID +NTAPI +MiCopyPfn( + _In_ PFN_NUMBER DestPage, + _In_ PFN_NUMBER SrcPage) +{ + PMMPTE SysPtes; + MMPTE TempPte; + PMMPFN DestPfn, SrcPfn; + PVOID DestAddress; + const VOID* SrcAddress; + + /* Get the PFNs */ + DestPfn = MiGetPfnEntry(DestPage); + ASSERT(DestPfn); + SrcPfn = MiGetPfnEntry(SrcPage); + ASSERT(SrcPfn); + + /* Grab 2 system PTEs */ + SysPtes = MiReserveSystemPtes(2, SystemPteSpace); + ASSERT(SysPtes); + + /* Initialize the destination PTE */ + TempPte = ValidKernelPte; + TempPte.u.Hard.PageFrameNumber = DestPage; + + /* Setup caching */ + if (DestPfn->u3.e1.CacheAttribute == MiWriteCombined) + { + /* Write combining, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); + } + else if (DestPfn->u3.e1.CacheAttribute == MiNonCached) + { + /* Write through, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); + } + + /* Make the system PTE valid with our PFN */ + MI_WRITE_VALID_PTE(&SysPtes[0], TempPte); + + /* Initialize the source PTE */ + TempPte = ValidKernelPte; + TempPte.u.Hard.PageFrameNumber = SrcPage; + + /* Setup caching */ + if (SrcPfn->u3.e1.CacheAttribute == MiNonCached) + { + MI_PAGE_DISABLE_CACHE(&TempPte); + } + + /* Make the system PTE valid with our PFN */ + MI_WRITE_VALID_PTE(&SysPtes[1], TempPte); + + /* Get the addresses and perform the copy */ + DestAddress = MiPteToAddress(&SysPtes[0]); + SrcAddress = MiPteToAddress(&SysPtes[1]); + RtlCopyMemory(DestAddress, SrcAddress, PAGE_SIZE); + + /* Now get rid of it */ + MiReleaseSystemPtes(SysPtes, 2, SystemPteSpace); } NTSTATUS @@ -1043,6 +1108,7 @@ PFN_NUMBER PageFrameIndex; NTSTATUS Status; PVOID InPageBlock = NULL; + ULONG Protection; /* Must be called with an invalid, prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -1088,31 +1154,95 @@ { if (!PteContents.u.Proto.ReadOnly) { - /* Check for page acess in software */ - Status = MiAccessCheck(PointerProtoPte, - StoreInstruction, - KernelMode, - TempPte.u.Soft.Protection, - TrapInformation, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Check for copy on write page */ - if ((TempPte.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) - { - /* Not yet supported */ - ASSERT(FALSE); - } - } + Protection = TempPte.u.Soft.Protection; + } + else + { + Protection = MM_READONLY; + } + /* Check for page acess in software */ + Status = MiAccessCheck(PointerProtoPte, + StoreInstruction, + KernelMode, + TempPte.u.Soft.Protection, + TrapInformation, + TRUE); + ASSERT(Status == STATUS_SUCCESS); } else { - /* Check for copy on write page */ - if ((PteContents.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) - { - /* Not yet supported */ - ASSERT(FALSE); - } + Protection = PteContents.u.Soft.Protection; + } + + /* Check for writing copy on write page */ + if (((Protection & MM_WRITECOPY) == MM_WRITECOPY) && StoreInstruction) + { + PFN_NUMBER PageFrameIndex, ProtoPageFrameIndex; + ULONG Color; + + /* Resolve the proto fault as if it was a read operation */ + Status = MiResolveProtoPteFault(FALSE, + Address, + PointerPte, + PointerProtoPte, + OutPfn, + PageFileData, + PteValue, + Process, + OldIrql, + TrapInformation); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Lock again the PFN lock, MiResolveProtoPteFault unlocked it */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* And re-read the proto PTE */ + TempPte = *PointerProtoPte; + ASSERT(TempPte.u.Hard.Valid == 1); + ProtoPageFrameIndex = PFN_FROM_PTE(&TempPte); + + /* Get a new page for the private copy */ + if (Process > HYDRA_PROCESS) + Color = MI_GET_NEXT_PROCESS_COLOR(Process); + else + Color = MI_GET_NEXT_COLOR(); + + PageFrameIndex = MiRemoveAnyPage(Color); + + /* Perform the copy */ + MiCopyPfn(PageFrameIndex, ProtoPageFrameIndex); + + /* This will drop everything MiResolveProtoPteFault referenced */ + MiDeletePte(PointerPte, Address, Process, PointerProtoPte); + + /* Because now we use this */ + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + + /* Fix the protection */ + Protection &= ~MM_WRITECOPY; + Protection |= MM_READWRITE; + if (Address < MmSystemRangeStart) + { + /* Build the user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&PteContents, PointerPte, Protection, PageFrameIndex); + } + else + { + /* Build the kernel PTE */ + MI_MAKE_HARDWARE_PTE(&PteContents, PointerPte, Protection, PageFrameIndex); + } + + /* And finally, write the valid PTE */ + MI_WRITE_VALID_PTE(PointerPte, PteContents); + + /* The caller expects us to release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return Status; } /* Check for clone PTEs */ @@ -2002,8 +2132,39 @@ /* Is this a copy on write PTE? */ if (MI_IS_PAGE_COPY_ON_WRITE(&TempPte)) { - /* Not supported yet */ - ASSERT(FALSE); + PFN_NUMBER PageFrameIndex, OldPageFrameIndex; + PMMPFN Pfn1; + + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + ASSERT(MmAvailablePages > 0); + + /* Allocate a new page and copy it */ + PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(CurrentProcess)); + OldPageFrameIndex = PFN_FROM_PTE(&TempPte); + + MiCopyPfn(PageFrameIndex, OldPageFrameIndex); + + /* Dereference whatever this PTE is referencing */ + Pfn1 = MI_PFN_ELEMENT(OldPageFrameIndex); + ASSERT(Pfn1->u3.e1.PrototypePte == 1); + ASSERT(!MI_IS_PFN_DELETED(Pfn1)); + ProtoPte = Pfn1->PteAddress; + MiDeletePte(PointerPte, Address, CurrentProcess, ProtoPte); + + /* And make a new shiny one with our page */ + MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; + TempPte.u.Hard.Write = 1; + TempPte.u.Hard.CopyOnWrite = 0; + + MI_WRITE_VALID_PTE(PointerPte, TempPte); + + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + + /* Return the status */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_PAGE_FAULT_COPY_ON_WRITE; } /* Is this a read-only PTE? */ Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Fri Aug 19 17:24:53 2016 @@ -228,13 +228,6 @@ return (MiBalancerThreadHandle != NULL) && (PsGetCurrentThreadId() == MiBalancerThreadId.UniqueThread); } - -VOID -NTAPI -MiDeletePte(IN PMMPTE PointerPte, - IN PVOID VirtualAddress, - IN PEPROCESS CurrentProcess, - IN PMMPTE PrototypePte); VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Fri Aug 19 17:24:53 2016 @@ -275,12 +275,6 @@ * * @remarks Lock the address space before calling this function. */ -VOID -NTAPI -MiDeletePte(IN PMMPTE PointerPte, - IN PVOID VirtualAddress, - IN PEPROCESS CurrentProcess, - IN PMMPTE PrototypePte); NTSTATUS NTAPI MmFreeMemoryArea(

8 years, 2 months

[vmikayelyan] 72394: hid: hidparser: Fix for CORE-11538. This commit fixes issue https://jira.reactos.org/browse/CORE-11538. There were mistakes in buffer manipulation loops.

by vmikayelyan＠svn.reactos.org

Author: vmikayelyan Date: Fri Aug 19 16:57:49 2016 New Revision: 72394 URL: http://svn.reactos.org/svn/reactos?rev=72394&view=rev Log: hid: hidparser: Fix for CORE-11538. This commit fixes issue https://jira.reactos.org/browse/CORE-11538. There were mistakes in buffer manipulation loops. Modified: branches/GSoC_2016/USB/drivers/hid/hidparse/hidparse.c branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/context.c branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/hidparser.c branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/parser.c Modified: branches/GSoC_2016/USB/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/hid/hidpa… ============================================================================== --- branches/GSoC_2016/USB/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/hid/hidparse/hidparse.c [iso-8859-1] Fri Aug 19 16:57:49 2016 @@ -126,6 +126,29 @@ } NTSTATUS +TranslateStatusForUpperLayer( + IN HIDPARSER_STATUS Status) +{ + // + // now we are handling only this values, for others just return + // status as it is. + // + switch (Status) + { + case HIDPARSER_STATUS_INSUFFICIENT_RESOURCES: + return STATUS_INSUFFICIENT_RESOURCES; + case HIDPARSER_STATUS_INVALID_REPORT_TYPE: + return HIDP_STATUS_INVALID_REPORT_TYPE; + case HIDPARSER_STATUS_BUFFER_TOO_SMALL: + return STATUS_BUFFER_TOO_SMALL; + case HIDPARSER_STATUS_COLLECTION_NOT_FOUND: + return STATUS_NO_DATA_DETECTED; + default: + return Status; + } +} + +NTSTATUS NTAPI HidP_GetCollectionDescription( IN PHIDP_REPORT_DESCRIPTOR ReportDesc, @@ -134,6 +157,7 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HID_PARSER Parser; + NTSTATUS Status; // // init parser @@ -143,7 +167,8 @@ // // get description; // - return HidParser_GetCollectionDescription(&Parser, ReportDesc, DescLength, PoolType, DeviceDescription); + Status = HidParser_GetCollectionDescription(&Parser, ReportDesc, DescLength, PoolType, DeviceDescription); + return TranslateStatusForUpperLayer(Status); } HIDAPI Modified: branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/context.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/sdk/lib/drivers/h… ============================================================================== --- branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/context.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/context.c [iso-8859-1] Fri Aug 19 16:57:49 2016 @@ -163,7 +163,7 @@ // // store offset // - TargetCollection->Offsets[Collection->NodeCount + Index] = CurrentOffset; + TargetCollection->Offsets[Collection->ReportCount + Index] = CurrentOffset; // // store sub collections @@ -254,7 +254,7 @@ // // get collection // - SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->NodeCount + Index]); + SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->ReportCount + Index]); // // recursively search collection @@ -314,7 +314,7 @@ // // get offset to sub collection // - SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->NodeCount + Index]); + SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->ReportCount + Index]); // // count collection for sub nodes Modified: branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/sdk/lib/drivers/h… ============================================================================== --- branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/hidparser.c [iso-8859-1] Fri Aug 19 16:57:49 2016 @@ -68,7 +68,7 @@ // failed to parse report descriptor // Parser->Debug("[HIDPARSER] Failed to parse report descriptor with %x\n", ParserStatus); - return TranslateHidParserStatus(ParserStatus); + return ParserStatus; } // @@ -126,7 +126,9 @@ // // no memory // - return TranslateHidParserStatus(ParserStatus); + Parser->Free(DeviceDescription->CollectionDesc); + Parser->Free(DeviceDescription->ReportIDs); + return ParserStatus; } // @@ -153,6 +155,13 @@ // get collection usage page // ParserStatus = HidParser_GetCollectionUsagePage((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, &DeviceDescription->CollectionDesc[Index].Usage, &DeviceDescription->CollectionDesc[Index].UsagePage); + if (ParserStatus != HIDPARSER_STATUS_SUCCESS) + { + // collection not found + Parser->Free(DeviceDescription->CollectionDesc); + Parser->Free(DeviceDescription->ReportIDs); + return ParserStatus; + } // // windows seems to prepend the report id, regardless if it is required Modified: branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/parser.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/sdk/lib/drivers/h… ============================================================================== --- branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/parser.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/sdk/lib/drivers/hidparser/parser.c [iso-8859-1] Fri Aug 19 16:57:49 2016 @@ -712,30 +712,6 @@ // return HIDPARSER_STATUS_SUCCESS; } - -HIDPARSER_STATUS -AllocateParserContext( - IN PHID_PARSER Parser, - OUT PHID_PARSER_CONTEXT *OutParserContext) -{ - PHID_PARSER_CONTEXT ParserContext; - - ParserContext = Parser->Alloc(sizeof(HID_PARSER_CONTEXT)); - if (!ParserContext) - { - // - // failed - // - return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; - } - - // - // store result - // - *OutParserContext = ParserContext; - return HIDPARSER_STATUS_SUCCESS; -} - HIDPARSER_STATUS HidParser_ParseReportDescriptor( @@ -760,12 +736,18 @@ PMAIN_ITEM_DATA MainItemData; PHID_PARSER_CONTEXT ParserContext; + CurrentOffset = ReportDescriptor; + ReportEnd = ReportDescriptor + ReportLength; + + if (ReportDescriptor >= ReportEnd) + return HIDPARSER_STATUS_COLLECTION_NOT_FOUND; + // // allocate parser // - Status = AllocateParserContext(Parser, &ParserContext); - if (Status != HIDPARSER_STATUS_SUCCESS) - return Status; + ParserContext = Parser->Alloc(sizeof(HID_PARSER_CONTEXT));; + if (!ParserContext) + return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; // @@ -778,6 +760,7 @@ // // no memory // + Parser->Free(ParserContext); return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; } @@ -792,6 +775,7 @@ // Parser->Free(ParserContext->LocalItemState.UsageStack); ParserContext->LocalItemState.UsageStack = NULL; + Parser->Free(ParserContext); return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; } @@ -799,8 +783,6 @@ // start parsing // CurrentCollection = ParserContext->RootCollection; - CurrentOffset = ReportDescriptor; - ReportEnd = ReportDescriptor + ReportLength; do { @@ -1230,8 +1212,7 @@ // CurrentOffset += CurrentItemSize + sizeof(ITEM_PREFIX); - - }while(CurrentOffset < ReportEnd); + }while (CurrentOffset < ReportEnd); //

8 years, 2 months

[vmikayelyan] 72393: usb: hub: PDO: InternalDeviceControl can be called in DPC As InternalDeviceControl can be called in DPC, we should avoid scanning of parent's child list because it uses guarded...

by vmikayelyan＠svn.reactos.org

Author: vmikayelyan Date: Fri Aug 19 16:56:35 2016 New Revision: 72393 URL: http://svn.reactos.org/svn/reactos?rev=72393&view=rev Log: usb: hub: PDO: InternalDeviceControl can be called in DPC As InternalDeviceControl can be called in DPC, we should avoid scanning of parent's child list because it uses guarded mutex for synchronization. So here we just adding new checking for safety and removing isValidPDO() call. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:56:35 2016 @@ -210,7 +210,7 @@ if (ChildDeviceExtension->Common.PnPState == SurpriseRemovePending || ChildDeviceExtension->Common.PnPState == RemovePending || - !IsValidPDO(DeviceObject)) + ChildDeviceExtension->ParentDeviceObject == NULL) { // Parent or child device was surprise removed. DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject);

8 years, 2 months

[vmikayelyan] 72392: usb: HUB: Fix DV's enhanced I/O validation issues Added USBHUB_DispatchSystemControl stub

by vmikayelyan＠svn.reactos.org

Author: vmikayelyan Date: Fri Aug 19 16:55:09 2016 New Revision: 72392 URL: http://svn.reactos.org/svn/reactos?rev=72392&view=rev Log: usb: HUB: Fix DV's enhanced I/O validation issues Added USBHUB_DispatchSystemControl stub Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:55:09 2016 @@ -1626,7 +1626,7 @@ RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; // Send the StartDevice to RootHub - Status = ForwardIrpAndWait(RootHubDeviceObject, Irp); + Status = ForwardIrpAndWait(HubDeviceExtension->LowerDeviceObject, Irp); if (!NT_SUCCESS(Status)) { Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:55:09 2016 @@ -62,7 +62,7 @@ PDEVICE_OBJECT DeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; NTSTATUS Status; - DPRINT("USBHUB: AddDevice\n"); + DPRINT("USBHUB: AddDevice (%p)\n", PhysicalDeviceObject); // // Create the Device Object // @@ -167,6 +167,18 @@ } NTSTATUS NTAPI +USBHUB_DispatchSystemControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT("Usbhub: DispatchSystemControl\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return USBHUB_IrpStub(DeviceObject, Irp); + else + return USBHUB_IrpStub(DeviceObject, Irp); +} + +NTSTATUS NTAPI USBHUB_DispatchInternalDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -275,6 +287,7 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBHUB_Cleanup; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBHUB_DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = USBHUB_DispatchSystemControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBHUB_DispatchInternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = USBHUB_DispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] =USBHUB_DispatchPower;

8 years, 2 months

[vmikayelyan] 72391: usb: HUB: Refactor power dispatcher, add remove synch Refactored power dispatcher, added remove sychronization to avoid early remove or call on removed device.

by vmikayelyan＠svn.reactos.org

Author: vmikayelyan Date: Fri Aug 19 16:52:21 2016 New Revision: 72391 URL: http://svn.reactos.org/svn/reactos?rev=72391&view=rev Log: usb: HUB: Refactor power dispatcher, add remove synch Refactored power dispatcher, added remove sychronization to avoid early remove or call on removed device. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:52:21 2016 @@ -197,45 +197,58 @@ { PIO_STACK_LOCATION IoStack; PHUB_DEVICE_EXTENSION DeviceExtension; - + NTSTATUS Status; IoStack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = DeviceObject->DeviceExtension; + + Status = IoAcquireRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + DPRINT1("Power Function %x\n", IoStack->MinorFunction); if (DeviceExtension->Common.IsFDO) { PoStartNextPowerIrp(Irp); IoSkipCurrentIrpStackLocation(Irp); - return PoCallDriver(DeviceExtension->LowerDeviceObject, Irp); - } - - if (IoStack->MinorFunction == IRP_MN_SET_POWER) - { - PoStartNextPowerIrp(Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - - } - else if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) - { - PoStartNextPowerIrp(Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - - } - else if (IoStack->MinorFunction == IRP_MN_WAIT_WAKE) - { - PoStartNextPowerIrp(Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + Status = PoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + IoReleaseRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); + return Status; + } + + switch (IoStack->MinorFunction) + { + case IRP_MN_SET_POWER: + { + DPRINT("IRP_MN_SET_POWER\n"); + break; + } + case IRP_MN_QUERY_POWER: + { + DPRINT("IRP_MN_QUERY_POWER\n"); + break; + } + case IRP_MN_WAIT_WAKE: + { + DPRINT("IRP_MN_WAIT_WAKE\n"); + break; + } + default: + { + DPRINT1("PDO IRP_MJ_POWER / unknown minor function 0x%lx\n", IoStack->MinorFunction); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Irp->IoStatus.Status; + } } PoStartNextPowerIrp(Irp); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); return STATUS_SUCCESS; }

8 years, 2 months

[vmikayelyan] 72390: usb: HUB: FDO: Add IRP_MN_REMOVE_DEVICE handler Added remove handler for usbhub FDO. When FDO is being removed, it should delete all it's child PDOs. Because when PnP sends rem...

by vmikayelyan＠svn.reactos.org

Author: vmikayelyan Date: Fri Aug 19 16:50:26 2016 New Revision: 72390 URL: http://svn.reactos.org/svn/reactos?rev=72390&view=rev Log: usb: HUB: FDO: Add IRP_MN_REMOVE_DEVICE handler Added remove handler for usbhub FDO. When FDO is being removed, it should delete all it's child PDOs. Because when PnP sends removes to child devices they are still presented on the bus, so their handler will not delete PDO. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:50:26 2016 @@ -2034,10 +2034,12 @@ NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT ChildDeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; + PUSB_BUS_INTERFACE_HUB_V5 HubInterface; PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + HubInterface = &HubDeviceExtension->HubInterface; Stack = IoGetCurrentIrpStackLocation(Irp); Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); @@ -2175,15 +2177,69 @@ } case IRP_MN_REMOVE_DEVICE: { - // Should be reworked later in this commits set DPRINT("IRP_MN_REMOVE_DEVICE\n"); + + SET_NEW_PNP_STATE(HubDeviceExtension->Common, Deleted); + + IoReleaseRemoveLockAndWait(&HubDeviceExtension->Common.RemoveLock, Irp); + + // + // Here we should remove all child PDOs. At this point all children + // received and returned from IRP_MN_REMOVE so remove synchronization + // isn't needed here + // + + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); + + for (int i = 0; i < USB_MAXCHILDREN; i++) + { + ChildDeviceObject = HubDeviceExtension->ChildDeviceObject[i]; + if (ChildDeviceObject) + { + PHUB_CHILDDEVICE_EXTENSION UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceExtension; + + SET_NEW_PNP_STATE(UsbChildExtension->Common, Deleted); + + // Remove the usb device + if (UsbChildExtension->UsbDeviceHandle) + { + Status = HubInterface->RemoveUsbDevice(HubInterface->BusContext, UsbChildExtension->UsbDeviceHandle, 0); + ASSERT(Status == STATUS_SUCCESS); + } + + // Free full configuration descriptor + if (UsbChildExtension->FullConfigDesc) + ExFreePool(UsbChildExtension->FullConfigDesc); + + // Free ID buffers + if (UsbChildExtension->usCompatibleIds.Buffer) + ExFreePool(UsbChildExtension->usCompatibleIds.Buffer); + + if (UsbChildExtension->usDeviceId.Buffer) + ExFreePool(UsbChildExtension->usDeviceId.Buffer); + + if (UsbChildExtension->usHardwareIds.Buffer) + ExFreePool(UsbChildExtension->usHardwareIds.Buffer); + + if (UsbChildExtension->usInstanceId.Buffer) + ExFreePool(UsbChildExtension->usInstanceId.Buffer); + + DPRINT("Deleting child PDO\n"); + IoDeleteDevice(DeviceObject); + ChildDeviceObject = NULL; + } + } + + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); + Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = ForwardIrpAndForget(DeviceObject, Irp); IoDetachDevice(HubDeviceExtension->LowerDeviceObject); + DPRINT("Deleting FDO 0x%p\n", DeviceObject); IoDeleteDevice(DeviceObject); - return STATUS_SUCCESS; + return Status; } case IRP_MN_QUERY_BUS_INFORMATION: {

8 years, 2 months

[vmikayelyan] 72389: usb: hub: Add remove synchronization Added PDO/FDO remove synchronization to prevent device removal while another IRP is in process. As guidelines used ch6 of Walter Oney's "Pr...

by vmikayelyan＠svn.reactos.org

Author: vmikayelyan Date: Fri Aug 19 16:47:45 2016 New Revision: 72389 URL: http://svn.reactos.org/svn/reactos?rev=72389&view=rev Log: usb: hub: Add remove synchronization Added PDO/FDO remove synchronization to prevent device removal while another IRP is in process. As guidelines used ch6 of Walter Oney's "Programming the Microsoft Windows Driver Model 2ed" Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:47:45 2016 @@ -1323,6 +1323,8 @@ UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); INITIALIZE_PNP_STATE(UsbChildExtension->Common); + + IoInitializeRemoveLock(&UsbChildExtension->Common.RemoveLock, 'pbuH', 0, 0); KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); @@ -2038,6 +2040,14 @@ Stack = IoGetCurrentIrpStackLocation(Irp); + Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + switch (Stack->MinorFunction) { case IRP_MN_START_DEVICE: @@ -2057,6 +2067,7 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); return Status; } @@ -2083,6 +2094,7 @@ // We should fail an IRP Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); return Status; } @@ -2201,7 +2213,9 @@ } } - return ForwardIrpAndForget(DeviceObject, Irp); + Status = ForwardIrpAndForget(DeviceObject, Irp); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + return Status; } NTSTATUS @@ -2225,6 +2239,25 @@ // get device extension HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + // Prevent handling of control requests in remove pending state + if (HubDeviceExtension->Common.PnPState == RemovePending) + { + DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject); + Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + return STATUS_DEVICE_NOT_CONNECTED; + } + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_INFORMATION) { // is the buffer big enough @@ -2390,6 +2423,7 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); return Status; } Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:47:45 2016 @@ -200,6 +200,14 @@ ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); + Status = IoAcquireRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + if (ChildDeviceExtension->Common.PnPState == SurpriseRemovePending || ChildDeviceExtension->Common.PnPState == RemovePending || !IsValidPDO(DeviceObject)) @@ -209,6 +217,7 @@ Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return STATUS_DEVICE_NOT_CONNECTED; } @@ -314,6 +323,7 @@ // Send the request to RootHub // Status = FowardUrbToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Irp, Urb, NULL); + IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return Status; } // @@ -410,6 +420,7 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } + IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return Status; } @@ -583,6 +594,14 @@ UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; + + Status = IoAcquireRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } switch (MinorFunction) { @@ -682,6 +701,8 @@ // Parent or child device was surprise removed, freeing resources allocated for child device. SET_NEW_PNP_STATE(UsbChildExtension->Common, Deleted); + IoReleaseRemoveLockAndWait(&UsbChildExtension->Common.RemoveLock, Irp); + // Remove the usb device if (UsbChildExtension->UsbDeviceHandle) { @@ -705,8 +726,12 @@ if (UsbChildExtension->usInstanceId.Buffer) ExFreePool(UsbChildExtension->usInstanceId.Buffer); - // Delete child PDO + DPRINT("Deleting child PDO\n"); IoDeleteDevice(DeviceObject); + } + else + { + IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); } // If device is physically presented, we leave its PDO undeleted. @@ -802,7 +827,9 @@ // pass irp down IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(UsbChildExtension->ParentDeviceObject, Irp); + Status = IoCallDriver(UsbChildExtension->ParentDeviceObject, Irp); + IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); + return Status; } case IRP_MN_SURPRISE_REMOVAL: { @@ -825,6 +852,8 @@ Status = Irp->IoStatus.Status; } } + + IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:47:45 2016 @@ -97,6 +97,9 @@ // initialize mutex KeInitializeGuardedMutex(&HubDeviceExtension->HubMutexLock); + // initialize remove lock + IoInitializeRemoveLock(&HubDeviceExtension->Common.RemoveLock, 'buH', 0, 0); + // // initialize reset complete event //

8 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016