Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28792: Activated German RC File. Add BS_MULTILINE to one Checkbox. Fixed some Text Lengths to fit.
by dreimer＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: dreimer Date: Mon Sep 3 03:34:31 2007 New Revision: 28792 URL: http://svn.reactos.org/svn/reactos?rev=28792&view=rev Log: Activated German RC File. Add BS_MULTILINE to one Checkbox. Fixed some Text Lengths to fit. Modified: trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Mon Sep 3 03:34:31 2007 @@ -21,7 +21,7 @@ */ //#include "lang/cs-CZ.rc" -//#include "lang/de-DE.rc" +#include "lang/de-DE.rc" //#include "lang/el-GR.rc" #include "lang/en-US.rc" //#include "lang/es-ES.rc" Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Mon Sep 3 03:34:31 2007 @@ -23,7 +23,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Geografische Lage", -1, 5, 172, 234, 55 LTEXT "Wählen Sie Ihren Standort, sodass Dienste sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + COMBOBOX IDC_LOCATION_COMBO, 14, 210, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -37,7 +37,7 @@ PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 GROUPBOX "Zusätzliche Sprachunterstützung", IDC_GROUPBOX, 5, 62, 234, 82 LTEXT "Die meisten Sprachen sind standardmäßig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren Kontollkästchen.", -1, 12, 72, 220, 18 - CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links Schreibstil installieren", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22 + CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links Schreibstil installieren", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE CHECKBOX "Dateien für &ostasiatische Sprachen installieren", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22 END @@ -49,11 +49,11 @@ GROUPBOX "Sprache für Unicode-Inkompatible Programme", IDC_GROUPBOX, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, wird aber für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 - LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Unicode-Inkompatiblen Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 + LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30 - CHECKBOX "&Alle Einstellungen auf das derzeitige Benutzerkonto und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 + CHECKBOX "Einstellungen &auf das aktive und Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 @@ -152,7 +152,7 @@ LTEXT "Kalendertypus:", -1, 13, 48, 56, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Muslimischer Kalender:", -1, 13, 65, 60, 12 + LTEXT "Muslim. Kalender:", -1, 13, 65, 60, 12 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED GROUPBOX "Kurzes Datumsformat", IDC_GROUPBOX, 7, 83, 230, 81

1 0

[dreimer] 28791: I missed a Dialog in my Translation :-P
by dreimer＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: dreimer Date: Mon Sep 3 03:04:40 2007 New Revision: 28791 URL: http://svn.reactos.org/svn/reactos?rev=28791&view=rev Log: I missed a Dialog in my Translation :-P Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Mon Sep 3 03:04:40 2007 @@ -48,12 +48,12 @@ BEGIN GROUPBOX "Sprache für Unicode-Inkompatible Programme", IDC_GROUPBOX, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, aber wird für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 + LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, wird aber für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Unicode-Inkompatiblen Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30 - CHECKBOX "&Alle Einstellungen auf das derzeitige und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 + CHECKBOX "&Alle Einstellungen auf das derzeitige Benutzerkonto und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 @@ -143,33 +143,33 @@ CAPTION "Datum" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Calendar", IDC_GROUPBOX, 7, 7, 230, 74 - LTEXT "If year typed as two digits, then show it as year between:", -1, 13, 18, 215, 8 + GROUPBOX "Kalender", IDC_GROUPBOX, 7, 7, 230, 74 + LTEXT "Eine Zweistellige Jahreszahl in folgendem Zeitraum interpretieren:", -1, 13, 18, 215, 8 EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "and", -1, 55, 32, 17, 8 + LTEXT "und", -1, 55, 32, 17, 8 EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "Calendar type:", -1, 13, 48, 56, 10 + LTEXT "Kalendertypus:", -1, 13, 48, 56, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Muslim Calendar:", -1, 13, 65, 60, 12 + LTEXT "Muslimischer Kalender:", -1, 13, 65, 60, 12 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 230, 81 - LTEXT "Sample:", -1, 13, 95, 63, 10 + GROUPBOX "Kurzes Datumsformat", IDC_GROUPBOX, 7, 83, 230, 81 + LTEXT "Beispiel:", -1, 13, 95, 63, 10 EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Sample - right to left read:", -1, 13, 109, 60, 16 + LTEXT "Beispiel - Rechts nach Links:", -1, 13, 109, 60, 16 EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Short format:", -1, 13, 131, 60, 10 + LTEXT "Kurzes Format:", -1, 13, 131, 60, 10 COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Date components separator:", -1, 13, 148, 113, 10 + LTEXT "Datumstrennzeichen:", -1, 13, 148, 113, 10 COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "Long date format", IDC_GROUPBOX, 7, 167, 230, 64 - LTEXT "Sample:", -1, 13, 179, 61, 10 + GROUPBOX "Langes Datumsformat", IDC_GROUPBOX, 7, 167, 230, 64 + LTEXT "Beispiel:", -1, 13, 179, 61, 10 EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Sample - right to left read:", -1, 13, 193, 61, 16 + LTEXT "Beispiel - Rechts nach Links:", -1, 13, 193, 61, 16 EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Long format:", -1, 13, 215, 60, 10 + LTEXT "Langes Format:", -1, 13, 215, 60, 10 COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END

