Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 58157: [CRT] Add an error icon to the C Runtime termination message box. Patch by Lee Schröder. CORE-6886 #resolve #comment Committed in r58157, thanks :)
by hbelusca＠svn.reactos.org 11 Jan '13

11 Jan '13

Author: hbelusca Date: Fri Jan 11 22:35:44 2013 New Revision: 58157 URL: http://svn.reactos.org/svn/reactos?rev=58157&view=rev Log: [CRT] Add an error icon to the C Runtime termination message box. Patch by Lee Schröder. CORE-6886 #resolve #comment Committed in r58157, thanks :) Modified: trunk/reactos/lib/sdk/crt/stdlib/abort.c Modified: trunk/reactos/lib/sdk/crt/stdlib/abort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/abort.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/abort.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/abort.c [iso-8859-1] Fri Jan 11 22:35:44 2013 @@ -33,7 +33,7 @@ (msvcrt_error_mode == _OUT_TO_MSGBOX)) { /* Output a message box */ - __crt_MessageBoxA(abort_msg, MB_OK); + __crt_MessageBoxA(abort_msg, MB_OK | MB_ICONERROR); } else {

1 0

[hbelusca] 58156: [REGEDIT] Fix error strings placeholders (the '%s' e.g.) broken by changes in r58085.
by hbelusca＠svn.reactos.org 10 Jan '13

10 Jan '13

Author: hbelusca Date: Thu Jan 10 02:18:25 2013 New Revision: 58156 URL: http://svn.reactos.org/svn/reactos?rev=58156&view=rev Log: [REGEDIT] Fix error strings placeholders (the '%s' e.g.) broken by changes in r58085. Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -449,10 +449,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -437,10 +437,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -430,10 +430,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "L'ajout d'informations peut involontairement modifier ou supprimer des valeurs et endommager le fonctionnement de composants.\nSi vous n'Ãªtes pas sÃ»r de la source de ces informations dans '%1', ne les ajoutez pas au Registre.\n\nÃtes-vous sÃ»r de vouloir continuer ?" - IDS_IMPORT_OK "Les clÃ©s et valeurs contenues dans '%1' ont Ã©tÃ© correctement ajoutÃ©es au Registre." - IDS_IMPORT_ERROR "Impossible d'importer '%1' Ã la suite d'une erreur lors de la lecture de ce fichier. Il s'agit d'une erreur disque, ou le fichier est endommagÃ©." - IDS_EXPORT_ERROR "Impossible d'exporter dans le fichier '%1' Ã la suite d'une erreur lors de sa crÃ©ation ou d'une tentative d'Ã©criture, pouvant Ãªtre due Ã une erreur de disque ou de systÃ¨me de fichiers." + IDS_IMPORT_PROMPT "L'ajout d'informations peut involontairement modifier ou supprimer des valeurs et endommager le fonctionnement de composants.\nSi vous n'Ãªtes pas sÃ»r de la source de ces informations dans '%s', ne les ajoutez pas au Registre.\n\nÃtes-vous sÃ»r de vouloir continuer ?" + IDS_IMPORT_OK "Les clÃ©s et valeurs contenues dans '%s' ont Ã©tÃ© correctement ajoutÃ©es au Registre." + IDS_IMPORT_ERROR "Impossible d'importer '%s' Ã la suite d'une erreur lors de la lecture de ce fichier. Il s'agit d'une erreur disque, ou le fichier est endommagÃ©." + IDS_EXPORT_ERROR "Impossible d'exporter dans le fichier '%s' Ã la suite d'une erreur lors de sa crÃ©ation ou d'une tentative d'Ã©criture, pouvant Ãªtre due Ã une erreur de disque ou de systÃ¨me de fichiers." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -435,10 +435,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -433,10 +433,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -436,10 +436,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -419,10 +419,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -441,10 +441,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -435,10 +435,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -436,10 +436,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -432,10 +432,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -431,10 +431,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -419,10 +419,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -435,10 +435,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] Thu Jan 10 02:18:25 2013 @@ -435,10 +435,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE

1 0

[hbelusca] 58155: [PCIX] Fix a comment.
by hbelusca＠svn.reactos.org 10 Jan '13

10 Jan '13

Author: hbelusca Date: Thu Jan 10 01:49:15 2013 New Revision: 58155 URL: http://svn.reactos.org/svn/reactos?rev=58155&view=rev Log: [PCIX] Fix a comment. Modified: trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Thu Jan 10 01:49:15 2013 @@ -152,7 +152,7 @@ else { /* This scenario shouldn't happen yet, since SetupDD isn't used */ - UNIMPLEMENTED_FATAL("ReactOS doesn't use SetupDD for its setup device driver install program. Therefore this scenario must not happen!\n"); + UNIMPLEMENTED_FATAL("ReactOS doesn't use SetupDD for its installation program. Therefore this scenario must not happen!\n"); } /* Return if this is Datacenter or not */

1 0

