Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 26117: Fix bugs #2049 and #2084 (thanks to Peter Krawies)
by dgorbachev＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: dgorbachev Date: Fri Mar 16 19:54:34 2007 New Revision: 26117 URL: http://svn.reactos.org/svn/reactos?rev=26117&view=rev Log: Fix bugs #2049 and #2084 (thanks to Peter Krawies) Modified: trunk/reactos/boot/freeldr/freeldr/include/video.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/boot/freeldr/freeldr/include/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/video.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/video.h Fri Mar 16 19:54:34 2007 @@ -29,7 +29,7 @@ extern PVOID VideoOffScreenBuffer; -USHORT BiosIsVesaSupported(VOID); // Implemented in i386vid.S, returns the VESA version +USHORT BiosIsVesaSupported(VOID); // Implemented in i386vid.c, returns the VESA version PVOID VideoAllocateOffScreenBuffer(VOID); // Returns a pointer to an off-screen buffer sufficient for the current video mode Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Mar 16 19:54:34 2007 @@ -3716,7 +3716,7 @@ if(SectionOffset != NULL) { ProbeForWriteLargeInteger(SectionOffset); - SafeSectionOffset = *SectionOffset; + SafeSectionOffset.QuadPart = PAGE_ROUND_DOWN(SectionOffset->QuadPart); } ProbeForWriteSize_t(ViewSize); SafeViewSize = *ViewSize; @@ -3735,7 +3735,8 @@ else { SafeBaseAddress = (BaseAddress != NULL ? *BaseAddress : NULL); - SafeSectionOffset.QuadPart = (SectionOffset != NULL ? SectionOffset->QuadPart : 0); + SafeSectionOffset.QuadPart = + (SectionOffset != NULL ? PAGE_ROUND_DOWN(SectionOffset->QuadPart) : 0); SafeViewSize = (ViewSize != NULL ? *ViewSize : 0); }

1 0