1 0

[dreimer] 28790: Updated German Resource File. I was NOT able to test it, because intl seems to be broken, but before anybody else commits a translation...
by dreimer＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: dreimer Date: Mon Sep 3 02:39:17 2007 New Revision: 28790 URL: http://svn.reactos.org/svn/reactos?rev=28790&view=rev Log: Updated German Resource File. I was NOT able to test it, because intl seems to be broken, but before anybody else commits a translation... Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Mon Sep 3 02:39:17 2007 @@ -1,36 +1,100 @@ -/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Allgemein" +CAPTION "Regionale Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + GROUPBOX "Standards und Formate", -1, 5, 5, 234, 162 + LTEXT "Diese Einstellungen beeinflussen, wie einige Programme Zahlen, Währung, Datum, und Zeit formatieren.", -1, 14, 17, 220, 25 + LTEXT "Wählen Sie ein Element, um dessen Einstellungen anzuzeigen, oder wählen Sie ""Anpassen..."", um Ihr eigenes Format zu wählen:", -1, 14, 37, 220, 22 + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "&Anpassen...", IDC_SETUP_BUTTON, 178, 56, 52, 13 + LTEXT "Beispiele", -1, 14, 73, 70, 10 + LTEXT "Zahl:", -1, 16, 86, 48, 10 + LTEXT "Währung:", -1, 16, 101, 48, 10 + LTEXT "Zeit:", -1, 16, 116, 48, 10 + LTEXT "Kurzes Datum:", -1, 16, 131, 48, 10 + LTEXT "Langes Datum:", -1, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Geografische Lage", -1, 5, 172, 234, 55 + LTEXT "Wählen Sie Ihren Standort, sodass Dienste sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT END +IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sprachen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Eingabesprachen und Textdienste", IDC_GROUPBOX, 5, 5, 234, 52 + LTEXT "Um Ihre Sprache einsehen oder ändern zu können wählen Sie ""Details...""", -1, 12, 15, 220, 18 + PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 + GROUPBOX "Zusätzliche Sprachunterstützung", IDC_GROUPBOX, 5, 62, 234, 82 + LTEXT "Die meisten Sprachen sind standardmäßig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren Kontollkästchen.", -1, 12, 72, 220, 18 + CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links Schreibstil installieren", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22 + CHECKBOX "Dateien für &ostasiatische Sprachen installieren", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22 +END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 +IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sprache für Unicode-Inkompatible Programme", IDC_GROUPBOX, 5, 5, 234, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, aber wird für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 + LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Unicode-Inkompatiblen Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 + GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 + LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30 + CHECKBOX "&Alle Einstellungen auf das derzeitige und auf das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 +END + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zahlen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 + GROUPBOX "Besispiel", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE + LTEXT "Positiv:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Negativ:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Dezimaltrennzeichen:", -1, 8, 67, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Anzahl an Dezimalstellen:", -1, 8, 83, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Zifferngruppierungssymb&ol:", -1, 8, 100, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Zifferngruppierung:", -1, 8, 117, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "N&egatives Vorzeichen:", -1, 8, 134, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Format für negative Zahlen:", -1, 8, 149, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Füh&rende Nullen anzeigen:", -1, 8, 166, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Listentrennzeichen:", -1, 8, 181, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Maßsystem:", -1, 8, 197, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Währung" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + GROUPBOX "Darstellung", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "Positiv:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_CURRENCYPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Negativ:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Währungssymbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP @@ -50,47 +114,69 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Uhrzeit" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + GROUPBOX "Darstellung", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "Beispiel:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE, 100, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Zeitformat:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEFORMAT, 100, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + COMBOBOX IDC_TIMEFORMAT, 88, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Trennzeichen:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMESEPARATOR, 100, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbol für &Vormittag:", -1, 13, 88, 86, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEAMSYMBOL, 100, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Symbol für &Nachmittag:", -1, 13, 106, 86, 10, WS_VISIBLE | WS_GROUP - COMBOBOX IDC_TIMEPMSYMBOL, 100, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE + COMBOBOX IDC_TIMESEPARATOR, 88, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol für &Vormittag:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 88, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol für &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 88, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE LTEXT "Zeitformat\n\n\ h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\ h = 12 Stunden H = 24 Stunden\n\n\ -hh, mm, ss = führende Null h, m, s = keine führende Null", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP +hh, mm, ss = führende Null h, m, s = keine führende Null", -1, 13, 150, 214, 50, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 5",-1,73,74,90,8 + GROUPBOX "Calendar", IDC_GROUPBOX, 7, 7, 230, 74 + LTEXT "If year typed as two digits, then show it as year between:", -1, 13, 18, 215, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "and", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "Calendar type:", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + LTEXT "Muslim Calendar:", -1, 13, 65, 60, 12 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 230, 81 + LTEXT "Sample:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Sample - right to left read:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Short format:", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Date components separator:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "Long date format", IDC_GROUPBOX, 7, 167, 230, 64 + LTEXT "Sample:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Sample - right to left read:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Long format:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END - -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Regionale Einstellungen" -FONT 8, "MS Shell Dlg" +STRINGTABLE BEGIN - + IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten" END - STRINGTABLE BEGIN