[hbelusca] 58154: [REACTOS] Fix the debugging macros introduced in r58132 (for the _FATAL case): do not use exceptions but instead a breakpoint followed by a process termination procedure (or a bug...
by hbelusca＠svn.reactos.org 10 Jan '13

10 Jan '13

Author: hbelusca Date: Thu Jan 10 01:45:22 2013 New Revision: 58154 URL: http://svn.reactos.org/svn/reactos?rev=58154&view=rev Log: [REACTOS] Fix the debugging macros introduced in r58132 (for the _FATAL case): do not use exceptions but instead a breakpoint followed by a process termination procedure (or a bugcheck if we are in kernel mode). Feel free to improve them !! [DRIVERS-HAL] Finish to use the new debugging macros Part 3/3 Modified: trunk/reactos/drivers/bus/pcix/device.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/init.c trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c trunk/reactos/drivers/bus/pcix/intrface/busintrf.c trunk/reactos/drivers/bus/pcix/intrface/cardbus.c trunk/reactos/drivers/bus/pcix/intrface/devhere.c trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c trunk/reactos/drivers/bus/pcix/intrface/locintrf.c trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c trunk/reactos/drivers/bus/pcix/intrface/routintf.c trunk/reactos/drivers/bus/pcix/pci/config.c trunk/reactos/drivers/bus/pcix/pci/ppbridge.c trunk/reactos/drivers/bus/pcix/pcivrify.c trunk/reactos/drivers/bus/pcix/pdo.c trunk/reactos/drivers/bus/pcix/power.c trunk/reactos/drivers/bus/pcix/utils.c trunk/reactos/hal/halx86/acpi/halpnpdd.c trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/legacy/bus/cmosbus.c trunk/reactos/hal/halx86/legacy/bus/pcibus.c trunk/reactos/hal/halx86/legacy/halpnpdd.c trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -261,8 +261,7 @@ IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -271,8 +270,7 @@ IN PPCI_COMMON_HEADER PciData) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -281,8 +279,7 @@ IN PPCI_COMMON_HEADER PciData) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -147,14 +147,12 @@ { /* Not used in the driver yet */ case 1: - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); break; /* Not used in the driver yet */ case 2: - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); break; /* A drain request */ @@ -540,8 +538,7 @@ IN OUT PDEVICE_RELATIONS *pDeviceRelations) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } @@ -599,8 +596,7 @@ (ExIsProcessorFeaturePresent(PF_PAE_ENABLED))) { /* Have not tested this on eVb's machine yet */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Check if the requirements are actually the zero list */ @@ -1522,8 +1518,7 @@ if (!PCI_IS_ROOT_FDO(DeviceExtension)) { /* Not really handling this year */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); /* Check for PCI bridges with the ISA bit set, or required */ if ((PdoExtension) && @@ -1532,8 +1527,7 @@ (PdoExtension->Dependent.type1.IsaBitSet))) { /* We'll need to do some legacy support */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } } else @@ -1547,8 +1541,7 @@ if (PdoExtension->Dependent.type1.VgaBitSet) { /* Again, some more legacy support we'll have to do */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } } } @@ -1557,8 +1550,7 @@ if (PciAssignBusNumbers) { /* Not yet supported */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } } @@ -1605,9 +1597,7 @@ sizeof(UCHAR)); if (SecondaryBus != PdoExtension->Dependent.type1.SecondaryBus) { - DPRINT1("PCI: Bus numbers have been changed! Restoring originals.\n"); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("PCI: Bus numbers have been changed! Restoring originals.\n"); } } @@ -1668,8 +1658,7 @@ if (WdTable) { /* Check if this PCI device is the ACPI Watchdog Device... */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Check for non-simple devices */ @@ -1734,8 +1723,7 @@ if (PdoExtension) { /* Rescan scenarios are not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Bus processing will need to happen */ @@ -2197,8 +2185,7 @@ (FdoExtension->HotPlugParameters.Acquired)) { /* Don't have hotplug devices to test with yet, QEMU 0.14 should */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Locate the correct resource configurator for this type of device */ Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -93,8 +93,7 @@ { /* These resources would only be for non-root FDOs, unhandled for now */ ASSERT(Resources->Count == 1); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Initialize the arbiter for this FDO */ @@ -111,8 +110,7 @@ { /* Unhandled for now */ ASSERT(Resources->Count == 1); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } /* Commit the transition to the started state */ @@ -136,8 +134,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -147,8 +144,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -158,8 +154,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -169,8 +164,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -180,8 +174,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -318,8 +311,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -329,8 +321,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -340,8 +331,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -392,8 +382,7 @@ if (OutputBuffer->Count != 4) break; /* HotPlug PCI Support not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } while (FALSE); /* Free the buffer and return */ @@ -544,17 +533,14 @@ else { /* Root PDO in ReactOS does not assign boot resources */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); - DPRINT1("Encountered during setup\n"); + UNIMPLEMENTED_DBGBREAK("Encountered during setup\n"); Descriptor = NULL; } if (Descriptor) { /* Root PDO in ReactOS does not assign boot resources */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } else { Modified: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -678,8 +678,7 @@ PciGetDebugPorts(IN HANDLE DebugKey) { /* This function is not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_SUCCESS; } @@ -688,9 +687,7 @@ PciDriverUnload(IN PDRIVER_OBJECT DriverObject) { /* This function is not yet implemented */ - DPRINT1("PCI: Unload\n"); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("PCI: Unload\n"); } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -58,8 +58,7 @@ } /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/intrface/busintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -48,8 +48,7 @@ IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -33,32 +33,28 @@ NTAPI Cardbus_SaveCurrentSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID NTAPI Cardbus_SaveLimits(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID NTAPI Cardbus_MassageHeaderForLimitsDetermination(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID NTAPI Cardbus_RestoreCurrent(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -67,8 +63,7 @@ IN PPCI_COMMON_HEADER PciData, IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -76,8 +71,7 @@ Cardbus_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -85,8 +79,7 @@ Cardbus_ChangeResourceSettings(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -108,8 +101,7 @@ IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/intrface/devhere.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -50,8 +50,7 @@ PAGED_CODE(); /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -48,8 +48,7 @@ IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/intrface/locintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -48,8 +48,7 @@ IN PINTERFACE Interface) { /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -51,8 +51,7 @@ if (Version != PCI_PME_INTRF_STANDARD_VER) return STATUS_NOINTERFACE; /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/intrface/routintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -53,8 +53,7 @@ if (Version != PCI_INT_ROUTE_INTRF_STANDARD_VER) return STATUS_NOINTERFACE; /* Not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -65,8 +65,7 @@ if (PciInterface) { /* Currently this driver only supports the legacy HAL interface */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } else { Modified: trunk/reactos/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/ppbri… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -671,8 +671,7 @@ PPBridge_ResetDevice(IN PPCI_PDO_EXTENSION PdoExtension, IN PPCI_COMMON_HEADER PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID Modified: trunk/reactos/drivers/bus/pcix/pcivrify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcivrify.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -79,8 +79,7 @@ IN PVOID Context) { /* This function is not yet implemented */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -79,8 +79,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -100,8 +99,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -218,8 +216,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -229,8 +226,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -240,8 +236,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -251,8 +246,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -262,8 +256,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -273,8 +266,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -404,8 +396,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -415,8 +406,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -436,8 +426,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -447,8 +436,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } @@ -458,8 +446,7 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_PDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return STATUS_NOT_SUPPORTED; } Modified: trunk/reactos/drivers/bus/pcix/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -191,8 +191,7 @@ if (DeviceState < DeviceExtension->PowerState.CurrentDeviceState) { /* We would normally re-assign resources after powerup */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); Status = STATUS_NOT_IMPLEMENTED; } } Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -152,8 +152,7 @@ else { /* This scenario shouldn't happen yet, since SetupDD isn't used */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_FATAL("ReactOS doesn't use SetupDD for its setup device driver install program. Therefore this scenario must not happen!\n"); } /* Return if this is Datacenter or not */ @@ -757,8 +756,7 @@ if (!PciDebugPortsCount) return FALSE; /* eVb has not been able to test such devices yet */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); return FALSE; } Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -813,8 +813,7 @@ HalpDispatchWmi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("HAL: PnP Driver WMI!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("HAL: PnP Driver WMI!\n"); return STATUS_SUCCESS; } Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -217,8 +217,8 @@ DPRINT1("HAL: Trap0D while not in V86 mode\n"); KiDumpTrapFrame(TrapFrame); - ASSERT(FALSE); - while (TRUE); + ERROR_FATAL(); + while (TRUE); /* 'noreturn' function */ } VOID Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -229,7 +229,7 @@ // // Don't recurse // - if (HalpNMIInProgress++) ASSERT(FALSE); // while (TRUE); + if (HalpNMIInProgress++) ERROR_DBGBREAK(); // // Read the system control register B Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -181,8 +181,7 @@ IN PKIRQL OldIrql) { #ifdef CONFIG_SMP - ASSERT(FALSE); // FIXME: Unused - // while (TRUE); + ERROR_DBGBREAK("FIXME: Unused\n"); // FIXME: Unused return FALSE; #endif @@ -206,8 +205,7 @@ OUT PKIRQL OldIrql) { #ifdef CONFIG_SMP - ASSERT(FALSE); // FIXME: Unused - // while (TRUE); + ERROR_DBGBREAK("FIXME: Unused\n"); // FIXME: Unused return FALSE; #endif Modified: trunk/reactos/hal/halx86/legacy/bus/cmosbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/cmos… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/cmosbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/cmosbus.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -25,8 +25,7 @@ IN ULONG Offset, IN ULONG Length) { - DPRINT1("CMOS GetData\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("CMOS GetData\n"); return 0; } @@ -39,8 +38,7 @@ IN ULONG Offset, IN ULONG Length) { - DPRINT1("CMOS SetData\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("CMOS SetData\n"); return 0; } Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -536,8 +536,7 @@ IN PCI_SLOT_NUMBER SlotNumber, IN PPCI_COMMON_CONFIG PciData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } VOID @@ -548,8 +547,7 @@ IN PPCI_COMMON_CONFIG PciNewData, IN PPCI_COMMON_CONFIG PciOldData) { - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK(); } NTSTATUS @@ -641,10 +639,8 @@ if (!Found) return; /* FIXME: TODO */ - DPRINT1("You have implemented the KD routines for searching PCI debugger" - "devices, but you have forgotten to implement this routine\n"); - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("You have implemented the KD routines for searching PCI debugger" + "devices, but you have forgotten to implement this routine\n"); } static ULONG NTAPI @@ -678,8 +674,7 @@ if (HalpPciLockSettings) { /* /PCILOCK is not yet supported */ - UNIMPLEMENTED; - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("/PCILOCK boot switch is not yet supported."); } #endif /* Now create the correct resource list based on the supported bus ranges */ Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -811,8 +811,7 @@ HalpDispatchWmi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("HAL: PnP Driver WMI!\n"); - ASSERT(FALSE); // while (TRUE); + UNIMPLEMENTED_DBGBREAK("HAL: PnP Driver WMI!\n"); return STATUS_SUCCESS; } Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Thu Jan 10 01:45:22 2013 @@ -15,7 +15,7 @@ #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG -/* Define DbgPrint/DbgPrintEx/RtlAssert/RtlRaiseStatus unless the NDK is used */ +/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_) /* Make sure we have basic types (some people include us *before* SDK)... */ @@ -51,30 +51,7 @@ PCHAR Message ); -/* - * This is the definition of NTSTATUS, but renamed - * in order not to conflict with other ones. - */ -typedef _Return_type_success_(return >= 0) LONG DEBUG_NTSTATUS; - -__analysis_noreturn -NTSYSAPI -VOID -NTAPI -RtlRaiseStatus( - _In_ DEBUG_NTSTATUS Status -); - #endif /* !defined(_RTLFUNCS_H) && !defined(_NTDDK_) */ - - -/* Fix usage of RtlRaiseStatus */ -#if !defined(_RTLFUNCS_H) && defined(_NTDDK_) - #define RaiseStatus ExRaiseStatus -#else - #define RaiseStatus RtlRaiseStatus -#endif /* !defined(_RTLFUNCS_H) && defined(_NTDDK_) */ - #ifndef assert #ifndef NASSERT @@ -160,6 +137,37 @@ #endif /* not DBG */ /******************************************************************************/ +/* + * Declare a target-dependent process termination procedure. + */ +#ifndef _NTDDK_ /* User-Mode */ + #ifndef NTOS_MODE_USER /* Should be Win32 */ + #ifndef _WIN32 + #error "Unsupported target." + #else + #define TerminateCurrentProcess(Status) TerminateProcess(GetCurrentProcess(), (Status)) + #endif + #else /* Native */ + #ifndef _PSFUNCS_H + NTSYSCALLAPI + NTSTATUS + NTAPI + NtTerminateProcess( + IN HANDLE ProcessHandle, + IN NTSTATUS ExitStatus + ); + #endif + #ifndef NtCurrentProcess + #define NtCurrentProcess() ((HANDLE)(LONG_PTR)-1) + #endif + #define TerminateCurrentProcess(Status) NtTerminateProcess(NtCurrentProcess(), (Status)) + #endif +#else /* Kernel-Mode */ + #include <bugcodes.h> + #define TerminateCurrentProcess(Status) KeBugCheckEx(CRITICAL_SERVICE_FAILED, (Status), 0, 0, 0) +#endif + + /* For internal purposes only */ #define __ERROR_DBGBREAK(...) \ do { \ @@ -168,10 +176,11 @@ } while (0) /* For internal purposes only */ -#define __ERROR_FATAL(Status, ...) \ -do { \ - DbgPrint("" __VA_ARGS__); \ - RaiseStatus((Status)); \ +#define __ERROR_FATAL(Status, ...) \ +do { \ + DbgPrint("" __VA_ARGS__); \ + DbgBreakPoint(); \ + TerminateCurrentProcess(Status); \ } while (0) /*

1 0

[hbelusca] 58153: [BUGCODES] Add two missing bugcheck codes.
by hbelusca＠svn.reactos.org 10 Jan '13

10 Jan '13

Author: hbelusca Date: Thu Jan 10 00:10:32 2013 New Revision: 58153 URL: http://svn.reactos.org/svn/reactos?rev=58153&view=rev Log: [BUGCODES] Add two missing bugcheck codes. Modified: trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Thu Jan 10 00:10:32 2013 @@ -812,6 +812,22 @@ SymbolicName=PINBALL_FILE_SYSTEM Language=English PINBALL_FILE_SYSTEM +. + +MessageId=0x5A +Severity=Success +Facility=System +SymbolicName=CRITICAL_SERVICE_FAILED +Language=English +CRITICAL_SERVICE_FAILED +. + +MessageId=0x5B +Severity=Success +Facility=System +SymbolicName=SET_ENV_VAR_FAILED +Language=English +SET_ENV_VAR_FAILED . MessageId=0x5C

1 0

[hbelusca] 58152: Sync with trunk r58151 to bring the latest changes from Amine and Timo.
by hbelusca＠svn.reactos.org 09 Jan '13

09 Jan '13

Author: hbelusca Date: Wed Jan 9 20:12:23 2013 New Revision: 58152 URL: http://svn.reactos.org/svn/reactos?rev=58152&view=rev Log: Sync with trunk r58151 to bring the latest changes from Amine and Timo. Added: branches/ros-csrss/base/shell/explorer-new/settings.c - copied unchanged from r58151, trunk/reactos/base/shell/explorer-new/settings.c branches/ros-csrss/dll/win32/msgina/resources/reactos.svg - copied unchanged from r58151, trunk/reactos/dll/win32/msgina/resources/reactos.svg branches/ros-csrss/lib/sdk/crt/include/internal/misc.h - copied unchanged from r58151, trunk/reactos/lib/sdk/crt/include/internal/misc.h branches/ros-csrss/lib/sdk/crt/misc/__crt_MessageBoxA.c - copied unchanged from r58151, trunk/reactos/lib/sdk/crt/misc/__crt_MessageBoxA.c branches/ros-csrss/lib/sdk/crt/stdlib/_set_abort_behavior.c - copied unchanged from r58151, trunk/reactos/lib/sdk/crt/stdlib/_set_abort_behavior.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/fontview/lang/ro-RO.rc branches/ros-csrss/base/applications/mscutils/devmgmt/lang/ro-RO.rc branches/ros-csrss/base/applications/rapps/rapps/7zip.txt branches/ros-csrss/base/applications/rapps/rapps/abiword.txt branches/ros-csrss/base/applications/rapps/rapps/abiword28x.txt branches/ros-csrss/base/applications/rapps/rapps/abyss.txt branches/ros-csrss/base/applications/rapps/rapps/ac97forvirtualbox.txt branches/ros-csrss/base/applications/rapps/rapps/audiograbber.txt branches/ros-csrss/base/applications/rapps/rapps/bittorrent.txt branches/ros-csrss/base/applications/rapps/rapps/cnt.txt branches/ros-csrss/base/applications/rapps/rapps/comctl32ocx.txt branches/ros-csrss/base/applications/rapps/rapps/diablo2.txt branches/ros-csrss/base/applications/rapps/rapps/dosblaster.txt branches/ros-csrss/base/applications/rapps/rapps/dosbox.txt branches/ros-csrss/base/applications/rapps/rapps/doublecommander.txt branches/ros-csrss/base/applications/rapps/rapps/fap.txt branches/ros-csrss/base/applications/rapps/rapps/firefox2.txt branches/ros-csrss/base/applications/rapps/rapps/firefox3.txt branches/ros-csrss/base/applications/rapps/rapps/firefox36.txt branches/ros-csrss/base/applications/rapps/rapps/firefox5.txt branches/ros-csrss/base/applications/rapps/rapps/freebasic.txt branches/ros-csrss/base/applications/rapps/rapps/glidewrapzbag.txt branches/ros-csrss/base/applications/rapps/rapps/irfanview.txt branches/ros-csrss/base/applications/rapps/rapps/irfanviewplugins.txt branches/ros-csrss/base/applications/rapps/rapps/kdewin.txt branches/ros-csrss/base/applications/rapps/rapps/lbreakout2.txt branches/ros-csrss/base/applications/rapps/rapps/lgeneral.txt branches/ros-csrss/base/applications/rapps/rapps/libreoffice.txt branches/ros-csrss/base/applications/rapps/rapps/lmarbles.txt branches/ros-csrss/base/applications/rapps/rapps/mfc40.txt branches/ros-csrss/base/applications/rapps/rapps/mirandaim.txt branches/ros-csrss/base/applications/rapps/rapps/mirc.txt branches/ros-csrss/base/applications/rapps/rapps/mirc6.txt branches/ros-csrss/base/applications/rapps/rapps/mono2.txt branches/ros-csrss/base/applications/rapps/rapps/mpc.txt branches/ros-csrss/base/applications/rapps/rapps/msxml3.txt branches/ros-csrss/base/applications/rapps/rapps/net11.txt branches/ros-csrss/base/applications/rapps/rapps/net20.txt branches/ros-csrss/base/applications/rapps/rapps/net20sp2.txt branches/ros-csrss/base/applications/rapps/rapps/offbyone.txt branches/ros-csrss/base/applications/rapps/rapps/openoffice2.4.txt branches/ros-csrss/base/applications/rapps/rapps/openoffice3.0.txt branches/ros-csrss/base/applications/rapps/rapps/openttd.txt branches/ros-csrss/base/applications/rapps/rapps/opera.txt branches/ros-csrss/base/applications/rapps/rapps/opera9.txt branches/ros-csrss/base/applications/rapps/rapps/putty.txt branches/ros-csrss/base/applications/rapps/rapps/python.txt branches/ros-csrss/base/applications/rapps/rapps/python3.txt branches/ros-csrss/base/applications/rapps/rapps/remood.txt branches/ros-csrss/base/applications/rapps/rapps/rosbe.txt branches/ros-csrss/base/applications/rapps/rapps/rosbeamd64.txt branches/ros-csrss/base/applications/rapps/rapps/rosbearm.txt branches/ros-csrss/base/applications/rapps/rapps/sambatng.txt branches/ros-csrss/base/applications/rapps/rapps/sbforvmware.txt branches/ros-csrss/base/applications/rapps/rapps/scite.txt branches/ros-csrss/base/applications/rapps/rapps/scummvm.txt branches/ros-csrss/base/applications/rapps/rapps/sdl_mixer.txt branches/ros-csrss/base/applications/rapps/rapps/sdl_runtime.txt branches/ros-csrss/base/applications/rapps/rapps/smplayer.txt branches/ros-csrss/base/applications/rapps/rapps/steam.txt branches/ros-csrss/base/applications/rapps/rapps/sumatrapdf.txt branches/ros-csrss/base/applications/rapps/rapps/superfinder.txt branches/ros-csrss/base/applications/rapps/rapps/tahoma.txt branches/ros-csrss/base/applications/rapps/rapps/thunderbird.txt branches/ros-csrss/base/applications/rapps/rapps/thunderbird5.txt branches/ros-csrss/base/applications/rapps/rapps/tileworld.txt branches/ros-csrss/base/applications/rapps/rapps/totalcommander.txt branches/ros-csrss/base/applications/rapps/rapps/tuxpaint.txt branches/ros-csrss/base/applications/rapps/rapps/ultravnc.txt branches/ros-csrss/base/applications/rapps/rapps/utorrent.txt branches/ros-csrss/base/applications/rapps/rapps/vb5run.txt branches/ros-csrss/base/applications/rapps/rapps/vb6run.txt branches/ros-csrss/base/applications/rapps/rapps/vc2005sp1run.txt branches/ros-csrss/base/applications/rapps/rapps/vc2008sp1run.txt branches/ros-csrss/base/applications/rapps/rapps/vc6run.txt branches/ros-csrss/base/applications/rapps/rapps/vlc.txt branches/ros-csrss/base/applications/rapps/rapps/winboard.txt branches/ros-csrss/base/applications/rapps/rapps/wme9.txt branches/ros-csrss/base/applications/regedit/lang/ro-RO.rc branches/ros-csrss/base/shell/cmd/lang/ja-JP.rc branches/ros-csrss/base/shell/explorer-new/CMakeLists.txt branches/ros-csrss/base/shell/explorer-new/dragdrop.c branches/ros-csrss/base/shell/explorer-new/explorer.c branches/ros-csrss/base/shell/explorer-new/lang/bg-BG.rc branches/ros-csrss/base/shell/explorer-new/lang/cs-CZ.rc branches/ros-csrss/base/shell/explorer-new/lang/de-DE.rc branches/ros-csrss/base/shell/explorer-new/lang/en-US.rc branches/ros-csrss/base/shell/explorer-new/lang/es-ES.rc branches/ros-csrss/base/shell/explorer-new/lang/fr-FR.rc branches/ros-csrss/base/shell/explorer-new/lang/it-IT.rc branches/ros-csrss/base/shell/explorer-new/lang/ja-JP.rc branches/ros-csrss/base/shell/explorer-new/lang/ko-KR.rc branches/ros-csrss/base/shell/explorer-new/lang/lt-LT.rc branches/ros-csrss/base/shell/explorer-new/lang/nl-NL.rc branches/ros-csrss/base/shell/explorer-new/lang/no-NO.rc branches/ros-csrss/base/shell/explorer-new/lang/pl-PL.rc branches/ros-csrss/base/shell/explorer-new/lang/pt-BR.rc branches/ros-csrss/base/shell/explorer-new/lang/ro-RO.rc branches/ros-csrss/base/shell/explorer-new/lang/ru-RU.rc branches/ros-csrss/base/shell/explorer-new/lang/sk-SK.rc branches/ros-csrss/base/shell/explorer-new/lang/uk-UA.rc branches/ros-csrss/base/shell/explorer-new/lang/zh-CN.rc branches/ros-csrss/base/shell/explorer-new/precomp.h branches/ros-csrss/base/shell/explorer-new/startmnu.c branches/ros-csrss/base/shell/explorer-new/taskband.c branches/ros-csrss/base/shell/explorer-new/taskswnd.c branches/ros-csrss/base/shell/explorer-new/trayntfy.c branches/ros-csrss/base/shell/explorer-new/trayprop.c branches/ros-csrss/base/shell/explorer-new/traywnd.c branches/ros-csrss/base/system/diskpart/lang/ro-RO.rc branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt branches/ros-csrss/cmake/CMakeMacros.cmake branches/ros-csrss/cmake/gcc.cmake branches/ros-csrss/cmake/msvc.cmake branches/ros-csrss/dll/cpl/desk/lang/pl-PL.rc branches/ros-csrss/dll/cpl/input/lang/pl-PL.rc branches/ros-csrss/dll/cpl/timedate/dateandtime.c branches/ros-csrss/dll/ntdll/CMakeLists.txt branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt branches/ros-csrss/dll/win32/kernel32/client/path.c branches/ros-csrss/dll/win32/kernel32/client/thread.c branches/ros-csrss/dll/win32/msgina/resources/reactos.bmp branches/ros-csrss/dll/win32/netapi32/user.c branches/ros-csrss/dll/win32/oleaut32/CMakeLists.txt branches/ros-csrss/dll/win32/rpcrt4/CMakeLists.txt branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/samsrv/setup.c branches/ros-csrss/dll/win32/shdocvw/CMakeLists.txt branches/ros-csrss/drivers/CMakeLists.txt branches/ros-csrss/drivers/base/bootvid/i386/vga.c branches/ros-csrss/drivers/base/bootvid/precomp.h branches/ros-csrss/drivers/ksfilter/ks/CMakeLists.txt branches/ros-csrss/drivers/storage/class/ramdisk/ramdisk.c branches/ros-csrss/drivers/storage/ide/uniata/atapi.h branches/ros-csrss/drivers/storage/ide/uniata/id_ata.cpp branches/ros-csrss/hal/CMakeLists.txt branches/ros-csrss/hal/halx86/CMakeLists.txt branches/ros-csrss/include/psdk/lmaccess.h branches/ros-csrss/include/psdk/sal.h branches/ros-csrss/include/reactos/debug.h branches/ros-csrss/include/reactos/version.cmake branches/ros-csrss/lib/cmlib/hivecell.c branches/ros-csrss/lib/pseh/CMakeLists.txt branches/ros-csrss/lib/rtl/CMakeLists.txt branches/ros-csrss/lib/rtl/timezone.c branches/ros-csrss/lib/sdk/crt/CMakeLists.txt branches/ros-csrss/lib/sdk/crt/crt.cmake branches/ros-csrss/lib/sdk/crt/libcntpr.cmake branches/ros-csrss/lib/sdk/crt/misc/assert.c branches/ros-csrss/lib/sdk/crt/msvcrtex.cmake branches/ros-csrss/lib/sdk/crt/oldnames.cmake branches/ros-csrss/lib/sdk/crt/precomp.h branches/ros-csrss/lib/sdk/crt/stdlib/abort.c branches/ros-csrss/ntoskrnl/CMakeLists.txt branches/ros-csrss/ntoskrnl/cache/cachesub.c branches/ros-csrss/ntoskrnl/cache/copysup.c branches/ros-csrss/ntoskrnl/cache/fssup.c branches/ros-csrss/ntoskrnl/cache/logsup.c branches/ros-csrss/ntoskrnl/inbv/logo/1.bmp branches/ros-csrss/ntoskrnl/include/internal/i386/ke.h branches/ros-csrss/ntoskrnl/io/iomgr/irp.c branches/ros-csrss/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ros-csrss/ntoskrnl/kd64/amd64/kdx64.c branches/ros-csrss/ntoskrnl/kd64/arm/kdarm.c branches/ros-csrss/ntoskrnl/ke/dpc.c branches/ros-csrss/ntoskrnl/ke/i386/context.c branches/ros-csrss/ntoskrnl/ke/i386/traphdlr.c branches/ros-csrss/ntoskrnl/mm/ARM3/arm/init.c branches/ros-csrss/ntoskrnl/mm/ARM3/largepag.c branches/ros-csrss/ntoskrnl/mm/ARM3/sysldr.c branches/ros-csrss/ntoskrnl/mm/arm/page.c branches/ros-csrss/ntoskrnl/mm/arm/stubs.c branches/ros-csrss/ntoskrnl/po/povolume.c branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/fon… Modified: branches/ros-csrss/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/python3.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/lang/j… Modified: branches/ros-csrss/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/taskband.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/explorer-n… Modified: branches/ros-csrss/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/diskpart/… Modified: branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/CMakeMacros.cma… Modified: branches/ros-csrss/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/gcc.cmake?rev=5… Modified: branches/ros-csrss/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/msvc.cmake?rev=… Modified: branches/ros-csrss/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/desk/lang/pl-… Modified: branches/ros-csrss/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/input/lang/pl… Modified: branches/ros-csrss/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/timedate/date… Modified: branches/ros-csrss/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/CMakeLists.… Modified: branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/CM… Modified: branches/ros-csrss/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/reso… Modified: branches/ros-csrss/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netapi32/us… Modified: branches/ros-csrss/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/CM… Modified: branches/ros-csrss/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/rpcrt4/CMak… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/setu… Modified: branches/ros-csrss/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shdocvw/CMa… Modified: branches/ros-csrss/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/CMakeLists.tx… Modified: branches/ros-csrss/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/bootvid/… Modified: branches/ros-csrss/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/bootvid/… Modified: branches/ros-csrss/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/ksfilter/ks/C… Modified: branches/ros-csrss/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/class… Modified: branches/ros-csrss/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/CMakeLists.txt?re… Modified: branches/ros-csrss/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/CMakeLists… Modified: branches/ros-csrss/include/psdk/lmaccess.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/lmaccess… Modified: branches/ros-csrss/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/sal.h?re… Modified: branches/ros-csrss/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/debug… Modified: branches/ros-csrss/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/versi… Modified: branches/ros-csrss/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/cmlib/hivecell.c?… Modified: branches/ros-csrss/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/pseh/CMakeLists.t… Modified: branches/ros-csrss/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/rtl/CMakeLists.tx… Modified: branches/ros-csrss/lib/rtl/timezone.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/rtl/timezone.c?re… Modified: branches/ros-csrss/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/CMakeList… Modified: branches/ros-csrss/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/crt.cmake… Modified: branches/ros-csrss/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/libcntpr.… Modified: branches/ros-csrss/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/misc/asse… Modified: branches/ros-csrss/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/msvcrtex.… Modified: branches/ros-csrss/lib/sdk/crt/oldnames.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/oldnames.… Modified: branches/ros-csrss/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/precomp.h… Modified: branches/ros-csrss/lib/sdk/crt/stdlib/abort.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/stdlib/ab… Modified: branches/ros-csrss/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/CMakeLists.t… Modified: branches/ros-csrss/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/caches… Modified: branches/ros-csrss/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/copysu… Modified: branches/ros-csrss/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/fssup.… Modified: branches/ros-csrss/ntoskrnl/cache/logsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/cache/logsup… Modified: branches/ros-csrss/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/inbv/logo/1.… Modified: branches/ros-csrss/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/include/inte… Modified: branches/ros-csrss/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/iomgr/irp… Modified: branches/ros-csrss/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/pnpmgr/pn… Modified: branches/ros-csrss/ntoskrnl/kd64/amd64/kdx64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd64/amd64/k… Modified: branches/ros-csrss/ntoskrnl/kd64/arm/kdarm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd64/arm/kda… Modified: branches/ros-csrss/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/dpc.c?rev… Modified: branches/ros-csrss/ntoskrnl/ke/i386/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/i386/cont… Modified: branches/ros-csrss/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/i386/trap… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/arm/… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/largepag.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/larg… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/sysl… Modified: branches/ros-csrss/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/arm/page.… Modified: branches/ros-csrss/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/arm/stubs… Modified: branches/ros-csrss/ntoskrnl/po/povolume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/po/povolume.… Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.tx… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dib…

1 0

[akhaldi] 58151: [UNIATA] * Sync to 0.44c3. CORE-6649 #resolve #comment Committed in r58151. Thanks Alter ; ) CORE-6563
by akhaldi＠svn.reactos.org 09 Jan '13

09 Jan '13

Author: akhaldi Date: Wed Jan 9 17:19:26 2013 New Revision: 58151 URL: http://svn.reactos.org/svn/reactos?rev=58151&view=rev Log: [UNIATA] * Sync to 0.44c3. CORE-6649 #resolve #comment Committed in r58151. Thanks Alter ;) CORE-6563 Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Wed Jan 9 17:19:26 2013 @@ -533,8 +533,16 @@ // ATAPI interrupt reasons // +// for IDX_ATAPI_IO1_i_InterruptReason #define ATAPI_IR_COD 0x01 -#define ATAPI_IR_IO 0x02 +#define ATAPI_IR_COD_Data 0x0 +#define ATAPI_IR_COD_Cmd 0x1 + +#define ATAPI_IR_IO 0x02 +#define ATAPI_IR_IO_toDev 0x00 +#define ATAPI_IR_IO_toHost 0x02 + +#define ATAPI_IR_Mask 0x03 // // ATA Features Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Wed Jan 9 17:19:26 2013 @@ -725,16 +725,23 @@ } } else { AtapiStallExecution(500); + GetBaseStatus(chan, statusByte2); AtapiWritePort1(chan, IDX_IO1_o_Command, IDE_COMMAND_ATAPI_RESET); - AtapiStallExecution(30); - - // Wait for BUSY assertion, in some cases delay may occure - while (!(AtapiReadPort1(chan, IDX_IO1_i_Status) & IDE_STATUS_BUSY) && - i--) - { - AtapiStallExecution(30); - } - + + // Do not wait for BUSY assertion if it was initially set, jump to + // BUSY release wait loop + if(!(statusByte2 & IDE_STATUS_BUSY)) { + // Wait for BUSY assertion, in some cases delay may occure + // 100ms should be enough + i = 10*1000; + while (!(AtapiReadPort1(chan, IDX_IO1_i_Status) & IDE_STATUS_BUSY) && + i--) + { + AtapiStallExecution(10); + } + } + + i = 30 * 1000; // ReactOS modification: Already stop looping when we know that the drive has finished resetting. // Not all controllers clear the IDE_STATUS_BUSY flag (e.g. not the VMware one), so ensure that // the maximum waiting time (30 * i = 0.9 seconds) does not exceed the one of the original @@ -4492,7 +4499,7 @@ KdPrint2((PRINT_PREFIX " OurInterrupt = %d\n", OurInterrupt)); return OurInterrupt; } - interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & 0x3); + interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & ATAPI_IR_Mask); KdPrint3((PRINT_PREFIX "AtapiCheckInterrupt__: ATAPI int reason %x\n", interruptReason)); return OurInterrupt; } @@ -4847,7 +4854,7 @@ if(deviceExtension->HwFlags & UNIATA_AHCI) { KdPrint3((PRINT_PREFIX " AHCI branch (ATAPI)\n")); } else { - interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & 0x3); + interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & ATAPI_IR_Mask); KdPrint3((PRINT_PREFIX "AtapiInterrupt: iReason %x\n", interruptReason)); } @@ -5016,7 +5023,7 @@ } } } else { - interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & 0x3); + interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & ATAPI_IR_Mask); KdPrint3((PRINT_PREFIX "AtapiInterrupt: ATAPI Error, int reason %x\n", interruptReason)); if(DmaTransfer && (chan->lun[DeviceNumber]->TransferMode > ATA_UDMA2) && @@ -5086,7 +5093,7 @@ KdPrint2((PRINT_PREFIX "AtapiInterrupt: ATAPI branch\n")); // ATAPI branch - interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & 0x3); + interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & ATAPI_IR_Mask); KdPrint3((PRINT_PREFIX "AtapiInterrupt: iReason %x\n", interruptReason)); if(DmaTransfer) { wordsThisInterrupt = DEV_BSIZE/2*512; @@ -5113,10 +5120,10 @@ if (srb->SrbFlags & SRB_FLAGS_DATA_IN) { - interruptReason = 0x2; + interruptReason = ATAPI_IR_IO_toHost; } else if (srb->SrbFlags & SRB_FLAGS_DATA_OUT) { - interruptReason = 0x0; + interruptReason = ATAPI_IR_IO_toDev; } else { status = SRB_STATUS_ERROR; @@ -5164,13 +5171,13 @@ goto ReturnEnableIntr; } else { - interruptReason = (srb->SrbFlags & SRB_FLAGS_DATA_IN) ? 0x2 : 0x0; + interruptReason = (srb->SrbFlags & SRB_FLAGS_DATA_IN) ? ATAPI_IR_IO_toHost : ATAPI_IR_IO_toDev; } } else { // Command complete - verify, write, or the SMART enable/disable. // Also get_media_status - interruptReason = 0x3; + interruptReason = ATAPI_IR_IO_toHost | ATAPI_IR_COD_Cmd; } } } @@ -5196,7 +5203,7 @@ chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; goto CompleteRequest; } else - if (interruptReason == 0x1 && (statusByte & IDE_STATUS_DRQ)) { + if (interruptReason == ATAPI_IR_COD_Cmd && (statusByte & IDE_STATUS_DRQ)) { // Write the packet. KdPrint3((PRINT_PREFIX "AtapiInterrupt: Writing Atapi packet.\n")); // Send CDB to device. @@ -5212,7 +5219,7 @@ goto ReturnEnableIntr; - } else if (interruptReason == 0x0 && (statusByte & IDE_STATUS_DRQ)) { + } else if (interruptReason == ATAPI_IR_IO_toDev && (statusByte & IDE_STATUS_DRQ)) { // Write the data. if (atapiDev) { @@ -5319,7 +5326,7 @@ goto ReturnEnableIntr; - } else if (interruptReason == 0x2 && (statusByte & IDE_STATUS_DRQ)) { + } else if (interruptReason == ATAPI_IR_IO_toHost && (statusByte & IDE_STATUS_DRQ)) { if (atapiDev) { @@ -5515,7 +5522,7 @@ goto ReturnEnableIntr; - } else if (interruptReason == 0x3 && !(statusByte & IDE_STATUS_DRQ)) { + } else if (interruptReason == (ATAPI_IR_IO_toHost | ATAPI_IR_COD_Cmd) && !(statusByte & IDE_STATUS_DRQ)) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: interruptReason = CompleteRequest\n")); // Command complete. @@ -5663,7 +5670,8 @@ AtaReq->OriginalSrb); } else { - // last request was illegal. No point trying again + // last request was illegal. No point trying again. + // Do-nothing call ? AtapiHwInitializeChanger (HwDeviceExtension, srb, (PMECHANICAL_STATUS_INFORMATION_HEADER) NULL); @@ -5706,6 +5714,7 @@ if (AtaReq->OriginalSrb) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: call AtapiHwInitializeChanger()\n")); + // Do-nothing call ? AtapiHwInitializeChanger (HwDeviceExtension, srb, (PMECHANICAL_STATUS_INFORMATION_HEADER) NULL); @@ -6756,7 +6765,7 @@ //ULONG ldev = GET_LDEV(Srb); ULONG DeviceNumber = GET_CDEV(Srb); ULONG flags; - UCHAR statusByte,byteCountLow,byteCountHigh; + UCHAR statusByte,statusByte0,byteCountLow,byteCountHigh; BOOLEAN use_dma = FALSE; BOOLEAN dma_reinited = FALSE; BOOLEAN retried = FALSE; @@ -6901,9 +6910,27 @@ KdPrint2((PRINT_PREFIX "AtapiSendCommand: SRB_STATUS_PENDING (2)\n")); return srbStatus; } else { + + // failed! Get the sense key and maybe try again + AtaReq->Srb = BuildRequestSenseSrb ( HwDeviceExtension, + AtaReq->OriginalSrb); + + srbStatus = AtapiSendCommand(HwDeviceExtension, AtaReq->Srb, CMD_ACTION_ALL); + + KdPrint3((PRINT_PREFIX "AtapiSendCommand: chan->ExpectingInterrupt %d (1)\n", chan->ExpectingInterrupt)); + + if (srbStatus == SRB_STATUS_PENDING) { + KdPrint2((PRINT_PREFIX "AtapiSendCommand: send orig SRB_STATUS_PENDING (2.1)\n")); + return srbStatus; + } + + // failed again ? should not get here + AtaReq->Srb = AtaReq->OriginalSrb; AtaReq->OriginalSrb = NULL; + KdPrint2((PRINT_PREFIX "AtapiSendCommand: AtapiHwInitializeChanger()\n")); + // Do-nothing call ? AtapiHwInitializeChanger (HwDeviceExtension, Srb, (PMECHANICAL_STATUS_INFORMATION_HEADER) NULL); // fall out @@ -7395,6 +7422,8 @@ if(g_opt_AtapiSendDisableIntr) { AtapiDisableInterrupts(deviceExtension, lChannel); } + // remember status. Later we may check if error appeared after cmd packet + statusByte0 = statusByte; // Write ATAPI packet command. AtapiWritePort1(chan, IDX_IO1_o_Command, IDE_COMMAND_ATAPI_PACKET); @@ -7442,9 +7471,19 @@ GetStatus(chan, statusByte); KdPrint3((PRINT_PREFIX "AtapiSendCommand: cmd status (%#x)\n", statusByte)); + // When we operate in DMA mode, we should not start transfer when there is an error on entry + // Interrupt may never come in such case. if(statusByte & IDE_STATUS_ERROR) { + UCHAR interruptReason; + GetBaseStatus(chan, statusByte); KdPrint3((PRINT_PREFIX "AtapiSendCommand: Error on cmd: (%#x)\n", statusByte)); + + interruptReason = (AtapiReadPort1(chan, IDX_ATAPI_IO1_i_InterruptReason) & ATAPI_IR_Mask); + KdPrint3((PRINT_PREFIX "AtapiSendCommand: iReason %x\n", interruptReason)); + + // TODO: we should check interruptReason and decide what to do now + // Read the error reg. to clear it and fail this request. AtaReq->ReqState = REQ_STATE_TRANSFER_COMPLETE; return MapError(deviceExtension, Srb);

1 0

[tkreuzer] 58150: [BOOTVID] Rename a global variable to silence a VS analyze warning.
by tkreuzer＠svn.reactos.org 09 Jan '13

09 Jan '13

Author: tkreuzer Date: Wed Jan 9 13:22:14 2013 New Revision: 58150 URL: http://svn.reactos.org/svn/reactos?rev=58150&view=rev Log: [BOOTVID] Rename a global variable to silence a VS analyze warning. Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Wed Jan 9 13:22:14 2013 @@ -63,7 +63,7 @@ 0x1111, }; -ULONG TextColor = 0xF; +ULONG VidTextColor = 0xF; ULONG curr_x = 0; ULONG curr_y = 0; BOOLEAN CarriageReturn = FALSE; @@ -689,8 +689,8 @@ ULONG OldColor; /* Save the old color and set the new one */ - OldColor = TextColor; - TextColor = Color; + OldColor = VidTextColor; + VidTextColor = Color; return OldColor; } @@ -824,7 +824,7 @@ } /* Display this character */ - DisplayCharacter(*String, curr_x, curr_y, TextColor, 16); + DisplayCharacter(*String, curr_x, curr_y, VidTextColor, 16); curr_x += 8; /* Check if we should scroll */

1 0

[tkreuzer] 58149: [BOOTVID] Fix support for CHAR_GEN_UPSIDE_DOWN
by tkreuzer＠svn.reactos.org 09 Jan '13

09 Jan '13

Author: tkreuzer Date: Wed Jan 9 12:53:59 2013 New Revision: 58149 URL: http://svn.reactos.org/svn/reactos?rev=58149&view=rev Log: [BOOTVID] Fix support for CHAR_GEN_UPSIDE_DOWN Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Wed Jan 9 12:53:59 2013 @@ -182,7 +182,7 @@ { SET_PIXELS(PixelPtr, *FontChar << Shift, TextColor); PixelPtr += 80; - FontChar++; + FontChar += FONT_PTR_DELTA; } while (--Height); } @@ -206,7 +206,7 @@ { SET_PIXELS(PixelPtr, ~*FontChar >> Shift, BackColor); PixelPtr += 80; - FontChar++; + FontChar += FONT_PTR_DELTA; } while (--Height); /* Check if we need to update neighbor bytes */ @@ -225,7 +225,7 @@ { SET_PIXELS(PixelPtr, ~*FontChar << Shift, BackColor); PixelPtr += 80; - FontChar++; + FontChar += FONT_PTR_DELTA; } while (--Height); } }

1 0

[tkreuzer] 58148: [BOOTVID] Rewrite DisplayCharacter. The new algorithm is much faster. It uses the VGA mask register to draws up to 8 pixels at once, completely getting rid of the inner loop. Pixe...
by tkreuzer＠svn.reactos.org 09 Jan '13

09 Jan '13

Author: tkreuzer Date: Wed Jan 9 12:40:42 2013 New Revision: 58148 URL: http://svn.reactos.org/svn/reactos?rev=58148&view=rev Log: [BOOTVID] Rewrite DisplayCharacter. The new algorithm is much faster. It uses the VGA mask register to draws up to 8 pixels at once, completely getting rid of the inner loop. Pixel position / mask calculations and the check for opaque vs transparent background are moved out of the loops. The result is a single loop for the y coordinate containing an inlined __outbyte and memory write. A second loop in case of unaligned character writes. Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Wed Jan 9 12:40:42 2013 @@ -114,19 +114,32 @@ READ_REGISTER_UCHAR(PixelPosition) & Color); } +#ifdef CHAR_GEN_UPSIDE_DOWN +# define GetFontPtr(_Char) &FontData[_Char * BOOTCHAR_HEIGHT] + BOOTCHAR_HEIGHT - 1; +# define FONT_PTR_DELTA (-1) +#else +# define GetFontPtr(_Char) &FontData[_Char * BOOTCHAR_HEIGHT]; +# define FONT_PTR_DELTA (1) +#endif + +#define SET_PIXELS(_PixelPtr, _PixelMask, _TextColor) \ + /* Select the bitmask register and write the mask */ \ + __outpw(0x3CE, (_PixelMask << 8) | 8); \ +\ + /* Set the new color */ \ + WRITE_REGISTER_UCHAR(_PixelPtr, (UCHAR)_TextColor);\ + VOID NTAPI DisplayCharacter(CHAR Character, ULONG Left, ULONG Top, ULONG TextColor, - ULONG BackTextColor) -{ - PUCHAR FontChar; - ULONG i, j, XOffset; - - /* Get the font line for this character */ - FontChar = &FontData[Character * BOOTCHAR_HEIGHT]; + ULONG BackColor) +{ + PUCHAR FontChar, PixelPtr; + ULONG Height; + UCHAR Shift; /* Switch to mode 10 */ ReadWriteMode(10); @@ -137,40 +150,84 @@ /* Select the color don't care register */ __outpw(0x3CE, 7); - /* Loop each pixel height */ - i = BOOTCHAR_HEIGHT; + /* Calculate shift */ + Shift = Left & 7; + + /* Get the font and pixel pointer */ + FontChar = GetFontPtr(Character); + PixelPtr = (PUCHAR)VgaBase + (Left >> 3) + (Top * 80); + + /* Loop all pixel rows */ + Height = BOOTCHAR_HEIGHT; do { - /* Loop each pixel width */ - j = 128; - XOffset = Left; + SET_PIXELS(PixelPtr, *FontChar >> Shift, TextColor); + PixelPtr += 80; + FontChar += FONT_PTR_DELTA; + } while (--Height); + + /* Check if we need to update neighbor bytes */ + if (Shift) + { + /* Calculate shift for 2nd byte */ + Shift = 8 - Shift; + + /* Get the font and pixel pointer (2nd byte) */ + FontChar = GetFontPtr(Character); + PixelPtr = (PUCHAR)VgaBase + (Left >> 3) + (Top * 80) + 1; + + /* Loop all pixel rows */ + Height = BOOTCHAR_HEIGHT; do { - /* Check if we should draw this pixel */ -#ifdef CHAR_GEN_UPSIDE_DOWN - if (FontChar[i] & (UCHAR)j) -#else - /* Normal character generator (top of char is first element) */ - if (FontChar[BOOTCHAR_HEIGHT - i] & (UCHAR)j) -#endif - { - /* We do, use the given Text Color */ - SetPixel(XOffset, Top, (UCHAR)TextColor); - } - else if (BackTextColor < 16) - { - /* This is a background pixel. */ - /* We're drawing it unless it's transparent. */ - SetPixel(XOffset, Top, (UCHAR)BackTextColor); - } - - /* Increase X Offset */ - XOffset++; - } while (j >>= 1); - - /* Move to the next Y ordinate */ - Top++; - } while (--i); + SET_PIXELS(PixelPtr, *FontChar << Shift, TextColor); + PixelPtr += 80; + FontChar++; + } while (--Height); + } + + /* Check if the background color is transparent */ + if (BackColor >= 16) + { + /* We are done */ + return; + } + + /* Calculate shift */ + Shift = Left & 7; + + /* Get the font and pixel pointer */ + FontChar = GetFontPtr(Character); + PixelPtr = (PUCHAR)VgaBase + (Left >> 3) + (Top * 80); + + /* Loop all pixel rows */ + Height = BOOTCHAR_HEIGHT; + do + { + SET_PIXELS(PixelPtr, ~*FontChar >> Shift, BackColor); + PixelPtr += 80; + FontChar++; + } while (--Height); + + /* Check if we need to update neighbor bytes */ + if (Shift) + { + /* Calculate shift for 2nd byte */ + Shift = 8 - Shift; + + /* Get the font and pixel pointer (2nd byte) */ + FontChar = GetFontPtr(Character); + PixelPtr = (PUCHAR)VgaBase + (Left >> 3) + (Top * 80) + 1; + + /* Loop all pixel rows */ + Height = BOOTCHAR_HEIGHT; + do + { + SET_PIXELS(PixelPtr, ~*FontChar << Shift, BackColor); + PixelPtr += 80; + FontChar++; + } while (--Height); + } } VOID

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