[dgorbachev] 26116: Fix a bug (#2054, translation by Heis Spiter)
by dgorbachev＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: dgorbachev Date: Fri Mar 16 19:53:01 2007 New Revision: 26116 URL: http://svn.reactos.org/svn/reactos?rev=26116&view=rev Log: Fix a bug (#2054, translation by Heis Spiter) Modified: trunk/reactos/base/applications/calc/lang/cz-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/hu-HU.rc trunk/reactos/base/applications/calc/lang/id-ID.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/nb-NO.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/pt-PT.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/resource.h trunk/reactos/base/applications/calc/winecalc.c Modified: trunk/reactos/base/applications/calc/lang/cz-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cz-CZ.rc (original) +++ trunk/reactos/base/applications/calc/lang/cz-CZ.rc Fri Mar 16 19:53:01 2007 @@ -45,6 +45,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Neplatný vstup pro funkci." IDS_ERR_DIVIDE_BY_ZERO, "Nelze dìlit nulou." IDS_ERR_UNDEFINED, "Výsledek funkce není definován." Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Ungültige Eingabe für Funktion." IDS_ERR_DIVIDE_BY_ZERO, "Teilen durch 0 unmöglich." IDS_ERR_UNDEFINED, "Das Ergebnis der Funktion ist undefiniert." Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "ËáíèáóìÝíï üñéóìá ãéá ôç óõíÜñôçóç." IDS_ERR_DIVIDE_BY_ZERO, "Äå ìðïñåß íá ãßíåé äéáßñåóç ôïõ ìçäåíüò." IDS_ERR_UNDEFINED, "Ôï áðïôÝëåóìá ôçò óõíÜñôçóçò åßíáé áäéåõêñßíéóôï." Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Invalid input for function." IDS_ERR_DIVIDE_BY_ZERO, "Cannot divide by zero." IDS_ERR_UNDEFINED, "Result of function is undefined." Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Entrada no válida para la función." IDS_ERR_DIVIDE_BY_ZERO, "No se puede dividir entre cero." IDS_ERR_UNDEFINED, "El resultado de esta función no está definido." Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc Fri Mar 16 19:53:01 2007 @@ -19,6 +19,7 @@ */ /* * Translation made by Jerome Signouret, 2005. + * Updated by Pierre Schweitzer, 2007. */ #include "windows.h" #include "resource.h" @@ -30,7 +31,7 @@ { IDS_APPNAME, "Calculatrice" - IDS_COPYRIGHT1, "Calculator 5.0. Licensed under LGPL 2" + IDS_COPYRIGHT1, "Calculatrice 5.0. Licensed under LGPL 2" IDS_COPYRIGHT2 "Copyright 2003, James Briggs" IDS_COPYRIGHT3 "San Jose, California, USA" IDS_COPYRIGHT4 "james(a)ActionMessage.com" @@ -45,6 +46,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrés" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grades" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Déc" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Entrée incorrecte pour l'opération." IDS_ERR_DIVIDE_BY_ZERO, "Division par zéro impossble." IDS_ERR_UNDEFINED, "Résultat non défini." @@ -52,7 +60,7 @@ MAIN_MENU MENU DISCARDABLE { - POPUP "&Edition" { + POPUP "&Édition" { MENUITEM "Co&pier Ctrl+C", IDM_COPY MENUITEM "C&oller Ctrl+V", IDM_PASTE } @@ -71,7 +79,7 @@ SCIMS_MENU MENU DISCARDABLE { - POPUP "&Edition" { + POPUP "&Édition" { MENUITEM "Co&pier Ctrl+C", IDM_COPY MENUITEM "C&oller Ctrl+V", IDM_PASTE } @@ -79,50 +87,50 @@ MENUITEM "Standard", IDM_MODE_STANDARD MENUITEM "Scientifique", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binaire\tF8", ID_CALC_NS_BIN + MENUITEM "Hexadécimal\tF5", ID_CALC_NS_HEX + MENUITEM "Décimal\tF6", ID_CALC_NS_DEC + MENUITEM "Octal\tF7", ID_CALC_NS_OCT + MENUITEM "Binaire\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR MENUITEM "Degrés\tF2", ID_CALC_MS_DEGREES MENUITEM "Radians\tF3", ID_CALC_MS_RADIANS - MENUITEM "Gradians\tF4", ID_CALC_MS_GRADS + MENUITEM "Grades\tF4", ID_CALC_MS_GRADS MENUITEM SEPARATOR MENUITEM "Séparateur", IDM_DIGIT_GROUPING } POPUP "Ai&de" { MENUITEM "Sommaire", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "A propos", IDM_ABOUT + MENUITEM "À propos", IDM_ABOUT } } SCIWS_MENU MENU DISCARDABLE { - POPUP "&Edit" { + POPUP "&Édition" { MENUITEM "Co&pier Ctrl+C", IDM_COPY MENUITEM "C&oller Ctrl+V", IDM_PASTE } - POPUP "&View" { + POPUP "&Affichage" { MENUITEM "Standard", IDM_MODE_STANDARD MENUITEM "Scientifique", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binaire\tF8", ID_CALC_NS_BIN + MENUITEM "Hexadécimal\tF5", ID_CALC_NS_HEX + MENUITEM "Décimal\tF6", ID_CALC_NS_DEC + MENUITEM "Octal\tF7", ID_CALC_NS_OCT + MENUITEM "Binaire\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR - MENUITEM "Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dword\tF2", ID_CALC_WS_DWORD - MENUITEM "Word\tF3", ID_CALC_WS_WORD - MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE MENUITEM SEPARATOR MENUITEM "Séparateur", IDM_DIGIT_GROUPING } POPUP "Ai&de" { MENUITEM "Sommaire", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "A propos", IDM_ABOUT + MENUITEM "À propos", IDM_ABOUT } } @@ -131,19 +139,19 @@ VK_F1, IDV_HELP, VIRTKEY END +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "À propos de GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + WHATS_THIS_MENU MENU DISCARDABLE { POPUP "" { MENUITEM "Qu'est-ce ?", IDM_WHATS_THIS } } - -DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "A propos de GNU winecalc" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END DLG_STATS DIALOG 12,0,125,78 CAPTION "Outils Statistiques Box" Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/calc/lang/hu-HU.rc Fri Mar 16 19:53:01 2007 @@ -44,6 +44,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "gyök" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Hibás bemenet." IDS_ERR_DIVIDE_BY_ZERO, "Nem tudok nullával osztani." IDS_ERR_UNDEFINED, "Result of function is undefined." Modified: trunk/reactos/base/applications/calc/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/calc/lang/id-ID.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Input untuk fungsi tidak benar." IDS_ERR_DIVIDE_BY_ZERO, "Tidak bisa membagi dengan nol." IDS_ERR_UNDEFINED, "Hasil fungsi tidak terdefinisikan." Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Input invalido per la funzione." IDS_ERR_DIVIDE_BY_ZERO, "Non si può dividere per zero." IDS_ERR_UNDEFINED, "Il risultato della funzione è indefinito." Modified: trunk/reactos/base/applications/calc/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/calc/lang/nb-NO.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Ugyldig informasjon for funksjon." IDS_ERR_DIVIDE_BY_ZERO, "Kan ikke dividere på null." IDS_ERR_UNDEFINED, "Resultatet av funksjoner er ubestemt." Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Ongeldige invoer voor de functie." IDS_ERR_DIVIDE_BY_ZERO, "Kan niet delen door nul." IDS_ERR_UNDEFINED, "Resultaat van de functie is onbepaald." Modified: trunk/reactos/base/applications/calc/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/calc/lang/pt-PT.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Invalid input for function." IDS_ERR_DIVIDE_BY_ZERO, "Cannot divide by zero." IDS_ERR_UNDEFINED, "Result of function is undefined." Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc Fri Mar 16 19:53:01 2007 @@ -19,6 +19,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Ãðàäóñû" + IDS_BTN_RADIANS, "Ðàäèàíû" + IDS_BTN_GRADS, "Ãðàäû" + IDS_BTN_SHRT_HEX "Øåñòí." + IDS_BTN_SHRT_DEC "Äåñÿò." + IDS_BTN_SHRT_OCT "Âîñüì." + IDS_BTN_SHRT_BIN "Äâîè÷." IDS_ERR_INVALID_INPUT, "Íåïðàâèëüíûé àðãóìåíò ôóíêöèè." IDS_ERR_DIVIDE_BY_ZERO, "Äåëèòü íà íóëü íåëüçÿ." IDS_ERR_UNDEFINED, "Ðåçóëüòàò íå îïðåäåë¸í." Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Felaktig indata för funktion." IDS_ERR_DIVIDE_BY_ZERO, "Kan inte dividera med noll." IDS_ERR_UNDEFINED, "Funktionens resultat är odefinerat." Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "ÃÒ¡·ÕèÊÍ§" + IDS_BTN_DEGREES, "Í§ÈÒ" + IDS_BTN_RADIANS, "àÃà´ÕÂ¹" + IDS_BTN_GRADS, "à¡Ãà´ÕÂ¹" + IDS_BTN_SHRT_HEX "°Ò¹ÊÔºË¡" + IDS_BTN_SHRT_DEC "°Ò¹ÊÔº" + IDS_BTN_SHRT_OCT "°Ò¹á»´" + IDS_BTN_SHRT_BIN "°Ò¹ÊÍ§" IDS_ERR_INVALID_INPUT, "¤èÒ·Õè»éÍ¹ãËéäÁèÊÒÁÒÃ¶ãªéã¹¡Ã³Õ¹Õéä´é" IDS_ERR_DIVIDE_BY_ZERO, "äÁèÊÒÁÒÃ¶ËÒÃ´éÇÂÈÙ¹Âì" IDS_ERR_UNDEFINED, "äÁèÊÒÁÒÃ¶áÊ´§¼Åä´é" @@ -63,7 +70,7 @@ POPUP "&ªèÇÂàËÅ×Í" { MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT + MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT } } @@ -77,21 +84,21 @@ MENUITEM "áººÁÒµÃ°Ò¹", IDM_MODE_STANDARD MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "°Ò¹ÊÔºË¡\tF5", ID_CALC_NS_HEX + MENUITEM "°Ò¹ÊÔºË¡\tF5", ID_CALC_NS_HEX MENUITEM "°Ò¹ÊÔº\tF6", ID_CALC_NS_DEC MENUITEM "°Ò¹á»´\tF7", ID_CALC_NS_OCT MENUITEM "°Ò¹ÊÍ§\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR MENUITEM "Í§ÈÒ\tF2", ID_CALC_MS_DEGREES MENUITEM "àÃà´ÕÂ¹\tF3", ID_CALC_MS_RADIANS - MENUITEM "à¡Ãà´ÕÂ¹\tF4", ID_CALC_MS_GRADS + MENUITEM "à¡Ãà´ÕÂ¹\tF4", ID_CALC_MS_GRADS MENUITEM SEPARATOR MENUITEM "áÊ´§ËÅÑ¡µÑÇàÅ¢", IDM_DIGIT_GROUPING } POPUP "ªèÇÂàËÅ×Í" { MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT + MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT } } @@ -105,7 +112,7 @@ MENUITEM "áººÁÒµÃ°Ò¹", IDM_MODE_STANDARD MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "°Ò¹ÊÔºË¡\tF5", ID_CALC_NS_HEX + MENUITEM "°Ò¹ÊÔºË¡\tF5", ID_CALC_NS_HEX MENUITEM "°Ò¹ÊÔº\tF6", ID_CALC_NS_DEC MENUITEM "°Ò¹á»´\tF7", ID_CALC_NS_OCT MENUITEM "°Ò¹ÊÍ§\tF8", ID_CALC_NS_BIN @@ -120,7 +127,7 @@ POPUP "ªèÇÂàËÅ×Í" { MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT + MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT } } Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc Fri Mar 16 19:53:01 2007 @@ -43,6 +43,13 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Íåïðàâèëüíèé àðãóìåíò ôóíêö³¿." IDS_ERR_DIVIDE_BY_ZERO, "Ä³ëèòè íà íóëü íå ìîæíà." IDS_ERR_UNDEFINED, "Ðåçóëüòàò ôóíêö³¿ íåâèçíà÷åíèé." Modified: trunk/reactos/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.h (original) +++ trunk/reactos/base/applications/calc/resource.h Fri Mar 16 19:53:01 2007 @@ -47,6 +47,14 @@ #define IDS_BTN_MEM_PLUS 1107 #define IDS_BTN_MEM_STATUS_M 1108 #define IDS_BTN_SQRT 1109 +#define IDS_BTN_DEGREES 1110 +#define IDS_BTN_RADIANS 1111 +#define IDS_BTN_GRADS 1112 +#define IDS_BTN_SHRT_HEX 1113 +#define IDS_BTN_SHRT_DEC 1114 +#define IDS_BTN_SHRT_OCT 1115 +#define IDS_BTN_SHRT_BIN 1116 + #define IDS_ERR_INVALID_INPUT 1120 #define IDS_ERR_DIVIDE_BY_ZERO 1121 Modified: trunk/reactos/base/applications/calc/winecalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winecalc.c (original) +++ trunk/reactos/base/applications/calc/winecalc.c Fri Mar 16 19:53:01 2007 @@ -2293,7 +2293,7 @@ // Buttons calc->cb[60].id = ID_CALC_NS_HEX; - _tcscpy(calc->cb[60].label,TEXT("Hex")); + LoadString( hInst, IDS_BTN_SHRT_HEX, calc->cb[60].label, sizeof(calc->cb[60].label) / sizeof(calc->cb[60].label[0])); calc->cb[60].color = CALC_COLOR_GRAY; calc->cb[60].r.left = CALC_NS_HEX_LEFT; calc->cb[60].r.top = CALC_NS_HEX_TOP; @@ -2302,7 +2302,7 @@ calc->cb[60].enable = 1; calc->cb[61].id = ID_CALC_NS_DEC; - _tcscpy(calc->cb[61].label,TEXT("Dec")); + LoadString( hInst, IDS_BTN_SHRT_DEC, calc->cb[61].label, sizeof(calc->cb[61].label) / sizeof(calc->cb[61].label[0])); calc->cb[61].color = CALC_COLOR_GRAY; calc->cb[61].r.left = CALC_NS_DEC_LEFT; calc->cb[61].r.top = CALC_NS_DEC_TOP; @@ -2311,7 +2311,7 @@ calc->cb[61].enable = 1; calc->cb[62].id = ID_CALC_NS_OCT; - _tcscpy(calc->cb[62].label,TEXT("Oct")); + LoadString( hInst, IDS_BTN_SHRT_OCT, calc->cb[62].label, sizeof(calc->cb[62].label) / sizeof(calc->cb[62].label[0])); calc->cb[62].color = CALC_COLOR_GRAY; calc->cb[62].r.left = CALC_NS_OCT_LEFT; calc->cb[62].r.top = CALC_NS_OCT_TOP; @@ -2320,7 +2320,7 @@ calc->cb[62].enable = 1; calc->cb[63].id = ID_CALC_NS_BIN; - _tcscpy(calc->cb[63].label,TEXT("Bin")); + LoadString( hInst, IDS_BTN_SHRT_BIN, calc->cb[63].label, sizeof(calc->cb[63].label) / sizeof(calc->cb[63].label[0])); calc->cb[63].color = CALC_COLOR_GRAY; calc->cb[63].r.left = CALC_NS_BIN_LEFT; calc->cb[63].r.top = CALC_NS_BIN_TOP; @@ -2329,7 +2329,7 @@ calc->cb[63].enable = 1; calc->cb[64].id = ID_CALC_MS_DEGREES; - _tcscpy(calc->cb[64].label,TEXT("Degrees")); + LoadString( hInst, IDS_BTN_DEGREES, calc->cb[64].label, sizeof(calc->cb[64].label) / sizeof(calc->cb[64].label[0])); calc->cb[64].color = CALC_COLOR_GRAY; calc->cb[64].r.left = CALC_MS_DEGREES_LEFT; calc->cb[64].r.top = CALC_MS_DEGREES_TOP; @@ -2338,7 +2338,7 @@ calc->cb[64].enable = 1; calc->cb[65].id = ID_CALC_MS_RADIANS; - _tcscpy(calc->cb[65].label,TEXT("Radians")); + LoadString( hInst, IDS_BTN_RADIANS, calc->cb[65].label, sizeof(calc->cb[65].label) / sizeof(calc->cb[65].label[0])); calc->cb[65].color = CALC_COLOR_GRAY; calc->cb[65].r.left = CALC_MS_RADIANS_LEFT; calc->cb[65].r.top = CALC_MS_RADIANS_TOP; @@ -2347,7 +2347,7 @@ calc->cb[65].enable = 1; calc->cb[66].id = ID_CALC_MS_GRADS; - _tcscpy(calc->cb[66].label,TEXT("Grads")); + LoadString( hInst, IDS_BTN_GRADS, calc->cb[66].label, sizeof(calc->cb[66].label) / sizeof(calc->cb[66].label[0])); calc->cb[66].color = CALC_COLOR_GRAY; calc->cb[66].r.left = CALC_MS_GRADS_LEFT; calc->cb[66].r.top = CALC_MS_GRADS_TOP;

1 0

[dgorbachev] 26115: Commit a patch (attachment #1135)
by dgorbachev＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: dgorbachev Date: Fri Mar 16 19:52:36 2007 New Revision: 26115 URL: http://svn.reactos.org/svn/reactos?rev=26115&view=rev Log: Commit a patch (attachment #1135) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Fri Mar 16 19:52:36 2007 @@ -965,12 +965,13 @@ ListHead = &MessageQueue->SentMessagesListHead; while (CurrentEntry != ListHead) { - CurrentEntry = RemoveHeadList(&MessageQueue->SentMessagesListHead); SentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); if(SentMessage->Msg.hwnd == Window->hSelf) { DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); + + RemoveEntryList(&SentMessage->ListEntry); /* remove the message from the dispatching list */ if(SentMessage->DispatchingListEntry.Flink != NULL)

1 0

[greatlrd] 26114: start fixing NtGdiDdCreateSurface, This code are not complete and does not work for NtGdiDdCreateSurface yet. But I do not whant start 10 time write it again.
by greatlrd＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: greatlrd Date: Fri Mar 16 18:28:48 2007 New Revision: 26114 URL: http://svn.reactos.org/svn/reactos?rev=26114&view=rev Log: start fixing NtGdiDdCreateSurface, This code are not complete and does not work for NtGdiDdCreateSurface yet. But I do not whant start 10 time write it again. Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Fri Mar 16 18:28:48 2007 @@ -13,19 +13,31 @@ typedef struct { - HANDLE hDirectDrawLocal; + /* for the driver */ + DDRAWI_DDRAWSURFACE_LCL lcl; + + DDRAWI_DDRAWSURFACE_GBL gpl; + DDRAWI_DDRAWSURFACE_MORE more; + + /* DD_CREATESURFACEDATA CreateSurfaceData */ + DD_CREATESURFACEDATA CreateSurfaceData; + + /* for win32k stuff */ DD_SURFACE_LOCAL Local; DD_SURFACE_MORE More; DD_SURFACE_GLOBAL Global; + DDSURFACEDESC desc; + DD_ATTACHLIST AttachList; DD_ATTACHLIST AttachListFrom; BOOL bComplete; + + HANDLE hDirectDrawLocal; + } DD_SURFACE, *PDD_SURFACE; typedef struct { - DD_SURFACE Surface; - DD_DIRECTDRAW_LOCAL Local; DD_DIRECTDRAW_GLOBAL Global; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Fri Mar 16 18:28:48 2007 @@ -40,48 +40,165 @@ HANDLE *puhSurface ) { - DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + NTSTATUS Status = FALSE; PDD_DIRECTDRAW pDirectDraw; - PDD_DIRECTDRAW_GLOBAL lgpl; - - DPRINT1("NtGdiDdCreateSurface\n"); - - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - - if (pDirectDraw != NULL) - { - - /* - FIXME Get the darn surface handle and and put all - surface struct to it - - FIXME rewrite the darn code complete - - FIXME fill the puCreateSurfaceData correct - - FIXME loading back info from it right - */ - - if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) - { - /* backup the orignal PDev and info */ - lgpl = puCreateSurfaceData->lpDD; - - /* use our cache version instead */ - puCreateSurfaceData->lpDD = &pDirectDraw->Global; - - /* make the call */ - ddRVal = pDirectDraw->DD.CreateSurface(puCreateSurfaceData); - - /* But back the orignal PDev */ - puCreateSurfaceData->lpDD = lgpl; - - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - } - - return ddRVal; + HANDLE hsurface; + PDD_SURFACE phsurface; + + DPRINT1("NtGdiDdCreateSurface\n"); + + /* Create a surface */ + hsurface = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DD_SURFACE); + if (!hsurface) + { + return ddRVal; + } + + phsurface = GDIOBJ_LockObj(DdHandleTable, hsurface, GDI_OBJECT_TYPE_DD_SURFACE); + if (!phsurface) + { + return ddRVal; + } + + DPRINT1("Copy puCreateSurfaceData to kmode CreateSurfaceData\n"); + _SEH_TRY + { + ProbeForRead(puCreateSurfaceData, sizeof(DD_CREATESURFACEDATA), 1); + RtlCopyMemory( &phsurface->CreateSurfaceData, puCreateSurfaceData, + sizeof( DD_CREATESURFACEDATA ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + SetLastNtError(Status); + return ddRVal; + } + + DPRINT1("Copy puSurfaceGlobalData to kmode phsurface->Global\n"); + _SEH_TRY + { + ProbeForRead(puSurfaceGlobalData, sizeof(DD_SURFACE_GLOBAL), 1); + RtlCopyMemory( &phsurface->Global, puSurfaceGlobalData, + sizeof( DD_SURFACE_GLOBAL ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + SetLastNtError(Status); + return ddRVal; + } + + DPRINT1("Copy puSurfaceMoreData to kmode phsurface->More\n"); + _SEH_TRY + { + ProbeForRead(puSurfaceMoreData, sizeof(DD_SURFACE_MORE), 1); + RtlCopyMemory( &phsurface->More, puSurfaceMoreData, + sizeof( DD_SURFACE_MORE ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + SetLastNtError(Status); + return ddRVal; + } + + DPRINT1("Copy puSurfaceLocalData to kmode phsurface->Local\n"); + _SEH_TRY + { + ProbeForRead(puSurfaceLocalData, sizeof(DD_SURFACE_LOCAL), 1); + RtlCopyMemory( &phsurface->Local, puSurfaceLocalData, + sizeof( DD_SURFACE_LOCAL ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + SetLastNtError(Status); + return ddRVal; + } + + DPRINT1("Copy puSurfaceDescription to kmode phsurface->desc\n"); + _SEH_TRY + { + ProbeForRead(puSurfaceDescription, sizeof(DDSURFACEDESC), 1); + RtlCopyMemory( &phsurface->desc, puSurfaceDescription, + sizeof( DDSURFACEDESC ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + SetLastNtError(Status); + return ddRVal; + } + + phsurface->hDirectDrawLocal = hDirectDrawLocal; + + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (!phsurface) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + return ddRVal; + } + + + /* FIXME unlock phsurface free phsurface at fail*/ + /* FIXME unlock hsurface free phsurface at fail*/ + /* FIXME add support for more that one surface create */ + + /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ + phsurface->lcl.lpGbl = &phsurface->gpl; + phsurface->lcl.lpSurfMore = &phsurface->more; + + /* FIXME all phsurface->lcl should be in a array then add to lplpSList */ + phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *)&phsurface->lcl; + phsurface->CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; + phsurface->CreateSurfaceData.CreateSurface = NULL; + phsurface->CreateSurfaceData.dwSCnt = 1; + phsurface->CreateSurfaceData.ddRVal = DDERR_GENERIC; + phsurface->CreateSurfaceData.lpDD = &pDirectDraw->Global; + + /* FIXME copy data from DD_ sturct to DDRAWI_ struct */ + + + if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) + { + ddRVal = pDirectDraw->DD.CreateSurface(&phsurface->CreateSurfaceData); + } + + /* FIXME copy data from DDRAWI_ sturct to DD_ struct */ + + /* FIXME fillin the return handler */ + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + + + return ddRVal; } /************************************************************************/

1 0

[fireball] 26113: - Fix a few simple errors in ks/portcls.h - Exclude it from the build process since important header files are missing (Hint to Andrew: commit stdunk.h & co)
by fireball＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: fireball Date: Fri Mar 16 15:49:47 2007 New Revision: 26113 URL: http://svn.reactos.org/svn/reactos?rev=26113&view=rev Log: - Fix a few simple errors in ks/portcls.h - Exclude it from the build process since important header files are missing (Hint to Andrew: commit stdunk.h & co) Modified: trunk/reactos/drivers/multimedia/directory.rbuild trunk/reactos/drivers/multimedia/portcls/portcls.rbuild trunk/reactos/include/ddk/ks.h trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild Fri Mar 16 15:49:47 2007 @@ -16,9 +16,9 @@ <xi:include href="drmk/drmk.rbuild" /> </directory> -<directory name="portcls"> +  -<directory name="mpu401_ks"> + <directory name="sb16_nt4"> <xi:include href="sb16_nt4/sb16_nt4.rbuild" /> Modified: trunk/reactos/drivers/multimedia/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/multimedia/portcls/portcls.rbuild Fri Mar 16 15:49:47 2007 @@ -15,7 +15,7 @@ <file>stubs.c</file>  - <file>../stdunk/stdunk.c</file> +  <file>helper/ResourceList.c</file> Modified: trunk/reactos/include/ddk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ks.h?rev=26113… ============================================================================== --- trunk/reactos/include/ddk/ks.h (original) +++ trunk/reactos/include/ddk/ks.h Fri Mar 16 15:49:47 2007 @@ -1905,7 +1905,7 @@ KSDDKAPI NTSTATUS NTAPI KsAllocateDeviceHeader( - OUT PVOID Header, + OUT KSDEVICE_HEADER* Header, IN ULONG ItemsCount, IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL); Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (original) +++ trunk/reactos/include/ddk/portcls.h Fri Mar 16 15:49:47 2007 @@ -135,7 +135,7 @@ /* HACK */ typedef PVOID CM_RESOURCE_TYPE; - +#define PORT_CLASS_DEVICE_EXTENSION_SIZE (64 * sizeof(ULONG_PTR)) /* =============================================================== Class IDs - TODO

1 0

[fireball] 26112: Put ntdll dependency back.
by fireball＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: fireball Date: Fri Mar 16 14:45:52 2007 New Revision: 26112 URL: http://svn.reactos.org/svn/reactos?rev=26112&view=rev Log: Put ntdll dependency back. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Fri Mar 16 14:45:52 2007 @@ -23,6 +23,7 @@ <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> <library>crt</library> + <library>ntdll</library> <library>kernel32</library> <library>wine</library> <pch>precomp.h</pch>

1 0

[greatlrd] 26111: fixing smaller bugs in NtGdiDdQueryDirectDrawObject, like some return value are right
by greatlrd＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: greatlrd Date: Fri Mar 16 12:01:40 2007 New Revision: 26111 URL: http://svn.reactos.org/svn/reactos?rev=26111&view=rev Log: fixing smaller bugs in NtGdiDdQueryDirectDrawObject, like some return value are right Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Fri Mar 16 12:01:40 2007 @@ -300,7 +300,7 @@ DPRINT1("NtGdiDdQueryDirectDrawObject\n"); if (hDirectDrawLocal == NULL) { - return Ret; + return FALSE; } pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, @@ -308,7 +308,7 @@ if (!pDirectDraw) { - return Ret; + return FALSE; } /* @@ -332,14 +332,14 @@ DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } else { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } @@ -366,14 +366,14 @@ DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } else { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } /* @@ -400,7 +400,7 @@ DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } } @@ -408,7 +408,7 @@ { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } /* @@ -451,7 +451,7 @@ DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } } @@ -459,7 +459,7 @@ { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } /* @@ -487,7 +487,7 @@ DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } } @@ -495,10 +495,8 @@ { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; - } - - DPRINT1("next\n"); + return FALSE; + } _SEH_TRY {

1 0

[arty] 26110: Stragglers plus warning fixen.
by arty＠svn.reactos.org 16 Mar '07

16 Mar '07

Author: arty Date: Fri Mar 16 10:16:45 2007 New Revision: 26110 URL: http://svn.reactos.org/svn/reactos?rev=26110&view=rev Log: Stragglers plus warning fixen. Added: branches/powerpc/reactos/boot/freeldr/freeldr/rtl/libsupp.c branches/powerpc/reactos/hal/halppc/generic/font.c Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild branches/powerpc/reactos/include/psdk/intrin.h branches/powerpc/reactos/include/psdk/winnt.h branches/powerpc/reactos/lib/rtl/exception.c branches/powerpc/reactos/lib/string/sscanf.c Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ReactOS-ppc.rbu… ============================================================================== --- branches/powerpc/reactos/ReactOS-ppc.rbuild (original) +++ branches/powerpc/reactos/ReactOS-ppc.rbuild Fri Mar 16 10:16:45 2007 @@ -28,7 +28,6 @@ <define name="MB_CUR_MAX">1</define> <compilerflag>-fshort-wchar</compilerflag> <compilerflag>-fsigned-char</compilerflag> - <compilerflag>-map</compilerflag> <compilerflag>-mfull-toc</compilerflag> <compilerflag>-meabi</compilerflag> <compilerflag>-O2</compilerflag> Added: branches/powerpc/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/rtl/libsupp.c (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/rtl/libsupp.c Fri Mar 16 10:16:45 2007 @@ -1,0 +1,46 @@ +/* + * FreeLoader + * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <freeldr.h> + +#ifdef DBG +VOID FASTCALL +CHECK_PAGED_CODE_RTL(char *file, int line) +{ + // boot-code is always ok +} +#endif + +PVOID +STDCALL +RtlpAllocateMemory(ULONG Bytes, + ULONG Tag) +{ + return MmAllocateMemory(Bytes); +} + + +VOID +STDCALL +RtlpFreeMemory(PVOID Mem, + ULONG Tag) +{ + return MmFreeMemory(Mem); +} Added: branches/powerpc/reactos/hal/halppc/generic/font.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/font.c (added) +++ branches/powerpc/reactos/hal/halppc/generic/font.c Fri Mar 16 10:16:45 2007 @@ -1,0 +1,280 @@ +/* $Id: font.c 21840 2006-05-07 18:56:52Z ion $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Xbox HAL + * FILE: hal/halx86/xbox/font.h + * PURPOSE: Font glyphs + * PROGRAMMER: Ge van Geldorp (gvg(a)reactos.com) + * UPDATE HISTORY: + * Created 2004/12/02 + * + * Note: Converted from the XFree vga.bdf font + */ + +#include <halxbox.h> + +#define NDEBUG +#include <debug.h> + +UCHAR XboxFont8x16[256 * 16] = +{ + 0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,0x00, /* 0x00 */ + 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xa5,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00, /* 0x01 */ + 0x00,0x00,0x7e,0xff,0xdb,0xff,0xff,0xdb,0xe7,0xff,0xff,0x7e,0x00,0x00,0x00,0x00, /* 0x02 */ + 0x00,0x00,0x00,0x00,0x6c,0xfe,0xfe,0xfe,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,0x00, /* 0x03 */ + 0x00,0x00,0x00,0x00,0x10,0x38,0x7c,0xfe,0x7c,0x38,0x10,0x00,0x00,0x00,0x00,0x00, /* 0x04 */ + 0x00,0x00,0x00,0x18,0x3c,0x3c,0xe7,0xe7,0xe7,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x05 */ + 0x00,0x00,0x00,0x18,0x3c,0x7e,0xff,0xff,0x7e,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x06 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x3c,0x3c,0x18,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x07 */ + 0xff,0xff,0xff,0xff,0xff,0xff,0xe7,0xc3,0xc3,0xe7,0xff,0xff,0xff,0xff,0xff,0xff, /* 0x08 */ + 0x00,0x00,0x00,0x00,0x00,0x3c,0x66,0x42,0x42,0x66,0x3c,0x00,0x00,0x00,0x00,0x00, /* 0x09 */ + 0xff,0xff,0xff,0xff,0xff,0xc3,0x99,0xbd,0xbd,0x99,0xc3,0xff,0xff,0xff,0xff,0xff, /* 0x0a */ + 0x00,0x00,0x1e,0x06,0x0e,0x1a,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00, /* 0x0b */ + 0x00,0x00,0x3c,0x66,0x66,0x66,0x66,0x3c,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x0c */ + 0x00,0x00,0x3f,0x33,0x3f,0x30,0x30,0x30,0x30,0x70,0xf0,0xe0,0x00,0x00,0x00,0x00, /* 0x0d */ + 0x00,0x00,0x7f,0x63,0x7f,0x63,0x63,0x63,0x63,0x67,0xe7,0xe6,0xc0,0x00,0x00,0x00, /* 0x0e */ + 0x00,0x00,0x00,0x18,0x18,0xdb,0x3c,0xe7,0x3c,0xdb,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x0f */ + 0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfe,0xf8,0xf0,0xe0,0xc0,0x80,0x00,0x00,0x00,0x00, /* 0x10 */ + 0x00,0x02,0x06,0x0e,0x1e,0x3e,0xfe,0x3e,0x1e,0x0e,0x06,0x02,0x00,0x00,0x00,0x00, /* 0x11 */ + 0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,0x00,0x00, /* 0x12 */ + 0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x66,0x66,0x00,0x00,0x00,0x00, /* 0x13 */ + 0x00,0x00,0x7f,0xdb,0xdb,0xdb,0x7b,0x1b,0x1b,0x1b,0x1b,0x1b,0x00,0x00,0x00,0x00, /* 0x14 */ + 0x00,0x7c,0xc6,0x60,0x38,0x6c,0xc6,0xc6,0x6c,0x38,0x0c,0xc6,0x7c,0x00,0x00,0x00, /* 0x15 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0xfe,0xfe,0x00,0x00,0x00,0x00, /* 0x16 */ + 0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x7e,0x3c,0x18,0x7e,0x00,0x00,0x00,0x00, /* 0x17 */ + 0x00,0x00,0x18,0x3c,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x18 */ + 0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00,0x00,0x00,0x00, /* 0x19 */ + 0x00,0x00,0x00,0x00,0x00,0x18,0x0c,0xfe,0x0c,0x18,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1a */ + 0x00,0x00,0x00,0x00,0x00,0x30,0x60,0xfe,0x60,0x30,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1b */ + 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xfe,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1c */ + 0x00,0x00,0x00,0x00,0x00,0x28,0x6c,0xfe,0x6c,0x28,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x1d */ + 0x00,0x00,0x00,0x00,0x10,0x38,0x38,0x7c,0x7c,0xfe,0xfe,0x00,0x00,0x00,0x00,0x00, /* 0x1e */ + 0x00,0x00,0x00,0x00,0xfe,0xfe,0x7c,0x7c,0x38,0x38,0x10,0x00,0x00,0x00,0x00,0x00, /* 0x1f */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* */ + 0x00,0x00,0x18,0x3c,0x3c,0x3c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00, /* ! */ + 0x00,0x66,0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* " */ + 0x00,0x00,0x00,0x6c,0x6c,0xfe,0x6c,0x6c,0x6c,0xfe,0x6c,0x6c,0x00,0x00,0x00,0x00, /* # */ + 0x18,0x18,0x7c,0xc6,0xc2,0xc0,0x7c,0x06,0x06,0x86,0xc6,0x7c,0x18,0x18,0x00,0x00, /* $ */ + 0x00,0x00,0x00,0x00,0xc2,0xc6,0x0c,0x18,0x30,0x60,0xc6,0x86,0x00,0x00,0x00,0x00, /* % */ + 0x00,0x00,0x38,0x6c,0x6c,0x38,0x76,0xdc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* & */ + 0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ' */ + 0x00,0x00,0x0c,0x18,0x30,0x30,0x30,0x30,0x30,0x30,0x18,0x0c,0x00,0x00,0x00,0x00, /* ( */ + 0x00,0x00,0x30,0x18,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x18,0x30,0x00,0x00,0x00,0x00, /* ) */ + 0x00,0x00,0x00,0x00,0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00,0x00,0x00,0x00,0x00, /* * */ + 0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00, /* + */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00,0x00, /* , */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00, /* . */ + 0x00,0x00,0x00,0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00,0x00,0x00,0x00, /* / */ + 0x00,0x00,0x38,0x6c,0xc6,0xc6,0xd6,0xd6,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,0x00, /* 0 */ + 0x00,0x00,0x18,0x38,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x00,0x00,0x00,0x00, /* 1 */ + 0x00,0x00,0x7c,0xc6,0x06,0x0c,0x18,0x30,0x60,0xc0,0xc6,0xfe,0x00,0x00,0x00,0x00, /* 2 */ + 0x00,0x00,0x7c,0xc6,0x06,0x06,0x3c,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 3 */ + 0x00,0x00,0x0c,0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00, /* 4 */ + 0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xfc,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 5 */ + 0x00,0x00,0x38,0x60,0xc0,0xc0,0xfc,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 6 */ + 0x00,0x00,0xfe,0xc6,0x06,0x06,0x0c,0x18,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00, /* 7 */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 8 */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7e,0x06,0x06,0x06,0x0c,0x78,0x00,0x00,0x00,0x00, /* 9 */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00, /* : */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x30,0x00,0x00,0x00,0x00, /* ; */ + 0x00,0x00,0x00,0x06,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x06,0x00,0x00,0x00,0x00, /* < */ + 0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* = */ + 0x00,0x00,0x00,0x60,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x60,0x00,0x00,0x00,0x00, /* > */ + 0x00,0x00,0x7c,0xc6,0xc6,0x0c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00, /* ? */ + 0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,0x00, /* @ */ + 0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* A */ + 0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x66,0x66,0x66,0x66,0xfc,0x00,0x00,0x00,0x00, /* B */ + 0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x00,0x00,0x00,0x00, /* C */ + 0x00,0x00,0xf8,0x6c,0x66,0x66,0x66,0x66,0x66,0x66,0x6c,0xf8,0x00,0x00,0x00,0x00, /* D */ + 0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00, /* E */ + 0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* F */ + 0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xde,0xc6,0xc6,0x66,0x3a,0x00,0x00,0x00,0x00, /* G */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* H */ + 0x00,0x00,0x3c,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* I */ + 0x00,0x00,0x1e,0x0c,0x0c,0x0c,0x0c,0x0c,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00, /* J */ + 0x00,0x00,0xe6,0x66,0x66,0x6c,0x78,0x78,0x6c,0x66,0x66,0xe6,0x00,0x00,0x00,0x00, /* K */ + 0x00,0x00,0xf0,0x60,0x60,0x60,0x60,0x60,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00, /* L */ + 0x00,0x00,0xc6,0xee,0xfe,0xfe,0xd6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* M */ + 0x00,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* N */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* O */ + 0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* P */ + 0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xd6,0xde,0x7c,0x0c,0x0e,0x00,0x00, /* Q */ + 0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x6c,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00, /* R */ + 0x00,0x00,0x7c,0xc6,0xc6,0x60,0x38,0x0c,0x06,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* S */ + 0x00,0x00,0x7e,0x7e,0x5a,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* T */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* U */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x10,0x00,0x00,0x00,0x00, /* V */ + 0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xd6,0xd6,0xd6,0xfe,0xee,0x6c,0x00,0x00,0x00,0x00, /* W */ + 0x00,0x00,0xc6,0xc6,0x6c,0x7c,0x38,0x38,0x7c,0x6c,0xc6,0xc6,0x00,0x00,0x00,0x00, /* X */ + 0x00,0x00,0x66,0x66,0x66,0x66,0x3c,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* Y */ + 0x00,0x00,0xfe,0xc6,0x86,0x0c,0x18,0x30,0x60,0xc2,0xc6,0xfe,0x00,0x00,0x00,0x00, /* Z */ + 0x00,0x00,0x3c,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3c,0x00,0x00,0x00,0x00, /* [ */ + 0x00,0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x1c,0x0e,0x06,0x02,0x00,0x00,0x00,0x00, /* \ */ + 0x00,0x00,0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3c,0x00,0x00,0x00,0x00, /* ] */ + 0x10,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ^ */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00, /* _ */ + 0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ` */ + 0x00,0x00,0x00,0x00,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* a */ + 0x00,0x00,0xe0,0x60,0x60,0x78,0x6c,0x66,0x66,0x66,0x66,0x7c,0x00,0x00,0x00,0x00, /* b */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc0,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* c */ + 0x00,0x00,0x1c,0x0c,0x0c,0x3c,0x6c,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* d */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* e */ + 0x00,0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* f */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0xcc,0x78,0x00, /* g */ + 0x00,0x00,0xe0,0x60,0x60,0x6c,0x76,0x66,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00, /* h */ + 0x00,0x00,0x18,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* i */ + 0x00,0x00,0x06,0x06,0x00,0x0e,0x06,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3c,0x00, /* j */ + 0x00,0x00,0xe0,0x60,0x60,0x66,0x6c,0x78,0x78,0x6c,0x66,0xe6,0x00,0x00,0x00,0x00, /* k */ + 0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* l */ + 0x00,0x00,0x00,0x00,0x00,0xec,0xfe,0xd6,0xd6,0xd6,0xd6,0xc6,0x00,0x00,0x00,0x00, /* m */ + 0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00, /* n */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* o */ + 0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xf0,0x00, /* p */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x1e,0x00, /* q */ + 0x00,0x00,0x00,0x00,0x00,0xdc,0x76,0x66,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00, /* r */ + 0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0x60,0x38,0x0c,0xc6,0x7c,0x00,0x00,0x00,0x00, /* s */ + 0x00,0x00,0x10,0x30,0x30,0xfc,0x30,0x30,0x30,0x30,0x36,0x1c,0x00,0x00,0x00,0x00, /* t */ + 0x00,0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* u */ + 0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x3c,0x18,0x00,0x00,0x00,0x00, /* v */ + 0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xd6,0xd6,0xd6,0xfe,0x6c,0x00,0x00,0x00,0x00, /* w */ + 0x00,0x00,0x00,0x00,0x00,0xc6,0x6c,0x38,0x38,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00, /* x */ + 0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0xf8,0x00, /* y */ + 0x00,0x00,0x00,0x00,0x00,0xfe,0xcc,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,0x00, /* z */ + 0x00,0x00,0x0e,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x18,0x0e,0x00,0x00,0x00,0x00, /* { */ + 0x00,0x00,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* | */ + 0x00,0x00,0x70,0x18,0x18,0x18,0x0e,0x18,0x18,0x18,0x18,0x70,0x00,0x00,0x00,0x00, /* } */ + 0x00,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ~ */ + 0x00,0x00,0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xfe,0x00,0x00,0x00,0x00,0x00, /* 0x7f */ + 0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x0c,0x06,0x7c,0x00,0x00, /* 0x80 */ + 0x00,0x00,0xcc,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x81 */ + 0x00,0x0c,0x18,0x30,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x82 */ + 0x00,0x10,0x38,0x6c,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x83 */ + 0x00,0x00,0xcc,0x00,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x84 */ + 0x00,0x60,0x30,0x18,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x85 */ + 0x00,0x38,0x6c,0x38,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x86 */ + 0x00,0x00,0x00,0x00,0x3c,0x66,0x60,0x60,0x66,0x3c,0x0c,0x06,0x3c,0x00,0x00,0x00, /* 0x87 */ + 0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x88 */ + 0x00,0x00,0xc6,0x00,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x89 */ + 0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xfe,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x8a */ + 0x00,0x00,0x66,0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x8b */ + 0x00,0x18,0x3c,0x66,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x8c */ + 0x00,0x60,0x30,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0x8d */ + 0x00,0xc6,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0x8e */ + 0x38,0x6c,0x38,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0x8f */ + 0x18,0x30,0x60,0x00,0xfe,0x66,0x60,0x7c,0x60,0x60,0x66,0xfe,0x00,0x00,0x00,0x00, /* 0x90 */ + 0x00,0x00,0x00,0x00,0x00,0xcc,0x76,0x36,0x7e,0xd8,0xd8,0x6e,0x00,0x00,0x00,0x00, /* 0x91 */ + 0x00,0x00,0x3e,0x6c,0xcc,0xcc,0xfe,0xcc,0xcc,0xcc,0xcc,0xce,0x00,0x00,0x00,0x00, /* 0x92 */ + 0x00,0x10,0x38,0x6c,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x93 */ + 0x00,0x00,0xc6,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x94 */ + 0x00,0x60,0x30,0x18,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x95 */ + 0x00,0x30,0x78,0xcc,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x96 */ + 0x00,0x60,0x30,0x18,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0x97 */ + 0x00,0x00,0xc6,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0x78,0x00, /* 0x98 */ + 0x00,0xc6,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x99 */ + 0x00,0xc6,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0x9a */ + 0x00,0x18,0x18,0x3c,0x66,0x60,0x60,0x60,0x66,0x3c,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x9b */ + 0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0x60,0xe6,0xfc,0x00,0x00,0x00,0x00, /* 0x9c */ + 0x00,0x00,0x66,0x66,0x3c,0x18,0x7e,0x18,0x7e,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* 0x9d */ + 0x00,0xf8,0xcc,0xcc,0xf8,0xc4,0xcc,0xde,0xcc,0xcc,0xcc,0xc6,0x00,0x00,0x00,0x00, /* 0x9e */ + 0x00,0x0e,0x1b,0x18,0x18,0x18,0x7e,0x18,0x18,0x18,0x18,0x18,0xd8,0x70,0x00,0x00, /* 0x9f */ + 0x00,0x18,0x30,0x60,0x00,0x78,0x0c,0x7c,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0xa0 */ + 0x00,0x0c,0x18,0x30,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00, /* 0xa1 */ + 0x00,0x18,0x30,0x60,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0xa2 */ + 0x00,0x18,0x30,0x60,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00, /* 0xa3 */ + 0x00,0x00,0x76,0xdc,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00, /* 0xa4 */ + 0x76,0xdc,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0xa5 */ + 0x00,0x3c,0x6c,0x6c,0x3e,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xa6 */ + 0x00,0x38,0x6c,0x6c,0x38,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xa7 */ + 0x00,0x00,0x30,0x30,0x00,0x30,0x30,0x60,0xc0,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00, /* 0xa8 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00,0x00, /* 0xa9 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0x06,0x06,0x06,0x00,0x00,0x00,0x00,0x00, /* 0xaa */ + 0x00,0xc0,0xc0,0xc2,0xc6,0xcc,0x18,0x30,0x60,0xdc,0x86,0x0c,0x18,0x3e,0x00,0x00, /* 0xab */ + 0x00,0xc0,0xc0,0xc2,0xc6,0xcc,0x18,0x30,0x66,0xce,0x9e,0x3e,0x06,0x06,0x00,0x00, /* 0xac */ + 0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x18,0x3c,0x3c,0x3c,0x18,0x00,0x00,0x00,0x00, /* 0xad */ + 0x00,0x00,0x00,0x00,0x00,0x36,0x6c,0xd8,0x6c,0x36,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xae */ + 0x00,0x00,0x00,0x00,0x00,0xd8,0x6c,0x36,0x6c,0xd8,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xaf */ + 0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44,0x11,0x44, /* 0xb0 */ + 0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa, /* 0xb1 */ + 0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77,0xdd,0x77, /* 0xb2 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb3 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb4 */ + 0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb5 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xb6 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xb7 */ + 0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xb8 */ + 0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xb9 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xba */ + 0x00,0x00,0x00,0x00,0x00,0xfe,0x06,0xf6,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xbb */ + 0x36,0x36,0x36,0x36,0x36,0xf6,0x06,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xbc */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xbd */ + 0x18,0x18,0x18,0x18,0x18,0xf8,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xbe */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xbf */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc0 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc1 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc2 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc3 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc4 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc5 */ + 0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xc6 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xc7 */ + 0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xc8 */ + 0x00,0x00,0x00,0x00,0x00,0x3f,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xc9 */ + 0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xca */ + 0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xcb */ + 0x36,0x36,0x36,0x36,0x36,0x37,0x30,0x37,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xcc */ + 0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xcd */ + 0x36,0x36,0x36,0x36,0x36,0xf7,0x00,0xf7,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xce */ + 0x18,0x18,0x18,0x18,0x18,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xcf */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd0 */ + 0x00,0x00,0x00,0x00,0x00,0xff,0x00,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xd1 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xd2 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd3 */ + 0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd4 */ + 0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xd5 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xd6 */ + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0xff,0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, /* 0xd7 */ + 0x18,0x18,0x18,0x18,0x18,0xff,0x18,0xff,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xd8 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xd9 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xda */ + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 0xdb */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, /* 0xdc */ + 0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0, /* 0xdd */ + 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f, /* 0xde */ + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xdf */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xdc,0xd8,0xd8,0xd8,0xdc,0x76,0x00,0x00,0x00,0x00, /* 0xe0 */ + 0x00,0x00,0x78,0xcc,0xcc,0xcc,0xd8,0xcc,0xc6,0xc6,0xc6,0xcc,0x00,0x00,0x00,0x00, /* 0xe1 */ + 0x00,0x00,0xfe,0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,0x00, /* 0xe2 */ + 0x00,0x00,0x00,0x00,0xfe,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00, /* 0xe3 */ + 0x00,0x00,0x00,0xfe,0xc6,0x60,0x30,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,0x00, /* 0xe4 */ + 0x00,0x00,0x00,0x00,0x00,0x7e,0xd8,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x00,0x00,0x00, /* 0xe5 */ + 0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xc0,0x00,0x00,0x00, /* 0xe6 */ + 0x00,0x00,0x00,0x00,0x76,0xdc,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00, /* 0xe7 */ + 0x00,0x00,0x00,0x7e,0x18,0x3c,0x66,0x66,0x66,0x3c,0x18,0x7e,0x00,0x00,0x00,0x00, /* 0xe8 */ + 0x00,0x00,0x00,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0x6c,0x38,0x00,0x00,0x00,0x00, /* 0xe9 */ + 0x00,0x00,0x38,0x6c,0xc6,0xc6,0xc6,0x6c,0x6c,0x6c,0x6c,0xee,0x00,0x00,0x00,0x00, /* 0xea */ + 0x00,0x00,0x1e,0x30,0x18,0x0c,0x3e,0x66,0x66,0x66,0x66,0x3c,0x00,0x00,0x00,0x00, /* 0xeb */ + 0x00,0x00,0x00,0x00,0x00,0x7e,0xdb,0xdb,0xdb,0x7e,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xec */ + 0x00,0x00,0x00,0x03,0x06,0x7e,0xdb,0xdb,0xf3,0x7e,0x60,0xc0,0x00,0x00,0x00,0x00, /* 0xed */ + 0x00,0x00,0x1c,0x30,0x60,0x60,0x7c,0x60,0x60,0x60,0x30,0x1c,0x00,0x00,0x00,0x00, /* 0xee */ + 0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00, /* 0xef */ + 0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00, /* 0xf0 */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0xff,0x00,0x00,0x00,0x00, /* 0xf1 */ + 0x00,0x00,0x00,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x00,0x7e,0x00,0x00,0x00,0x00, /* 0xf2 */ + 0x00,0x00,0x00,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x00,0x7e,0x00,0x00,0x00,0x00, /* 0xf3 */ + 0x00,0x00,0x0e,0x1b,0x1b,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, /* 0xf4 */ + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0xd8,0x70,0x00,0x00,0x00,0x00, /* 0xf5 */ + 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x7e,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00, /* 0xf6 */ + 0x00,0x00,0x00,0x00,0x00,0x76,0xdc,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xf7 */ + 0x00,0x38,0x6c,0x6c,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xf8 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xf9 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xfa */ + 0x00,0x0f,0x0c,0x0c,0x0c,0x0c,0x0c,0xec,0x6c,0x6c,0x3c,0x1c,0x00,0x00,0x00,0x00, /* 0xfb */ + 0x00,0xd8,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xfc */ + 0x00,0x70,0xd8,0x30,0x60,0xc8,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0xfd */ + 0x00,0x00,0x00,0x00,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x00,0x00,0x00,0x00,0x00, /* 0xfe */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 /* 0xff */ +}; + +/* EOF */ + Modified: branches/powerpc/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/psdk/in… ============================================================================== --- branches/powerpc/reactos/include/psdk/intrin.h (original) +++ branches/powerpc/reactos/include/psdk/intrin.h Fri Mar 16 10:16:45 2007 @@ -1650,8 +1650,8 @@ static __inline__ __attribute__((always_inline)) unsigned long __readfsdword(const unsigned long Offset) { - unsigned long result; - char *addr; + unsigned long result = 0; + char *addr = 0; __asm__("\tadd %2,13,%1\n" "\tlwz %0,0(%2)\n" : "=b" (result) Modified: branches/powerpc/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/psdk/wi… ============================================================================== --- branches/powerpc/reactos/include/psdk/winnt.h (original) +++ branches/powerpc/reactos/include/psdk/winnt.h Fri Mar 16 10:16:45 2007 @@ -62,7 +62,11 @@ #elif (_MSC_VER) #define FORCEINLINE __inline #else +#ifdef _PPC_ +#define FORCEINLINE __inline +#else #define FORCEINLINE static __attribute__((unused)) +#endif #endif #endif @@ -3788,7 +3792,7 @@ #ifndef __NTDDK_H static __inline__ struct _TEB * NtCurrentTeb(void) { - struct _TEB *ret; + struct _TEB *ret = 0; #ifndef _M_PPC __asm__ __volatile__ ( @@ -3869,7 +3873,7 @@ :"Ir" (Bit) : "memory"); #elif defined(_M_PPC) - LONG scratch; + LONG scratch = 0; Bit = 1 << Bit; /* %0 - OldBit @@ -3909,7 +3913,7 @@ :"Ir" (Bit) : "memory"); #elif defined(_M_PPC) - LONG scratch; + LONG scratch = 0; Bit = ~(1 << Bit); /* %0 - OldBit Modified: branches/powerpc/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/excepti… ============================================================================== --- branches/powerpc/reactos/lib/rtl/exception.c (original) +++ branches/powerpc/reactos/lib/rtl/exception.c Fri Mar 16 10:16:45 2007 @@ -115,7 +115,7 @@ IN ULONG Count, IN ULONG Flags) { - PULONG Stack, NewStack; + PULONG Stack = 0, NewStack; ULONG Eip; ULONG_PTR StackBegin, StackEnd; BOOLEAN Result, StopSearch = FALSE; Modified: branches/powerpc/reactos/lib/string/sscanf.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/string/ssca… ============================================================================== --- branches/powerpc/reactos/lib/string/sscanf.c (original) +++ branches/powerpc/reactos/lib/string/sscanf.c Fri Mar 16 10:16:45 2007 @@ -28,7 +28,7 @@ int sscanf(const char *str, const char *format, ...) { - int res; + int res = 0; #if 0 va_list valist;

1 0

[hpoussin] 26109: Fix compilation of drivers ks, mpu401_ks and sb16_nt4
by hpoussin＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: hpoussin Date: Thu Mar 15 22:00:34 2007 New Revision: 26109 URL: http://svn.reactos.org/svn/reactos?rev=26109&view=rev Log: Fix compilation of drivers ks, mpu401_ks and sb16_nt4 Modified: trunk/reactos/drivers/multimedia/ks/irp.c trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/drivers/multimedia/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/irp.… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/irp.c (original) +++ trunk/reactos/drivers/multimedia/ks/irp.c Thu Mar 15 22:00:34 2007 @@ -577,7 +577,7 @@ DPRINT1("KS IRP dispatch function called\n"); - PKSDISPATCH_TABLE ks_dispatch_table = NULL; + //PKSDISPATCH_TABLE ks_dispatch_table = NULL; /* ks_dispatch_table is the first element in a structure pointed to by FsContext */ Modified: trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/mpu401_… ============================================================================== --- trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp (original) +++ trunk/reactos/drivers/multimedia/mpu401_ks/adapter.cpp Thu Mar 15 22:00:34 2007 @@ -14,6 +14,7 @@ #define PUT_GUIDS_HERE +#define INITGUID #include <portcls.h> extern "C" Modified: trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c (original) +++ trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c Thu Mar 15 22:00:34 2007 @@ -14,7 +14,7 @@ return TRUE; } -BOOLEAN +BOOLEAN NTAPI ServiceSoundBlasterInterrupt( IN PKINTERRUPT Interrupt, IN PVOID Context) @@ -42,7 +42,7 @@ DPRINT("Vector is 0x%x\n", vector); - status = IoConnectInterrupt(parameters->interrupt, + status = IoConnectInterrupt(&parameters->interrupt, ServiceSoundBlasterInterrupt, DeviceObject, (PKSPIN_LOCK) NULL, Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (original) +++ trunk/reactos/include/ddk/portcls.h Thu Mar 15 22:00:34 2007 @@ -141,7 +141,7 @@ Class IDs - TODO */ //#define CLSID_PortDMus /* dmusicks.h */ -#define CLSID_PortMidi +DEFINE_GUID(CLSID_PortMidi,0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); #define CLSID_PortTopology #define CLSID_PortWaveCyclic #define CLSID_PortWavePci @@ -151,7 +151,7 @@ #define CLSID_MiniportDriverDMusUARTCapture #define CLSID_MiniportDriverFmSynth #define CLSID_MiniportDriverFmSynthWithVol -#define CLSID_MiniportDriverUart +DEFINE_GUID(CLSID_MiniportDriverUart,0xb4c90ae1L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); /* ===============================================================

1 0

[hpoussin] 26108: Add missing #endif
by hpoussin＠svn.reactos.org 15 Mar '07

15 Mar '07

Author: hpoussin Date: Thu Mar 15 19:32:56 2007 New Revision: 26108 URL: http://svn.reactos.org/svn/reactos?rev=26108&view=rev Log: Add missing #endif Modified: trunk/reactos/include/psdk/intrin_x86.h Modified: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86.h (original) +++ trunk/reactos/include/psdk/intrin_x86.h Thu Mar 15 19:32:56 2007 @@ -943,4 +943,6 @@ __asm__ __volatile__("wbinvd"); } +#endif /* KJK_INTRIN_X86_H_ */ + /* EOF */

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