1 0

[janderwald] 28789: - improve error checking - add hasQemuNoRebootOption stub
by janderwald＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: janderwald Date: Mon Sep 3 02:27:03 2007 New Revision: 28789 URL: http://svn.reactos.org/svn/reactos?rev=28789&view=rev Log: - improve error checking - add hasQemuNoRebootOption stub Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Sep 3 02:27:03 2007 @@ -208,6 +208,16 @@ return isFileExisting(qemupath); } //---------------------------------------------------------------------------------------- + bool RosBootTest::hasQemuNoRebootOption() + { + /// + /// FIXME + /// extract version + /// + + return true; + } +//---------------------------------------------------------------------------------------- bool RosBootTest::getQemuDir(string & qemupath) { string::size_type pos; @@ -275,9 +285,10 @@ m_BootCmd += _T(" -pidfile "); m_BootCmd += m_PidFile; #endif - - m_BootCmd += _T(" -no-reboot "); - + if (hasQemuNoRebootOption()) + { + m_BootCmd += _T(" -no-reboot "); + } return true; } //---------------------------------------------------------------------------------------- @@ -335,6 +346,11 @@ /* check if ROS_HDD_IMAGE points to hdd image */ if (!isFileExisting(m_HDDImage)) { + if (!m_CDImage.length ()) + { + cerr << "Error: HDD image is not existing and CDROM image not provided" << endl; + return false; + } /* create it */ return createHDDImage(m_HDDImage); } @@ -346,9 +362,20 @@ * but also no override by * ROS_BOOT_CMD */ + if (!m_CDImage.length ()) + { + cerr << "Error: no HDD and CDROM image provided" << endl; + return false; + } + getDefaultHDDImage(m_HDDImage); return createHDDImage(m_HDDImage); } + /* + * verify the provided ROS_BOOT_CMD for hdd image + * + */ + bool hdaboot = false; string::size_type pos = m_BootCmd.find (_T("-boot c")); if (pos != string::npos) @@ -392,34 +419,28 @@ //---------------------------------------------------------------------------------------- bool RosBootTest::configureCDImage() { - if (m_CDImage.length()) - { - /* we have a cd image lets check if its valid */ - if (!isFileExisting(m_CDImage)) - { - cerr << "Error: ROS_CD_IMAGE is not valid" << endl; - return false; - } + if (!m_BootCmd.length ()) + { + if (m_CDImage.length()) + { + /* we have a cd image lets check if its valid */ + if (isFileExisting(m_CDImage)) + { + cerr << "Using CDROM image " << m_CDImage << endl; + return true; + } + } + if (isFileExisting(_T("ReactOS-RegTest.iso"))) + { + m_CDImage = _T("ReactOS-RegTest.iso"); + cerr << "Falling back to default CDROM image " << m_CDImage << endl; + return true; + } + cerr << "No CDROM image found, boot device is HDD" << endl; + m_CDImage = _T(""); return true; } - /* ROS_CD_IMAGE is not set - * lets check if m_BootCmd provides it - */ - - if (!m_BootCmd.length()) - { - /* ROS_BOOT_CMD not set - * check if theres a default image - */ - - if (isFileExisting(_T("ReactOS-RegTest.iso"))) - { - m_CDImage = _T("ReactOS-RegTest.iso"); - } - return true; - } - string::size_type pos = m_BootCmd.find(_T("-boot ")); if (pos == string::npos) { Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Sep 3 02:27:03 2007 @@ -102,6 +102,7 @@ bool readConfigurationValues(ConfigParser & conf_parser); bool configureQemu(); bool configureVmWare(); + bool hasQemuNoRebootOption(); void cleanup(); //--------------------------------------------------------------------------------------- ///

1 0

[janderwald] 28788: - verify provided boot_cmd - create also hdd images for manual boot cmds
by janderwald＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: janderwald Date: Mon Sep 3 01:47:07 2007 New Revision: 28788 URL: http://svn.reactos.org/svn/reactos?rev=28788&view=rev Log: - verify provided boot_cmd - create also hdd images for manual boot cmds Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Sep 3 01:47:07 2007 @@ -135,7 +135,7 @@ } //--------------------------------------------------------------------------------------- - bool RosBootTest::createDefaultHDDImage() + bool RosBootTest::createHDDImage(string image) { string qemuimgdir; @@ -168,9 +168,8 @@ }; - getDefaultHDDImage(output); options[0] = (TCHAR*)qemuimgdir.c_str(); - options[2] = (TCHAR*)output.c_str(); + options[2] = (TCHAR*)image.c_str(); cerr << "Creating HDD Image ..." << output << endl; if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 4, options, true)) @@ -271,7 +270,7 @@ * on windows we can get pid as return of CreateProcess */ m_PidFile = _T("output-i386"); - EnvironmentVariable::getValue(_T("ROS_OUTPUT"), pid); + EnvironmentVariable::getValue(_T("ROS_OUTPUT"), m_PidFile); m_PidFile += _T("/pid.txt"); m_BootCmd += _T(" -pidfile "); m_BootCmd += m_PidFile; @@ -334,33 +333,61 @@ if (m_HDDImage.length()) { /* check if ROS_HDD_IMAGE points to hdd image */ - return isFileExisting(m_HDDImage); - } - - if (isDefaultHDDImageExisting()) - { - /* ROS_HDD_IMAGE is not set but theres - * a default existing image - * to use */ + if (!isFileExisting(m_HDDImage)) + { + /* create it */ + return createHDDImage(m_HDDImage); + } + return true; + } + else if (!m_BootCmd.length ()) + { + /* no hdd image provided + * but also no override by + * ROS_BOOT_CMD + */ getDefaultHDDImage(m_HDDImage); + return createHDDImage(m_HDDImage); + } + bool hdaboot = false; + string::size_type pos = m_BootCmd.find (_T("-boot c")); + if (pos != string::npos) + { + hdaboot = true; + } + + pos = m_BootCmd.find(_T("-hda ")); + if (pos != string::npos) + { + string hdd = m_BootCmd.substr(pos + 5, m_BootCmd.length() - pos - 5); + if (!hdd.length ()) + { + cerr << "Error: ROS_BOOT_CMD misses value of -hda option" << endl; + return false; + } + pos = m_BootCmd.find(" "); + if (pos != string::npos) + { + /// FIXME + /// sysreg assumes that the hdd image filename has no spaces + /// + hdd = hdd.substr(0, pos); + } + if (!isFileExisting(hdd)) + { + if (hdaboot) + { + cerr << "Error: ROS_BOOT_CMD specifies booting from hda but no valid hdd image " << hdd << " provided" << endl; + return false; + } + + /* the file does not exist create it */ + return createHDDImage(hdd); + } return true; } - if (!createDefaultHDDImage()) - { - /* failed to create hdd image */ - cerr << "Error: failed to create hdd image " << endl; - return false; - } - getDefaultHDDImage(m_HDDImage); - return true; - - /// - /// FIXME - /// scan m_BootCmd if theres -hda param provided - /// and check if it exists - - return true; + return false; } //---------------------------------------------------------------------------------------- bool RosBootTest::configureCDImage() Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Sep 3 01:47:07 2007 @@ -86,7 +86,7 @@ void getDefaultHDDImage(string & img); bool isFileExisting(string filename); bool isDefaultHDDImageExisting(); - bool createDefaultHDDImage(); + bool createHDDImage(string filename); bool isQemuPathValid(); bool getQemuDir(string &); bool createBootCmd();

1 0

[janderwald] 28787: - hardcode the bios directory on linux system to /usr/share/qemu - store the pid.txt in ROS_OUTPUT - check on linux system if the emulator was successfully launched
by janderwald＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: janderwald Date: Mon Sep 3 01:11:12 2007 New Revision: 28787 URL: http://svn.reactos.org/svn/reactos?rev=28787&view=rev Log: - hardcode the bios directory on linux system to /usr/share/qemu - store the pid.txt in ROS_OUTPUT - check on linux system if the emulator was successfully launched Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Sep 3 01:11:12 2007 @@ -230,6 +230,7 @@ bool RosBootTest::createBootCmd() { string pipe; + string qemudir; if (m_MaxMem.length() == 0) { @@ -240,15 +241,16 @@ #ifdef __LINUX__ pipe = _T("stdio"); m_Src = _T(""); + qemudir = _T("/usr/share/qemu"); #else pipe = _T("pipe:qemu"); m_Src = _T("\\\\.\\pipe\\qemu"); + if (!getQemuDir(qemudir)) + { + return false; + } #endif - string qemudir; - if (!getQemuDir(qemudir)) - { - return false; - } + m_BootCmd = m_EmuPath + _T(" -L ") + qemudir + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -serial ") + pipe; @@ -268,7 +270,11 @@ * to terminate the emulator in case of errors * on windows we can get pid as return of CreateProcess */ - m_BootCmd += _T(" -pidfile pid.txt"); + m_PidFile = _T("output-i386"); + EnvironmentVariable::getValue(_T("ROS_OUTPUT"), pid); + m_PidFile += _T("/pid.txt"); + m_BootCmd += _T(" -pidfile "); + m_BootCmd += m_PidFile; #endif m_BootCmd += _T(" -no-reboot "); @@ -478,11 +484,11 @@ return false; } } - cerr << "Opening Data Source:" << m_BootCmd << endl; #ifdef __LINUX__ + _tremove(m_PidFile.c_str ()); m_DataSource = new PipeReader(); m_Src = m_BootCmd; #else @@ -539,6 +545,7 @@ { m_DataSource->closeSource(); OsSupport::sleep(3 * CLOCKS_PER_SEC); + if (m_Pid) { OsSupport::terminateProcess (m_Pid); @@ -597,9 +604,25 @@ cleanup(); return false; } - -#ifndef __LINUX__ - OsSupport::sleep(3000); //FIXME + OsSupport::sleep(1000); +#ifdef __LINUX__ + + FILE * file = fopen(m_PidFile.c_str(), "r"); + if (!file) + { + cerr << "Error: failed to launch emulator" << endl; + cleanup(); + return false; + } + char buffer[128]; + if (!fread(buffer, sizeof(buffer), 1, file)) + { + cerr << "Error: pid file w/o pid!!! " << endl; + cleanup(); + return false; + } + m_Pid = atoi(buffer); + fclose(file); #endif bool ret = analyzeDebugData(); cleanup(); Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Sep 3 01:11:12 2007 @@ -156,6 +156,7 @@ string m_MaxMem; string m_BootCmd; string m_Src; + string m_PidFile; DataSource * m_DataSource; OsSupport::ProcessID m_Pid;

1 0

[fireball] 28786: Dmitry Chapyshev <lentind@yandex.ru>: - Improve intl.cpl, include almost all code from intl_new branch (it's pending for deletion now) - ReactOS's intl.cpl now works and behaves similar to Windows XP's intl.cpl, only the last tab is unfinished - Tested in Windows and ReactOS (in ROS it obviously has reduced functionality, since some of needed registry entries are absent) - As a result, all other languages (other than en-us) need to be re-translated.
by fireball＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: fireball Date: Mon Sep 3 00:42:08 2007 New Revision: 28786 URL: http://svn.reactos.org/svn/reactos?rev=28786&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Improve intl.cpl, include almost all code from intl_new branch (it's pending for deletion now) - ReactOS's intl.cpl now works and behaves similar to Windows XP's intl.cpl, only the last tab is unfinished - Tested in Windows and ReactOS (in ROS it obviously has reduced functionality, since some of needed registry entries are absent) - As a result, all other languages (other than en-us) need to be re-translated. Added: trunk/reactos/dll/cpl/intl/advanced.c (with props) trunk/reactos/dll/cpl/intl/languages.c (with props) trunk/reactos/dll/cpl/intl/misc.c (with props) trunk/reactos/dll/cpl/intl/setupreg.c (with props) Modified: trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/numbers.c trunk/reactos/dll/cpl/intl/resource.h trunk/reactos/dll/cpl/intl/time.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=28… Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… Added: trunk/reactos/dll/cpl/intl/languages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/languages.c?r… Added: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=28… Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re… Added: trunk/reactos/dll/cpl/intl/setupreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/setupreg.c?re… Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=28…

1 0

[hpoussin] 28785: Fix Linux build
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 23:46:23 2007 New Revision: 28785 URL: http://svn.reactos.org/svn/reactos?rev=28785&view=rev Log: Fix Linux build Modified: trunk/reactos/lib/inflib/inflib.mak Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak (original) +++ trunk/reactos/lib/inflib/inflib.mak Sun Sep 2 23:46:23 2007 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos + -Iinclude/reactos -Iinclude/psdk $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_AR)

1 0

[hpoussin] 28784: Remove local header debug.h, and use the global one
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 23:42:22 2007 New Revision: 28784 URL: http://svn.reactos.org/svn/reactos?rev=28784&view=rev Log: Remove local header debug.h, and use the global one Removed: trunk/reactos/dll/win32/kernel32/include/debug.h Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/dll/win32/kernel32/file/backup.c trunk/reactos/dll/win32/kernel32/file/bintype.c trunk/reactos/dll/win32/kernel32/file/cnotify.c trunk/reactos/dll/win32/kernel32/file/copy.c trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/file/curdir.c trunk/reactos/dll/win32/kernel32/file/delete.c trunk/reactos/dll/win32/kernel32/file/deviceio.c trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/file/dosdev.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/file/find.c trunk/reactos/dll/win32/kernel32/file/hardlink.c trunk/reactos/dll/win32/kernel32/file/iocompl.c trunk/reactos/dll/win32/kernel32/file/lfile.c trunk/reactos/dll/win32/kernel32/file/lock.c trunk/reactos/dll/win32/kernel32/file/mailslot.c trunk/reactos/dll/win32/kernel32/file/move.c trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/dll/win32/kernel32/file/pipe.c trunk/reactos/dll/win32/kernel32/file/rw.c trunk/reactos/dll/win32/kernel32/file/tape.c trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/heap.c trunk/reactos/dll/win32/kernel32/mem/isbad.c trunk/reactos/dll/win32/kernel32/mem/local.c trunk/reactos/dll/win32/kernel32/mem/procmem.c trunk/reactos/dll/win32/kernel32/mem/resnotify.c trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/dll/win32/kernel32/mem/virtual.c trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/dll/win32/kernel32/misc/atom.c trunk/reactos/dll/win32/kernel32/misc/chartype.c trunk/reactos/dll/win32/kernel32/misc/comm.c trunk/reactos/dll/win32/kernel32/misc/computername.c trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/dll/win32/kernel32/misc/env.c trunk/reactos/dll/win32/kernel32/misc/error.c trunk/reactos/dll/win32/kernel32/misc/errormsg.c trunk/reactos/dll/win32/kernel32/misc/handle.c trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/ldr.c trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/perfcnt.c trunk/reactos/dll/win32/kernel32/misc/profile.c trunk/reactos/dll/win32/kernel32/misc/recovery.c trunk/reactos/dll/win32/kernel32/misc/res.c trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c trunk/reactos/dll/win32/kernel32/misc/time.c trunk/reactos/dll/win32/kernel32/misc/timerqueue.c trunk/reactos/dll/win32/kernel32/misc/toolhelp.c trunk/reactos/dll/win32/kernel32/misc/utils.c trunk/reactos/dll/win32/kernel32/misc/version.c trunk/reactos/dll/win32/kernel32/process/cmdline.c trunk/reactos/dll/win32/kernel32/process/job.c trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/synch/condvar.c trunk/reactos/dll/win32/kernel32/synch/critical.c trunk/reactos/dll/win32/kernel32/synch/event.c trunk/reactos/dll/win32/kernel32/synch/mutex.c trunk/reactos/dll/win32/kernel32/synch/sem.c trunk/reactos/dll/win32/kernel32/synch/timer.c trunk/reactos/dll/win32/kernel32/synch/wait.c trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/thread/fls.c trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/dll/win32/kernel32/thread/tls.c Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> typedef struct _DBGSS_THREAD_DATA { Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/except/except.c (original) +++ trunk/reactos/dll/win32/kernel32/except/except.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter = UnhandledExceptionFilter; Modified: trunk/reactos/dll/win32/kernel32/file/backup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ba… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/backup.c (original) +++ trunk/reactos/dll/win32/kernel32/file/backup.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/bintype.c (original) +++ trunk/reactos/dll/win32/kernel32/file/bintype.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/cnotify.c (original) +++ trunk/reactos/dll/win32/kernel32/file/cnotify.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/create.c (original) +++ trunk/reactos/dll/win32/kernel32/file/create.c Sun Sep 2 23:42:22 2007 @@ -17,7 +17,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define SYMLINK_FLAG_RELATIVE 1 Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c Sun Sep 2 23:42:22 2007 @@ -19,7 +19,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBAL VARIABLES **********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/delete.c (original) +++ trunk/reactos/dll/win32/kernel32/file/delete.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/deviceio.c (original) +++ trunk/reactos/dll/win32/kernel32/file/deviceio.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c Sun Sep 2 23:42:22 2007 @@ -18,7 +18,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> UNICODE_STRING DllDirectory = {0, 0, NULL}; Modified: trunk/reactos/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/do… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dosdev.c (original) +++ trunk/reactos/dll/win32/kernel32/file/dosdev.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* TYPES ********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/hardlink.c (original) +++ trunk/reactos/dll/win32/kernel32/file/hardlink.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/io… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/iocompl.c (original) +++ trunk/reactos/dll/win32/kernel32/file/iocompl.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lf… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lfile.c (original) +++ trunk/reactos/dll/win32/kernel32/file/lfile.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lock.c (original) +++ trunk/reactos/dll/win32/kernel32/file/lock.c Sun Sep 2 23:42:22 2007 @@ -16,7 +16,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c Sun Sep 2 23:42:22 2007 @@ -19,7 +19,7 @@ #include <malloc.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #define NDEBUG //#define USING_PROPER_NPFS_WAIT_SEMANTICS -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/pi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/pipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/pipe.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/rw.c (original) +++ trunk/reactos/dll/win32/kernel32/file/rw.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/tape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ta… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/tape.c (original) +++ trunk/reactos/dll/win32/kernel32/file/tape.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c Sun Sep 2 23:42:22 2007 @@ -22,7 +22,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define MAX_DOS_DRIVES 26 Removed: trunk/reactos/dll/win32/kernel32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/debug.h (original) +++ trunk/reactos/dll/win32/kernel32/include/debug.h (removed) @@ -1,25 +1,0 @@ -#ifndef _KERNEL32_INCLUDE_DEBUG_H -#define _KERNEL32_INCLUDE_DEBUG_H - -#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__); - -#ifdef NDEBUG -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif -#define CHECKPOINT -#else -#define DPRINT(...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); } while(0); -#define CHECKPOINT do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); -#endif - -#ifdef ASSERT -#undef ASSERT -#define ASSERT(x) do { if(!x) RtlAssert("#x", __FILE__,__LINE__, ""); } while(0); -#endif -#define DPRINT1(...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(__VA_ARGS__); } while(0); -#define CHECKPOINT1 do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); - -#endif /* ndef _KERNEL32_INCLUDE_DEBUG_H */ Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/hea… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/heap.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/heap.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isb… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/isbad.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/isbad.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> extern SYSTEM_BASIC_INFORMATION BaseCachedSysInfo; Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/pro… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/procmem.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/procmem.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/resnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/res… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/resnotify.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/resnotify.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c Sun Sep 2 23:42:22 2007 @@ -1,7 +1,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define ACTCTX_FLAGS_ALL (\ ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ Modified: trunk/reactos/dll/win32/kernel32/misc/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/at… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/atom.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/atom.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/chartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ch… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/chartype.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/chartype.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/comm.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/comm.c Sun Sep 2 23:42:22 2007 @@ -41,7 +41,7 @@ #include <ntddser.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* BUILDCOMMDCB & BUILDCOMMDCBANDTIMEOUTS */ Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c Sun Sep 2 23:42:22 2007 @@ -29,7 +29,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Sun Sep 2 23:42:22 2007 @@ -17,7 +17,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/er… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/error.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/error.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* Modified: trunk/reactos/dll/win32/kernel32/misc/errormsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/er… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/errormsg.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/errormsg.c Sun Sep 2 23:42:22 2007 @@ -28,7 +28,7 @@ #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #include "wine/unicode.h" #define TRACE DPRINT Modified: trunk/reactos/dll/win32/kernel32/misc/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/handle.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/handle.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Sun Sep 2 23:42:22 2007 @@ -18,7 +18,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FIXME: these are included in winnls.h, however including this file causes alot of conflicting type errors. */ Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> typedef struct tagLOADPARMS32 { LPSTR lpEnvAddress; Modified: trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lz… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c Sun Sep 2 23:42:22 2007 @@ -26,7 +26,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #include "lzexpand.h" #define HFILE_ERROR ((HFILE)-1) Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Sun Sep 2 23:42:22 2007 @@ -16,7 +16,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBAL VARIABLES ***********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/perfcnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pe… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/perfcnt.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/perfcnt.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c Sun Sep 2 23:42:22 2007 @@ -22,7 +22,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> static const char bom_utf8[] = {0xEF,0xBB,0xBF}; Modified: trunk/reactos/dll/win32/kernel32/misc/recovery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/recovery.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/recovery.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/res.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/res.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define STUB \ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Sun Sep 2 23:42:22 2007 @@ -6,7 +6,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define STUB \ Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define PV_NT351 0x00030033 Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* TYPES *********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/timerqueue.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/timerqueue.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/to… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/toolhelp.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/toolhelp.c Sun Sep 2 23:42:22 2007 @@ -21,7 +21,7 @@ #include <tlhelp32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* INTERNAL DEFINITIONS *******************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #endif #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <reactos/buildno.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/cmdline.c (original) +++ trunk/reactos/dll/win32/kernel32/process/cmdline.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/job.c (original) +++ trunk/reactos/dll/win32/kernel32/process/job.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c Sun Sep 2 23:42:22 2007 @@ -14,7 +14,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c Sun Sep 2 23:42:22 2007 @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> #define CMD_STRING L"cmd /c " Modified: trunk/reactos/dll/win32/kernel32/synch/condvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/condvar.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/condvar.c Sun Sep 2 23:42:22 2007 @@ -7,7 +7,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FIXME: Move these RTL declarations to the NDK */ NTSTATUS Modified: trunk/reactos/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/critical.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/critical.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/e… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/event.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/event.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/m… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/mutex.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/mutex.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/sem.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/sem.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/t… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/timer.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/timer.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/synch/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/w… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/wait.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/wait.c Sun Sep 2 23:42:22 2007 @@ -11,7 +11,7 @@ #include <k32.h> #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fiber.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/fiber.c Sun Sep 2 23:42:22 2007 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> typedef struct _FIBER /* Field offsets: */ { /* 32 bit 64 bit */ Modified: trunk/reactos/dll/win32/kernel32/thread/fls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/fls.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/fls.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> -#include "../include/debug.h" +#include <debug.h> /* * @unimplemented Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c Sun Sep 2 23:42:22 2007 @@ -13,7 +13,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FIXME: NDK */ #define HIGH_PRIORITY 31 Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/tls.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/tls.c Sun Sep 2 23:42:22 2007 @@ -15,7 +15,7 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/

1 0

[hpoussin] 28783: Use typedefs_host.h header when building inflib for host
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 23:23:43 2007 New Revision: 28783 URL: http://svn.reactos.org/svn/reactos?rev=28783&view=rev Log: Use typedefs_host.h header when building inflib for host Removed: trunk/reactos/lib/inflib/infhostglue.c Modified: trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/inflib/infhost.h trunk/reactos/lib/inflib/inflib.mak Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… ============================================================================== --- trunk/reactos/lib/inflib/builddep.h (original) +++ trunk/reactos/lib/inflib/builddep.h Sun Sep 2 23:23:43 2007 @@ -8,13 +8,12 @@ /* Definitions native to the host on which we're building */ +#include <typedefs_host.h> + #include <stdarg.h> #include <stdio.h> #include <string.h> #include <errno.h> - -#define FALSE 0 -#define TRUE 1 #define FREE(Area) free(Area) #define MALLOC(Size) malloc(Size) @@ -28,13 +27,6 @@ #define INF_STATUS_BUFFER_OVERFLOW E2BIG #define INF_SUCCESS(x) (0 == (x)) -typedef char CHAR, *PCHAR; -typedef unsigned char UCHAR, *PUCHAR; -typedef void VOID, *PVOID; -typedef UCHAR BOOLEAN, *PBOOLEAN; -#include <typedefs64.h> -typedef LONG *PLONG; - typedef char TCHAR, *PTCHAR, *PTSTR; #define _T(x) x #define _tcsicmp strcasecmp @@ -45,10 +37,8 @@ #define STRFMT "%s" #ifdef _MSC_VER -#define strcasecmp stricmp +#define strcasecmp _stricmp #endif - -extern ULONG DbgPrint(char *Fmt, ...); #else /* ! defined(INFLIB_HOST) */ Modified: trunk/reactos/lib/inflib/infhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhost.h?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infhost.h (original) +++ trunk/reactos/lib/inflib/infhost.h Sun Sep 2 23:23:43 2007 @@ -13,7 +13,7 @@ extern "C" { #endif /* __cplusplus */ -#include <infcommon.h> +#include "infcommon.h" extern int InfHostOpenBufferedFile(PHINF InfHandle, void *Buffer, Removed: trunk/reactos/lib/inflib/infhostglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostglue.c?r… ============================================================================== --- trunk/reactos/lib/inflib/infhostglue.c (original) +++ trunk/reactos/lib/inflib/infhostglue.c (removed) @@ -1,26 +1,0 @@ -/* - * PROJECT: .inf file parser - * LICENSE: GPL - See COPYING in the top level directory - * COPYRIGHT: Copyright 2005 Ge van Geldorp <gvg(a)reactos.org> - */ - -/* INCLUDES *****************************************************************/ - -#include "inflib.h" - -#define NDEBUG -#include <debug.h> - -ULONG -DbgPrint(char *Fmt, ...) -{ - va_list Args; - - va_start(Args, Fmt); - vfprintf(stderr, Fmt, Args); - va_end(Args); - - return 0; -} - -/* EOF */ Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak (original) +++ trunk/reactos/lib/inflib/inflib.mak Sun Sep 2 23:23:43 2007 @@ -24,7 +24,6 @@ infput.c \ infhostgen.c \ infhostget.c \ - infhostglue.c \ infhostput.c \ ) @@ -32,8 +31,8 @@ $(subst $(INFLIB_BASE), $(INFLIB_INT), $(INFLIB_HOST_SOURCES:.c=.o)) INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ - -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST -D_M_IX86 \ - -I$(INFLIB_BASE) -Iinclude/reactos -DDBG + -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ + -Iinclude/reactos $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_AR) @@ -59,10 +58,6 @@ $(ECHO_CC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ -$(INFLIB_INT_)infhostglue.o: $(INFLIB_BASE_)infhostglue.c | $(INFLIB_INT) - $(ECHO_CC) - ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ - $(INFLIB_INT_)infhostput.o: $(INFLIB_BASE_)infhostput.c | $(INFLIB_INT) $(ECHO_CC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@

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