Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 32237: Oops... Header was wrong...
by pschweitzer＠svn.reactos.org 09 Feb '08

09 Feb '08

Author: pschweitzer Date: Sat Feb 9 14:26:53 2008 New Revision: 32237 URL: http://svn.reactos.org/svn/reactos?rev=32237&view=rev Log: Oops... Header was wrong... Modified: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc Sat Feb 9 14:26:53 2008 @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS VGA Font Editor * LICENSE: GNU General Public License Version 2.0 or any later version - * FILE: devutils/vgafontedit/lang/en-US.rc + * FILE: devutils/vgafontedit/lang/fr-FR.rc * PURPOSE: French resource file * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> - * TRANSLATOR: Pierre Schweitzer + * TRANSLATOR: Pierre Schweitzer <heis_spiter(a)hotmail.com> */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

1 0

[pschweitzer] 32236: Added French translation for vgafondedit.exe
by pschweitzer＠svn.reactos.org 09 Feb '08

09 Feb '08

Author: pschweitzer Date: Sat Feb 9 14:25:06 2008 New Revision: 32236 URL: http://svn.reactos.org/svn/reactos?rev=32236&view=rev Log: Added French translation for vgafondedit.exe Added: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc (with props) Modified: trunk/rosapps/devutils/vgafontedit/main.rc Added: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc (added) +++ trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc Sat Feb 9 14:25:06 2008 @@ -1,0 +1,84 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/lang/en-US.rc + * PURPOSE: French resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + * TRANSLATOR: Pierre Schweitzer + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_ABOUT DIALOGEX 10, 10, 130, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "À propos de" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 + LTEXT "Éditeur de police VGA ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 + DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 +END + +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Éditer le glyphe" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 + CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 + CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 + + DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 + PUSHBUTTON "Annuler", IDCANCEL, 125, 177, 70, 14 +END + +IDM_MAINMENU MENU +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Nouveau\tCtrl+N", ID_FILE_NEW + MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Fermer", ID_FILE_CLOSE + MENUITEM SEPARATOR + MENUITEM "Enregistrer\tCtrl+S", ID_FILE_SAVE + MENUITEM "Enregistrer sous...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT + END + + POPUP "Fenêtres" + BEGIN + MENUITEM "En &cascade", ID_WINDOW_CASCADE + MENUITEM "Mosaïque &horizontale", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaïque &verticale", ID_WINDOW_TILE_VERT + MENUITEM "&Arranger les icônes", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Suivan&te\tCtrl+F6", ID_WINDOW_NEXT + END + + POPUP "Aide" + BEGIN + MENUITEM "&À propos de...", ID_HELP_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_OPENFILTER, "Tous les formats supportés (*.bin,*.psf)|*.bin;*.psf|Fichiers police binaires (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Fichiers police binaires (*.bin)|*.bin|" + IDS_OPENERROR, "Erreur lors de l'ouverture du fichier ! (Erreur numéro %1!u!)" + IDS_READERROR, "Erreur lors de la lecture du fichier ! (Erreur numéro %1!u!)" + IDS_WRITEERROR, "Erreur lors de l'écriture du fichier ! (Erreur numéro %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Format de fichier non supporté!" + IDS_UNSUPPORTEDPSF, "Format de police PSF non supporté ! L'éditeur supporte seulement les polices 8x8 sans aucun mode spécial." + IDS_DOCNAME, "Police %1!u!" + IDS_SAVEPROMPT, "Le fichier ""%1"" a été modifié mais pas enregistré.\n\nVoulez-vous l'enregistrer ?" + IDS_APPTITLE, "Éditeur de police VGA ReactOS" + IDS_CLOSEEDIT, "Veuillez d'abord fermer toutes les fenêtres d'édition !" + + IDS_TOOLTIP_NEW, "Nouveau" + IDS_TOOLTIP_OPEN, "Ouvrir" + IDS_TOOLTIP_SAVE, "Enregistrer" + IDS_TOOLTIP_EDIT_GLYPH, "Éditer le glyphe" +END Propchange: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Sat Feb 9 14:25:06 2008 @@ -32,6 +32,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[pschweitzer] 32235: Updated French translations for : - desk.cpl - mmsys.cpl - usetup.exe
by pschweitzer＠svn.reactos.org 09 Feb '08

09 Feb '08

Author: pschweitzer Date: Sat Feb 9 13:34:00 2008 New Revision: 32235 URL: http://svn.reactos.org/svn/reactos?rev=32235&view=rev Log: Updated French translations for : - desk.cpl - mmsys.cpl - usetup.exe Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sat Feb 9 13:34:00 2008 @@ -1580,4 +1580,31 @@ } }; +MUI_STRING frFRStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = Installer C = Créer Partition F3 = Quitter"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Installer D = Supprimer Partition F3 = Quitter"}, + {STRING_PARTITIONSIZE, + "Taille de la nouvelle partition :"}, + {STRING_PLEASEWAIT, + " Veuillez patienter..."}, + {STRING_CHOOSENEWPARTITION, + "Vous avez choisi de créer une nouvelle partition sur"}, + {STRING_CREATEPARTITION, + " ENTER = Créer Partition ESC = Annuler F3 = Quitter"}, + {STRING_COPYING, + " \xB3 Copie du fichier: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup copie les fichiers..."}, + {STRING_PAGEDMEM, + "Mémoire paginée"}, + {STRING_NONPAGEDMEM, + "Mémoire non paginée"}, + {STRING_FREEMEM, + "Mémoire libre"}, + {0, 0} +}; + #endif Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Sat Feb 9 13:34:00 2008 @@ -121,18 +121,18 @@ IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size:", -1, 14, 20, 222, 8 +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Affichage", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Taille de la police :", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 - GROUPBOX "Compatibility", -1, 7, 67, 237, 97 - LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 - AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 - AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 + GROUPBOX "Compatibilité", -1, 7, 67, 237, 97 + LTEXT "Quelques programmes peuvent mal fonctionner si vous ne redémarrez pas votre ordinateur après que vous ayiez changé les paramètres des couleurs.\r\n\nAprès que j'ai changé les paramètres des couleurs :", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Redémarrer l'ordinateur avant d'appliquer les nouveaux paramètres des couleurs.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Appliquer les nouveaux paramètres des couleurs sans redémarrer.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramètres des couleurs.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc Sat Feb 9 13:34:00 2008 @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Un schéma sons est un ensemble de sons appliqués aux évènements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer que vous avez modifié.",-1,8,7,230,40 - LTEXT "S&chéma son :",-1,8,42,150,17 + LTEXT "S&chéma sons :",-1,8,42,150,17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Enregistrer sous...", IDC_SAVEAS_BTN, 134,70,50,15 PUSHBUTTON "Supprimer", IDC_DELETE_BTN, 188,70,50,15 @@ -98,135 +98,135 @@ IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Save Scheme As" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Save this sound scheme as:", -1, 7, 7, 212, 9 +CAPTION "Enregistrer le schéma sous" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Sauver ce schéma sons sous :", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 157, 36, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 157, 36, 60, 14 END IDD_SPEAKERS DIALOG 0, 0, 257, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speakers" +CAPTION "Enceintes" FONT 8, "MS Shell Dlg" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "Select the speaker setup that is most like the setup you have on your computer.", -1, 36, 8, 215, 27 + LTEXT "Sélectionnez la configuration d'enceintes qui est la plus proche de celle que vous avez sur votre ordinateur.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "S&peaker setup:", 8502, 53, 169, 55, 10 + LTEXT "Configuration des enceintes :", 8502, 53, 169, 55, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS plays audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 218, 23 +CAPTION "Performances" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ces paramètres contrôlent comment ReactOS joue les sons. Ils peuvent vous aider à régler les problèmes audio.", 8492, 34, 7, 218, 23 GROUPBOX "Audio playback", 8494, 7, 32, 243, 152 ICON 4379, 8512, 8, 8, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 56, 111, 14 + LTEXT "Accélération matérielle :", 8495, 13, 56, 111, 14 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 123, 103, 14 + LTEXT "Qualité de conver&sion du taux d'échantillonage :", 8496, 13, 123, 103, 14 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 7, 191, 110, 14 - LTEXT "None", 8497, 128, 56, 21, 10 - LTEXT "Full", 8498, 214, 56, 21, 9 - LTEXT "Good", 8499, 128, 123, 21, 10 - LTEXT "Best", 8500, 214, 123, 23, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 145, 227, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 78, 227, 22 + PUSHBUTTON "Pa&ramètres par défaut", 5400, 7, 191, 110, 14 + LTEXT "Aucune", 8497, 128, 56, 21, 10 + LTEXT "Complète", 8498, 214, 56, 21, 9 + LTEXT "Bonne", 8499, 128, 123, 21, 10 + LTEXT "Meilleure", 8500, 214, 123, 23, 9 + LTEXT "Cette chaîne décrit les paramètres matériel pour le périphérique de capture", 5399, 13, 145, 227, 21 + LTEXT "Cette chaîne décrit les paramètres matériel pour le périphérique de lecture", 5398, 13, 78, 227, 22 END IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 - GROUPBOX "Audio recording", 8494, 7, 29, 242, 122 +CAPTION "Performances" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ces paramètres contrôlent comment ReactOS enregistre les sons. Ils peuvent vous aider à régler les problèmes audio.", 8492, 34, 7, 217, 20 + GROUPBOX "Enregistrement audio", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 17 + LTEXT "Accélération matérielle :", 8495, 13, 46, 103, 17 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 17 + LTEXT "Qualité de conver&sion du taux d'échantillonage :", 8496, 13, 103, 103, 17 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 9, 158, 110, 14 - LTEXT "None", 8497, 125, 46, 24, 10 - LTEXT "Full", 8498, 217, 46, 19, 9 - LTEXT "Good", 8499, 125, 103, 24, 10 - LTEXT "Best", 8500, 217, 103, 19, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 125, 222, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 68, 218, 24 + PUSHBUTTON "Pa&ramètres par défaut", 5400, 9, 158, 110, 14 + LTEXT "Aucune", 8497, 125, 46, 24, 10 + LTEXT "Complète", 8498, 217, 46, 19, 9 + LTEXT "Bonne", 8499, 125, 103, 24, 10 + LTEXT "Meilleure", 8500, 217, 103, 19, 9 + LTEXT "Cette chaîne décrit les paramètres matériel pour le périphérique de capture", 5399, 13, 125, 222, 21 + LTEXT "Cette chaîne décrit les paramètres matériel pour le périphérique de lecture", 5398, 13, 68, 218, 24 END IDD_SETUP1 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ReactOS Audio", 10243, 7, 5, 213, 192 +CAPTION "Configuration" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Audio ReactOS", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 - AUTOCHECKBOX "&Enable ReactOS Audio", 10253, 60, 68, 150, 9 + LTEXT "Cet ordinateur ne peut jouer de sons car le Service Audio ReactOS n'est pas activé.", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "Activ&er les sons ReactOS", 10253, 60, 68, 150, 9 LTEXT "Notes", 10246, 58, 87, 150, 11 - LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 - LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 + LTEXT "1. Vous devez être un administrateur pour activer ce service. Si vous n'êtes pas connecté en tant qu'administrateur, un nom d'utilisateur administrateur ainsi qu'un mot de passe vous serons demandé.", 10247, 60, 100, 150, 40 + LTEXT "2. Après que vous ayiez activé les sons ReactOS, vous devrez redémarrer votre ordinateur.", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Multichannel" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Description goes here.", 9506, 8, 4, 212, 24 - LTEXT "Low", 9473, 65, 31, 14, 8 +CAPTION "Multi-canaux" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "La description prend place ici.", 9506, 8, 4, 212, 24 + LTEXT "Faible", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 - LTEXT "High", 9474, 202, 31, 17, 8 - LTEXT "Low", 9477, 65, 50, 14, 8 + LTEXT "Élevé", 9474, 202, 31, 17, 8 + LTEXT "Faible", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 - LTEXT "High", 9478, 202, 50, 17, 8 - LTEXT "Low", 9481, 65, 69, 14, 8 + LTEXT "Élevé", 9478, 202, 50, 17, 8 + LTEXT "Faible", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 - LTEXT "High", 9482, 202, 69, 17, 8 - LTEXT "Low", 9485, 65, 88, 14, 8 + LTEXT "Élevé", 9482, 202, 69, 17, 8 + LTEXT "Faible", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 - LTEXT "High", 9486, 202, 88, 17, 8 - LTEXT "Low", 9489, 65, 107, 14, 8 + LTEXT "Élevé", 9486, 202, 88, 17, 8 + LTEXT "Faible", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 - LTEXT "High", 9490, 202, 107, 17, 8 - LTEXT "Low", 9493, 65, 126, 14, 8 + LTEXT "Élevé", 9490, 202, 107, 17, 8 + LTEXT "Faible", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 - LTEXT "High", 9494, 202, 126, 17, 8 - LTEXT "Low", 9497, 65, 145, 14, 8 + LTEXT "Élevé", 9494, 202, 126, 17, 8 + LTEXT "Faible", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 - LTEXT "High", 9498, 202, 145, 17, 8 - LTEXT "Low", 9501, 65, 164, 14, 8 + LTEXT "Élevé", 9498, 202, 145, 17, 8 + LTEXT "Faible", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 - LTEXT "High", 9502, 202, 164, 17, 8 - AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 - PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 + LTEXT "Élevé", 9502, 202, 164, 17, 8 + AUTOCHECKBOX "Déplacer toutes les barres en &même temps", 9504, 5, 185, 216, 9 + PUSHBUTTON "Paramètres par &défaut", 9505, 110, 199, 110, 14 END IDD_SETUP2 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ReactOS Audio", 10259, 7, 5, 213, 192 +CAPTION "Configuration" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Audio ReactOS", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 - LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 - LTEXT "To restart ReactOS, click OK.", 10262, 60, 75, 150, 20 - LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 + LTEXT "Le Service Audio ReactOS est maintenant activé. Néanmoins, le son pourrait ne pas fonctionner correctement tant que vous n'aurez pas redémarré ReactOS. Si vous voulez redémarrer maintenant, enregistrez d'abord votre travail et ferme tous les prorgammes.", 10261, 60, 25, 150, 50 + LTEXT "Pour redémarrer ReactOS, cliquez sur OK.", 10262, 60, 75, 150, 20 + LTEXT "Si vous annulez, vous devrez redémarrer ultérieurement pour que le Service Audio ReactOS fonctionne correctement.", 10263, 60, 100, 150, 40 END STRINGTABLE @@ -235,33 +235,33 @@ IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." IDS_NO_SOUND "(Aucun)" - 5825 "Program error" - 5826 "Close program" - 5827 "Critical Battery Alarm" - 5828 "Device Connect" - 5829 "Device Disconnect" - 5830 "Device Failed to Connect" - 5831 "Empty Recycle Bin" - 5832 "Low Battery Alarm" - 5833 "Maximize" - 5834 "Menu command" - 5835 "Menu popup" - 5836 "Minimize" - 5837 "New Mail Notification" - 5838 "Start Navigation" - 5839 "Open program" - 5840 "Print Complete" - 5841 "Restore Down" - 5842 "Restore Up" - 5843 "Asterisk" - 5844 "Default sound" + 5825 "Erreur programme" + 5826 "Fermeture programme" + 5827 "Alarme batterie critique" + 5828 "Connexion périphérique" + 5829 "Déconnexion périphérique" + 5830 "Échec connexion périphérique" + 5831 "Corbeillé vidée" + 5832 "Alarme batterie faible" + 5833 "Maximiser" + 5834 "Commande menu" + 5835 "Menu déroullant" + 5836 "Minimiser" + 5837 "Notification nouveau courrier" + 5838 "Démarrer navigation" + 5839 "Ouvrir programme" + 5840 "Impression complète" + 5841 "Niveau inférieur" + 5842 "Niveau supérieur" + 5843 "Astérisque" + 5844 "Son par défaut" 5845 "Exclamation" - 5846 "Exit ReactOS" - 5847 "Critical Stop" - 5848 "System Notification" + 5846 "Fermeture ReactOS" + 5847 "Arrêt critique" + 5848 "Notification système" 5849 "Question" - 5850 "Start ReactOS" - 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" -END + 5850 "Démarrer ReactOS" + 5851 "Menu démarrer" + 5852 "Déconnexion ReactOS" + 5853 "Connexion ReactOS" +END

1 0

[cfinck] 32234: - Updated Slovak translation for usetup by Mario Kacmar (kario AT szm DOT sk) - Convert the new strings of the German translation to CP850 encoding
by cfinck＠svn.reactos.org 09 Feb '08

09 Feb '08

Author: cfinck Date: Sat Feb 9 13:16:19 2008 New Revision: 32234 URL: http://svn.reactos.org/svn/reactos?rev=32234&view=rev Log: - Updated Slovak translation for usetup by Mario Kacmar (kario AT szm DOT sk) - Convert the new strings of the German translation to CP850 encoding Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Sat Feb 9 13:16:19 2008 @@ -1579,15 +1579,15 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Installieren C = Partition erstellen F3 = Beenden"}, {STRING_INSTALLDELETEPARTITION, - " ENTER = Installieren D = Partition löschen F3 = Beenden"}, + " ENTER = Installieren D = Partition lschen F3 = Beenden"}, {STRING_PARTITIONSIZE, - "Größe der neuen Partition:"}, + "Gráe der neuen Partition:"}, {STRING_PLEASEWAIT, " Bitte warten..."}, {STRING_CHOOSENEWPARTITION, "Sie haben beschlossen eine neue Partition zu erstellen auf"}, {STRING_CREATEPARTITION, - " ENTER = Partition erstelln ESC = Abbruch F3 = Beenden"}, + " ENTER = Partition erstellen ESC = Abbruch F3 = Beenden"}, {STRING_COPYING, " \xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Sat Feb 9 13:16:19 2008 @@ -11,7 +11,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -57,7 +57,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -133,7 +133,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -157,7 +157,7 @@ { 8, 13, - "- Inçtal tor nepracuje s viac ako 1 prim rnou oblasou na 1 disk.", + "- Inçtal tor nepracuje s viac ako 1 prim rnou oblasou na 1 disku.", TEXT_NORMAL }, { @@ -227,7 +227,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -351,7 +351,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -416,13 +416,13 @@ { 6, 23, - "Ak s£ vçetky nastavenia spr vne, vyberte \"Akceptova tieto nastavenia zariaden¡\"", + "Ak s£ vçetky nastavenia spr vne, vyberte polo§ku", TEXT_NORMAL }, { 6, 24, - "a stlate ENTER.", + "\"Akceptova tieto nastavenia zariaden¡\" a stlate ENTER.", TEXT_NORMAL }, { @@ -444,7 +444,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -507,7 +507,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -559,7 +559,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -599,7 +599,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -645,7 +645,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -696,7 +696,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -742,7 +742,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -789,7 +789,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -847,7 +847,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -881,13 +881,13 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, - TEXT_UNDERLINE - }, - { - 6, - 8, - "Inçtal tor inçtaluje s£bory systmu ReactOS na zvolen£ oblas.", + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Inçtal tor nainçtaluje s£bory systmu ReactOS na zvolen£ oblas.", TEXT_NORMAL }, { @@ -933,19 +933,19 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { 11, 12, - "Pokajte, pros¡m, kìm Inçtal tor systmu ReactOS skop¡ruje s£bory", + "Pokajte, pros¡m, kìm Inçtal tor skop¡ruje s£bory do inçtalanho", TEXT_NORMAL }, { 30, 13, - "do V çho inçtalanho prieinka pre ReactOS.", + "prieinka pre ReactOS.", TEXT_NORMAL }, { @@ -957,7 +957,7 @@ { 0, 0, - " \xB3 Pokajte, pros¡m ... ", + " \xB3 Pokajte, pros¡m ... ", TEXT_STATUS }, { @@ -973,7 +973,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1019,7 +1019,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1031,7 +1031,7 @@ { 8, 10, - "\x07 Stlate kl ves HORE alebo DOLE pre vìber po§adovanho typu kl vesnice.", + "\x07 Stlate kl ves HORE alebo DOLE a vyberte po§adovanì typ kl vesnice.", TEXT_NORMAL }, { @@ -1071,7 +1071,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1089,7 +1089,7 @@ { 8, 11, - " kl vesnice. Potom stlate ENTER.", + " kl vesnice. Potom stlate ENTER.", TEXT_NORMAL }, { @@ -1124,7 +1124,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1153,7 +1153,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1200,7 +1200,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1246,7 +1246,7 @@ { 4, 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1274,8 +1274,8 @@ { { //ERROR_NOT_INSTALLED - "Systm ReactOS nie je kompletne nainçtalovanì na V ç\n" - "po¡ta. Ak teraz preruç¡te inçtal ciu, budete musie\n" + "Systm ReactOS nie je kompletne nainçtalovanì na V çom\n" + "po¡tai. Ak teraz preruç¡te inçtal ciu, budete musie\n" "spusti Inçtal tor znova, aby sa systm ReactOS nainçtaloval.\n" "\n" " \x07 Stlate ENTER pre pokraovanie v inçtal cii.\n" @@ -1573,4 +1573,31 @@ } }; +MUI_STRING skSKStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = Inçtalova C = Vytvori oblas F3 = Skoni"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Inçtalova D = Odstr ni oblas F3 = Skoni"}, + {STRING_PARTITIONSIZE, + "Vekos novej oblasti:"}, + {STRING_PLEASEWAIT, + " Pokajte, pros¡m ..."}, + {STRING_CHOOSENEWPARTITION, + "Zvolili Ste vytvorenie novej oblasti na"}, + {STRING_CREATEPARTITION, + " ENTER = Vytvori oblas ESC = Zruçi F3 = Skoni"}, + {STRING_COPYING, + " \xB3 Kop¡ruje sa s£bor: %S"}, + {STRING_SETUPCOPYINGFILES, + "Inçtal tor kop¡ruje s£bory..."}, + {STRING_PAGEDMEM, + "Str nkovan pam"}, + {STRING_NONPAGEDMEM, + "Nestr nkovan pam"}, + {STRING_FREEMEM, + "Von pam"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Sat Feb 9 13:16:19 2008 @@ -66,7 +66,7 @@ {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, enUSStrings }, {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, enUSStrings }, - {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, enUSStrings }, + {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, enUSStrings }, {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries, enUSStrings }, {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings },

1 0

[ros-arm-bringup] 32233: A couple of header fixes to get all the FreeLDR-loaded boot drivers to compile and link. FreeLDR now stops at ArmPrepareForReactOS, when we get to enable the MMU, Caches and other such fun stuff. Bring-up now really starts!
by ros-arm-bringup＠svn.reactos.org 09 Feb '08

09 Feb '08

Author: ros-arm-bringup Date: Sat Feb 9 03:59:05 2008 New Revision: 32233 URL: http://svn.reactos.org/svn/reactos?rev=32233&view=rev Log: A couple of header fixes to get all the FreeLDR-loaded boot drivers to compile and link. FreeLDR now stops at ArmPrepareForReactOS, when we get to enable the MMU, Caches and other such fun stuff. Bring-up now really starts! Modified: trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/reactos/armddk.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=322… ============================================================================== --- trunk/reactos/include/ddk/ndis.h (original) +++ trunk/reactos/include/ddk/ndis.h Sat Feb 9 03:59:05 2008 @@ -2285,7 +2285,7 @@ #endif -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM) /* * VOID Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Sat Feb 9 03:59:05 2008 @@ -230,16 +230,5 @@ return PCR->Prcb; } -// -// Macro to get current CPU -// -FORCEINLINE -ULONG -DDKAPI -KeGetCurrentProcessorNumber(VOID) -{ - return PCR->Number; -} - #endif #endif Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Sat Feb 9 03:59:05 2008 @@ -21,6 +21,11 @@ #define USPCR 0x7FFF0000 #define PCR ((volatile KPCR * const)USPCR) #define USERPCR ((volatile KPCR * const)KIPCR) + +// +// Just read it from the PCR +// +#define KeGetCurrentProcessorNumber() ((ULONG)(PCR->Number)) // // Stub

1 0

[hpoussin] 32232: Add support for .idl files Various fixes
by hpoussin＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: hpoussin Date: Fri Feb 8 23:49:38 2008 New Revision: 32232 URL: http://svn.reactos.org/svn/reactos?rev=32232&view=rev Log: Add support for .idl files Various fixes Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=32232&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Fri Feb 8 23:49:38 2008 @@ -1,6 +1,6 @@ @ECHO OFF -REM Copyright (C) 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) +REM Copyright (C) 2006-2008 Hervé Poussineau (hpoussin(a)reactos.org) SET WINE_TMPFILE1=tmpfile1.wine @@ -20,6 +20,7 @@ ECHO %0 merge {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 make {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] +COLOR 00 GOTO :eof REM **************************************************************************** @@ -109,10 +110,10 @@ SET WINE_OPTION1= SET WINE_OPTION2= -IF "%WINE_HAS_DLLMAIN%" == "0" ( - IF "%WINE_IS_EXE%" == "0" ( - SET WINE_OPTION1= entrypoint="0" - ) +IF "%WINE_IS_EXE%" == "0" ( + SET WINE_OPTION1= entrypoint="0" +) ELSE IF "%WINE_HAS_DLLMAIN%" == "0" ( + SET WINE_OPTION1= entrypoint="0" ) IF "%WINE_IS_EXE%" == "0" ( SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789_. @@ -128,6 +129,11 @@ ) SET WINE_OPTION2= baseaddress="${BASEADDRESS_!WINE_UPPERCASE!}" ) +SETLOCAL DISABLEDELAYEDEXPANSION +ECHO ^<?xml version="1.0"?^> +ECHO ^<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"^> +SETLOCAL ENABLEDELAYEDEXPANSION +ECHO ^<group^> ECHO ^<module name="%WINE_SHORT_NAME%" type="%WINE_MODULE_TYPE%"%WINE_OPTION2% installbase="%WINE_INSTALL_BASE%" installname="%WINE_INSTALL_NAME%" allowwarnings="true"%WINE_OPTION1%^> IF "%WINE_HAS_DLLINSTALL%" == "1" ( IF "%WINE_HAS_DLLREGISTERSERVER%" == "1" ( @@ -146,19 +152,21 @@ ECHO ^<include base="%WINE_SHORT_NAME%"^>.^</include^> IF "%WINE_IS_EXE%" == "0" ( ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> - ECHO ^<define name="__REACTOS__" /^> ECHO ^<define name="__WINESRC__" /^> ) -ECHO ^<define name="__USE_W32API" /^> -ECHO ^<define name="_WIN32_IE"^>0x600^</define^> -ECHO ^<define name="_WIN32_WINNT"^>0x501^</define^> -ECHO ^<define name="WINVER"^>0x501^</define^> -ECHO ^<library^>wine^</library^> +ECHO ^<define name="WINVER"^>0x600^</define^> +ECHO ^<define name="_WIN32_WINNT"^>0x600^</define^> SET WINE_FULL_LINE= SET WINE_END_PREC_LINE= SET WINE_VARTYPE=0 -SET WINE_HAS_NTDLL= SET WINE_HAS_IDL= +SET WINE_LIBRARIES=wine +SET WINE_DEPENDENCIES= +SET WINE_IDL_GEN_I_SRCS= +SET WINE_IDL_GEN_C_SRCS= +SET WINE_IDL_GEN_S_SRCS= +SET WINE_IDL_GEN_P_SRCS= +SET WINE_IDL_GEN_TLB_SRCS= FOR /F "eol=# delims=" %%l IN (%WINE_TMPFILE1%) DO ( CALL :internal_analyseline %%l ) @@ -171,7 +179,50 @@ IF EXIST "%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec" ( ECHO ^<file^>%WINE_MODULE_NAME%.spec^</file^> ) +FOR %%j IN (%WINE_LIBRARIES%) DO ( + ECHO ^<library^>%%j^</library^> +) +ECHO ^<library^>ntdll^</library^> +FOR %%j IN (%WINE_DEPENDENCIES%) DO ( + ECHO ^<dependency^>%%j^</dependency^> +) ECHO ^</module^> +FOR %%j IN (%WINE_IDL_GEN_I_SRCS%) DO ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header" type="idlheader" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_C_SRCS%) DO ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_client" type="rpcclient" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_S_SRCS%) DO ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_server" type="rpcserver" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_P_SRCS%) DO ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_proxy" type="rpcproxy" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +FOR %%j IN (%WINE_IDL_GEN_TLB_SRCS%) DO ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_typelib" type="embeddedtypelib" allowwarnings="true"^> + ECHO ^<file^>%%j^</file^> + ECHO ^</module^> +) +ECHO ^</group^> DEL %WINE_TMPFILE1% GOTO :eof @@ -183,16 +234,40 @@ FOR /F "tokens=2* delims= " %%h IN ("%WINE_FULL_LINE%") DO ( FOR %%j IN (%%i) DO ( IF "%WINE_VARTYPE%" == "1" ( - IF "!WINE_HAS_NTDLL!" == "" ( - ECHO ^<library^>ntdll^</library^> - SET WINE_HAS_NTDLL=1 - ) ECHO ^<file^>%%j^</file^> ) ELSE IF "%WINE_VARTYPE%" == "2" ( - ECHO ^<library^>%%j^</library^> - IF "%%j" == "ntdll" SET WINE_HAS_NTDLL=1 - ) ELSE ( - IF "%%j" == "-luuid" ECHO ^<library^>uuid^</library^> + if NOT "%%j" == "ntdll" ( + SET WINE_LIBRARIES=!WINE_LIBRARIES! %%j + ) + ) ELSE IF "%WINE_VARTYPE%" == "3" ( + IF "%%j" == "-luuid" ( + SET WINE_LIBRARIES=!WINE_LIBRARIES! uuid + ) + ) ELSE IF "%WINE_VARTYPE%" == "4" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header !WINE_LIBRARIES! + SET WINE_IDL_GEN_I_SRCS=!WINE_IDL_GEN_I_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "5" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_client !WINE_LIBRARIES! + SET WINE_IDL_GEN_C_SRCS=!WINE_IDL_GEN_C_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "6" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_server !WINE_LIBRARIES! + SET WINE_IDL_GEN_S_SRCS=!WINE_IDL_GEN_S_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "7" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_proxy !WINE_LIBRARIES! + SET WINE_IDL_GEN_P_SRCS=!WINE_IDL_GEN_P_SRCS! %%j + ) ELSE IF "%WINE_VARTYPE%" == "8" ( + SET WINE_SHORT_NAME=%%j + SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! + SET WINE_DEPENDENCIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_typelib !WINE_DEPENDENCIES! + SET WINE_IDL_GEN_TLB_SRCS=!WINE_IDL_GEN_TLB_SRCS! %%j ) ) ) @@ -207,6 +282,18 @@ ) ELSE IF "%1" == "IDL_H_SRCS" ( SET WINE_VARTYPE=1 SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_C_SRCS" ( + SET WINE_VARTYPE=5 + SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_S_SRCS" ( + SET WINE_VARTYPE=6 + SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_P_SRCS" ( + SET WINE_VARTYPE=7 + SET WINE_HAS_IDL=1 + ) ELSE IF "%1" == "IDL_TLB_SRCS" ( + SET WINE_VARTYPE=8 + SET WINE_HAS_IDL=1 ) ELSE IF "%1" == "IMPORTS" ( SET WINE_VARTYPE=2 ) ELSE IF "%1" == "DELAYIMPORTS" ( @@ -238,8 +325,8 @@ :link IF "%3" == "" GOTO help IF NOT "%4" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. +IF NOT EXIST "%2\ReactOS-generic.rbuild" ( + ECHO %2\ReactOS-generic.rbuild doesn't exist. GOTO :help ) SET WINE_RELATIVE_WINE=wine\dlls\%3 @@ -265,8 +352,8 @@ :merge IF "%3" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. +IF NOT EXIST "%2\ReactOS-generic.rbuild" ( + ECHO %2\ReactOS-generic.rbuild doesn't exist. GOTO :help ) SET WINE_ROS_DIR=%2 @@ -276,12 +363,20 @@ SET WINE_RELATIVE_WINE=wine\dlls\%2 SET WINE_RELATIVE_ROS=%WINE_ROS_DIR%\dll\win32\%2 CALL :internal_merge %2 +IF ERRORLEVEL 1 ( + COLOR 00 + GOTO :eof +) SET WINE_RELATIVE_WINE=wine\dlls\%2\tests SET WINE_RELATIVE_ROS=%WINE_ROS_DIR%\modules\rostests\winetests\%2 IF EXIST "%WINE_RELATIVE_WINE%\." ( IF EXIST "%WINE_ROS_DIR%\modules\rostests\winetests\." ( CALL :internal_create_testlist CALL :internal_merge %2 + IF ERRORLEVEL 1 ( + COLOR 00 + GOTO :eof + ) ) ELSE ( ECHO WARNING: tests for %2 will NOT be updated! ) @@ -292,31 +387,10 @@ IF NOT EXIST "%WINE_RELATIVE_WINE%" GOTO :eof 2>NUL MKDIR "%WINE_RELATIVE_ROS%" ATTRIB -R "%WINE_RELATIVE_ROS%\*" >NUL -COPY /Y "%WINE_RELATIVE_WINE%\*.*" "%WINE_RELATIVE_ROS%" >NUL +>NUL XCOPY /Y /S "%WINE_RELATIVE_WINE%\*.*" "%WINE_RELATIVE_ROS%" +2>NUL RD /S /Q "%WINE_RELATIVE_ROS%\tests" SET WINE_FILES_DELETED= -FOR /F "delims=" %%f IN ('DIR /B "%WINE_RELATIVE_ROS%\*.*"') DO ( - IF "%%f" == ".cvsignore" ( - svn.exe delete --force "%WINE_RELATIVE_ROS%\%%f" 2>NUL - DEL /Q "%WINE_RELATIVE_ROS%\%%f" 2>NUL - ) ELSE IF "%%f" == "Makefile.in" ( - svn.exe delete --force "%WINE_RELATIVE_ROS%\%%f" 2>NUL - DEL /Q "%WINE_RELATIVE_ROS%\%%f" 2>NUL - ) ELSE IF NOT EXIST "%WINE_RELATIVE_WINE%\%%f" ( - SET WINE_FILE=%%f - IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( - svn.exe delete "%WINE_RELATIVE_ROS%\%%f" 2>NUL - IF ERRORLEVEL 2 GOTO :helpsvn - IF EXIST "%WINE_RELATIVE_ROS%\%%f" DEL /Q "%WINE_RELATIVE_ROS%\%%f" - IF EXIST "%WINE_RELATIVE_ROS%\%%f" RD /S /Q "%WINE_RELATIVE_ROS%\%%f" - SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f - ) - ) ELSE ( - svn.exe add "%WINE_RELATIVE_ROS%\%%f" 2>NUL - IF ERRORLEVEL 2 GOTO :helpsvn - svn.exe propset svn:eol-style native "%WINE_RELATIVE_ROS%\%%f" >NUL 2>NUL - SET >NUL - ) -) +CALL :internal_merge_directory SET WINE_PATCH_FILE=%1_ros.diff IF EXIST "%WINE_RELATIVE_ROS%\%WINE_PATCH_FILE%" ( svn.exe add "%WINE_RELATIVE_ROS%\%WINE_PATCH_FILE%" 2>NUL @@ -341,6 +415,41 @@ ) GOTO :eof +:internal_merge_directory +SET WINE_RELATIVE_DIR=%1 +2>NUL RD /S /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\CVS" +FOR /F "delims=" %%f IN ('DIR /B /A-D "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\"') DO ( + IF "%%f" == ".cvsignore" ( + svn.exe delete --force "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + DEL /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + ) ELSE IF "%%f" == "Makefile.in" ( + svn.exe delete --force "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + DEL /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + ) ELSE IF NOT EXIST "%WINE_RELATIVE_WINE%%WINE_RELATIVE_DIR%\%%f" ( + SET WINE_FILE=%%f + IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( + svn.exe delete "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + IF EXIST "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" DEL /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" + IF EXIST "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" RD /S /Q "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" + SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f + ) + ) ELSE ( + svn.exe add "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + svn.exe propset svn:eol-style native "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" >NUL 2>NUL + SET >NUL + ) +) +FOR /F "delims=" %%f IN ('DIR /B /AD "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\"') DO ( + IF NOT "%%f" == ".svn" ( + 2>NUL MKDIR "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" + svn.exe add "%WINE_RELATIVE_ROS%%WINE_RELATIVE_DIR%\%%f" 2>NUL + CALL :internal_merge_directory %WINE_RELATIVE_DIR%\%%f + ) +) +goto :eof + :internal_create_testlist SET WINE_TESTLIST=%WINE_RELATIVE_WINE%\testlist.c SET WINE_FULL_LINE= @@ -413,8 +522,8 @@ SETLOCAL ENABLEEXTENSIONS SETLOCAL ENABLEDELAYEDEXPANSION IF "%3" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. +IF NOT EXIST "%2\ReactOS-i386.rbuild" ( + ECHO %2\ReactOS-i386.rbuild doesn't exist. GOTO :help ) SET WINE_LIST= @@ -430,7 +539,7 @@ GOTO make_filllist :make_doit PUSHD "%WINE_ROS_DIR%" -make.exe %WINE_LIST% +mingw32-make.exe %WINE_LIST% POPD GOTO :eof @@ -466,7 +575,7 @@ ) >NUL CALL :link link "%WINE_ROS_DIR%" %%m ) -CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% +CALL :merge merge %WINE_ROS_DIR% %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" CALL :make make "%WINE_ROS_DIR%" %WINE_NEW_LIST%

1 0

[fireball] 32231: Kamil Hornicek <tykef@atlas.cz> - Add TRACEs to unimplemented functions.
by fireball＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: fireball Date: Fri Feb 8 23:11:56 2008 New Revision: 32231 URL: http://svn.reactos.org/svn/reactos?rev=32231&view=rev Log: Kamil Hornicek <tykef(a)atlas.cz> - Add TRACEs to unimplemented functions. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Fri Feb 8 23:11:56 2008 @@ -123,7 +123,8 @@ PLSA_UNICODE_STRING UserRights, ULONG CountOfRights) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + return STATUS_NOT_IMPLEMENTED; } /* @@ -138,7 +139,9 @@ ACCESS_MASK DesiredAccess, PLSA_HANDLE TrustedDomainHandle) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, TrustedDomainInformation, AuthenticationInformation, + DesiredAccess, TrustedDomainHandle); + return STATUS_NOT_IMPLEMENTED; } /* @@ -150,7 +153,8 @@ LSA_HANDLE PolicyHandle, PSID TrustedDomainSid) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p) stub\n", PolicyHandle, TrustedDomainSid); + return STATUS_NOT_IMPLEMENTED; } /* @@ -164,7 +168,8 @@ PLSA_UNICODE_STRING *UserRights, PULONG CountOfRights) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + return STATUS_NOT_IMPLEMENTED; } /* @@ -178,7 +183,8 @@ PVOID *EnumerationBuffer, PULONG CountReturned) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,%p) stub\n", PolicyHandle, UserRights, EnumerationBuffer, CountReturned); + return STATUS_NOT_IMPLEMENTED; } /* @@ -193,7 +199,9 @@ ULONG PreferedMaximumLength, PULONG CountReturned) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, + Buffer, PreferedMaximumLength, CountReturned); + return STATUS_NOT_IMPLEMENTED; } /* @@ -208,7 +216,9 @@ ULONG PreferedMaximumLength, PULONG CountReturned) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + return STATUS_NOT_IMPLEMENTED; } /* @@ -217,7 +227,8 @@ NTSTATUS STDCALL LsaFreeMemory(PVOID Buffer) { - return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + TRACE("(%p)\n", Buffer); + return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } /* @@ -236,6 +247,9 @@ LSA_TRANSLATED_SID *TranslatedSids; ULONG i; NTSTATUS Status; + + TRACE("(%p,0x%08x,%p,%p,%p)\n", PolicyHandle, Count, Names, + ReferencedDomains, Sids); /* Call LsaLookupNames2, which supersedes this function */ Status = LsaLookupNames2(PolicyHandle, Count, 0, Names, ReferencedDomains, &Sids2); @@ -300,6 +314,9 @@ static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); PLSA_REFERENCED_DOMAIN_LIST LocalDomains; PLSA_TRANSLATED_NAME LocalNames; + + FIXME("(%p,%u,%p,%p,%p) stub\n", PolicyHandle, Count, Sids, + ReferencedDomains, Names); WARN("LsaLookupSids(): stub. Always returning 'Administrator'\n"); if (Count != 1) @@ -337,7 +354,8 @@ ULONG STDCALL LsaNtStatusToWinError(NTSTATUS Status) { - return RtlNtStatusToDosError(Status); + TRACE("(%lx)\n", Status); + return RtlNtStatusToDosError(Status); } /****************************************************************************** @@ -378,7 +396,8 @@ ACCESS_MASK DesiredAccess, PLSA_HANDLE TrustedDomainHandle) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,0x%08x,%p) stub\n", PolicyHandle, TrustedDomainName, DesiredAccess, TrustedDomainHandle); + return STATUS_NOT_IMPLEMENTED; } /* @@ -388,10 +407,11 @@ STDCALL LsaQueryDomainInformationPolicy( LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS pic, + POLICY_DOMAIN_INFORMATION_CLASS InformationClass, PVOID *Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -404,7 +424,8 @@ PLSA_UNICODE_STRING TrustedDomainName, PLSA_FOREST_TRUST_INFORMATION * ForestTrustInfo) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo); + return STATUS_NOT_IMPLEMENTED; } /* @@ -415,7 +436,7 @@ POLICY_INFORMATION_CLASS pic, PVOID *Buffer) { - TRACE("(%p,0x%08x,%p):LsaQueryInformationPolicy stub\n", + FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, pic, Buffer); if (!Buffer) @@ -508,10 +529,11 @@ LsaQueryTrustedDomainInfoByName( LSA_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID *Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -522,10 +544,11 @@ LsaQueryTrustedDomainInfo( LSA_HANDLE PolicyHandle, PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID *Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -540,7 +563,8 @@ PLSA_UNICODE_STRING UserRights, ULONG CountOfRights) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + return STATUS_NOT_IMPLEMENTED; } /* @@ -553,7 +577,8 @@ PLSA_UNICODE_STRING KeyName, PLSA_UNICODE_STRING *PrivateData) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p) stub\n", PolicyHandle, KeyName, PrivateData); + return STATUS_NOT_IMPLEMENTED; } /* @@ -563,10 +588,11 @@ STDCALL LsaSetDomainInformationPolicy( LSA_HANDLE PolicyHandle, - POLICY_DOMAIN_INFORMATION_CLASS pic, + POLICY_DOMAIN_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -576,10 +602,11 @@ STDCALL LsaSetInformationPolicy( LSA_HANDLE PolicyHandle, - POLICY_INFORMATION_CLASS pic, + POLICY_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -594,7 +621,8 @@ BOOL CheckOnly, PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); + return STATUS_NOT_IMPLEMENTED; } /* @@ -605,10 +633,11 @@ LsaSetTrustedDomainInfoByName( LSA_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -619,10 +648,11 @@ LsaSetTrustedDomainInformation( LSA_HANDLE PolicyHandle, PSID TrustedDomainSid, - TRUSTED_INFORMATION_CLASS pic, + TRUSTED_INFORMATION_CLASS InformationClass, PVOID Buffer) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } /* @@ -635,7 +665,8 @@ PLSA_UNICODE_STRING KeyName, PLSA_UNICODE_STRING PrivateData) { - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p,%p) stub\n", PolicyHandle, KeyName, PrivateData); + return STATUS_NOT_IMPLEMENTED; } /* @@ -647,9 +678,8 @@ PUNICODE_STRING *UserName, PUNICODE_STRING *DomainName) { - FIXME("%s() not implemented!\n", __FUNCTION__); - - return STATUS_NOT_IMPLEMENTED; + FIXME("(%p,%p) stub\n", UserName, DomainName); + return STATUS_NOT_IMPLEMENTED; } /* @@ -661,9 +691,8 @@ DWORD Unknonw1, DWORD Unknonw2) { - FIXME("%s() not implemented!\n", __FUNCTION__);; - - return STATUS_NOT_IMPLEMENTED; + FIXME("(%d,%d,%d) stub\n", Unknonw0, Unknonw1, Unknonw2); + return STATUS_NOT_IMPLEMENTED; }

1 0

[hpoussin] 32230: Use a generic .spec file, instead of a .def file per architecture
by hpoussin＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: hpoussin Date: Fri Feb 8 22:59:30 2008 New Revision: 32230 URL: http://svn.reactos.org/svn/reactos?rev=32230&view=rev Log: Use a generic .spec file, instead of a .def file per architecture Added: trunk/reactos/drivers/storage/class/class2/class2.spec (with props) Removed: trunk/reactos/drivers/storage/class/class2/class2_arm.def trunk/reactos/drivers/storage/class/class2/class2_i386.def Modified: trunk/reactos/drivers/storage/class/class2/class2.c (props changed) trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/class/class2/class2.rc (contents, props changed) trunk/reactos/drivers/storage/class/class2/license.txt (contents, props changed) Propchange: trunk/reactos/drivers/storage/class/class2/class2.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Fri Feb 8 22:59:30 2008 @@ -2,11 +2,12 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <importlibrary definition="class2_$(ARCH).def" /> + <importlibrary definition="class2.spec.def" /> <library>ntoskrnl</library> <library>hal</library> <library>scsiport</library> <include base="class2">..</include> <file>class2.c</file> <file>class2.rc</file> + <file>class2.spec</file> </module> Modified: trunk/reactos/drivers/storage/class/class2/class2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rc (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rc Fri Feb 8 22:59:30 2008 @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: class2.rc 26227 2007-04-01 16:29:16Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "SCSI Class Driver Helper\0" Propchange: trunk/reactos/drivers/storage/class/class2/class2.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Added: trunk/reactos/drivers/storage/class/class2/class2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.spec (added) +++ trunk/reactos/drivers/storage/class/class2/class2.spec Fri Feb 8 22:59:30 2008 @@ -1,0 +1,22 @@ +@ stdcall ScsiClassAsynchronousCompletion(ptr ptr ptr) +@ stdcall ScsiClassBuildRequest(ptr ptr) +@ stdcall ScsiClassClaimDevice(ptr ptr long ptr) +@ stdcall ScsiClassCreateDeviceObject(ptr ptr ptr ptr ptr) +@ stdcall ScsiClassDeviceControl(ptr ptr) +@ stdcall ScsiClassFindModePage(ptr long long long) +@ stdcall ScsiClassFindUnclaimedDevices(ptr ptr) +@ stdcall ScsiClassGetCapabilities(ptr ptr) +@ stdcall ScsiClassGetInquiryData(ptr ptr) +@ stdcall ScsiClassInitialize(ptr ptr ptr) +@ stdcall ScsiClassInitializeSrbLookasideList(ptr long) +@ stdcall ScsiClassInternalIoControl(ptr ptr) +@ stdcall ScsiClassInterpretSenseInfo(ptr ptr long long long long) +@ stdcall ScsiClassIoComplete(ptr ptr ptr) +@ stdcall ScsiClassIoCompleteAssociated(ptr ptr ptr) +@ stdcall ScsiClassModeSense(ptr ptr long long) +@ stdcall ScsiClassQueryTimeOutRegistryValue(ptr) +@ stdcall ScsiClassReadDriveCapacity(ptr) +@ stdcall ScsiClassReleaseQueue(ptr) +@ stdcall ScsiClassSendSrbAsynchronous(ptr ptr ptr ptr long long) +@ stdcall ScsiClassSendSrbSynchronous(ptr ptr ptr long long) +@ stdcall ScsiClassSplitRequest(ptr ptr long) Propchange: trunk/reactos/drivers/storage/class/class2/class2.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/storage/class/class2/class2_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2_arm.def (original) +++ trunk/reactos/drivers/storage/class/class2/class2_arm.def (removed) @@ -1,29 +1,0 @@ -; $Id: class2.def 26227 2007-04-01 16:29:16Z fireball $ -; -; class2.def - export definition file for scsi class driver -; -LIBRARY CLASS2.SYS -EXPORTS -ScsiClassAsynchronousCompletion -ScsiClassBuildRequest -ScsiClassClaimDevice -ScsiClassCreateDeviceObject -ScsiClassDeviceControl -ScsiClassFindModePage -ScsiClassFindUnclaimedDevices -ScsiClassGetCapabilities -ScsiClassGetInquiryData -ScsiClassInitialize -ScsiClassInitializeSrbLookasideList -ScsiClassInternalIoControl -ScsiClassInterpretSenseInfo -ScsiClassIoComplete -ScsiClassIoCompleteAssociated -ScsiClassModeSense -ScsiClassQueryTimeOutRegistryValue -ScsiClassReadDriveCapacity -ScsiClassReleaseQueue -ScsiClassSendSrbAsynchronous -ScsiClassSendSrbSynchronous -ScsiClassSplitRequest -;EOF Removed: trunk/reactos/drivers/storage/class/class2/class2_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2_i386.def (original) +++ trunk/reactos/drivers/storage/class/class2/class2_i386.def (removed) @@ -1,29 +1,0 @@ -; $Id$ -; -; class2.def - export definition file for scsi class driver -; -LIBRARY CLASS2.SYS -EXPORTS -ScsiClassAsynchronousCompletion@12 -ScsiClassBuildRequest@8 -ScsiClassClaimDevice@16 -ScsiClassCreateDeviceObject@20 -ScsiClassDeviceControl@8 -ScsiClassFindModePage@16 -ScsiClassFindUnclaimedDevices@8 -ScsiClassGetCapabilities@8 -ScsiClassGetInquiryData@8 -ScsiClassInitialize@12 -ScsiClassInitializeSrbLookasideList@8 -ScsiClassInternalIoControl@8 -ScsiClassInterpretSenseInfo@24 -ScsiClassIoComplete@12 -ScsiClassIoCompleteAssociated@12 -ScsiClassModeSense@16 -ScsiClassQueryTimeOutRegistryValue@4 -ScsiClassReadDriveCapacity@4 -ScsiClassReleaseQueue@4 -ScsiClassSendSrbAsynchronous@24 -ScsiClassSendSrbSynchronous@20 -ScsiClassSplitRequest@12 -;EOF Modified: trunk/reactos/drivers/storage/class/class2/license.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/license.txt (original) +++ trunk/reactos/drivers/storage/class/class2/license.txt Fri Feb 8 22:59:30 2008 @@ -1,53 +1,53 @@ -Window NT Device Driver Kit -END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE - -IMPORTANT-READ CAREFULLY: This Microsoft End-User License Agreement ("EULA") is a legal agreement between you (either an individual or a single entity) and Microsoft Corporation for the Microsoft software product identified above, which includes computer software and associated media and printed materials, and may include "online" or electronic documentation ("SOFTWARE PRODUCT" or "SOFTWARE"). By installing, copying, or otherwise using the SOFTWARE PRODUCT, you agree to be bound by the terms of this EULA. If you do not agree to the terms of this EULA, promptly return the unused SOFTWARE PRODUCT to the place from which you obtained it for a full refund, or if you received the SOFTWARE PRODUCT as part of a subscription or other service from Microsoft, you may cancel the subscription and receive a refund of a prorata portion of the subscription price. - -SOFTWARE PRODUCT LICENSE -The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold. To develop Windows NT(tm) device drivers, you will need to utilize two computers, one for development and one for debugging. - -1. GRANT OF LICENSE. This EULA grants you the following limited, non-exclusive rights: -* SOFTWARE PRODUCT. (a) You may make two (2) copies of the SOFTWARE PRODUCT for installation and use on two (2) computers, one for use in development and one for use in debugging to design, develop, and test your software product(s), including but not limited to device driver(s) and other software products, for use with Microsoft(r) Windows(r) or Windows NT ("Software Product"). You may make an additional copy of the Windows NT Workstation operating system (licensed and provided separately) for use on a single computer used for debugging purposes. -* Microsoft Developer Network Subscriber. If you acquired the SOFTWARE PRODUCT through a subscription to the Microsoft Developer Network, and you are either an individual developer or an individual designated within a single entity, you are granted the following additional rights with respect to the SOFTWARE PRODUCT: (a) you may make and use copies of the SOFTWARE PRODUCT on up to ten (10) separate computers, provided that you are the only individual using the SOFTWARE PRODUCT on each such computer, and (b) if you are a single entity, you may designate one individual within your organization to have the right to use the SOFTWARE PRODUCT in the manner described herein. -* SAMPLE CODE. You may modify the sample source code ("Sample Code") to design, develop and test your Software Product, and reproduce and distribute the Sample Code with such modifications in source and object code forms, provided that you comply with the Distribution Requirements described below. -* DISTRIBUTION REQUIREMENTS. You may copy and redistribute the Sample Code as described above, provided that (a) you distribute the Sample Code only in conjunction with and as a part of your Software Product; (b) you do not make any statements to the effect or which imply that your Software Product is "certified" by Microsoft or that its performance is guaranteed by Microsoft; (c) you do not use Microsoft's name, logo, or trademarks to market your Software Product; (d) you include a valid copyright notice on your Software Product; and (e) you indemnify, hold harmless, and defend Microsoft from and against any claims or lawsuits, including attorneys' fees, that arise or result from the use or distribution of your Software Product. Contact Microsoft for the applicable royalties due and other licensing terms for all other uses and/or distribution of the Sample Code -* Microsoft reserves all rights not expressly granted to you. - -2. COPYRIGHT. All right, title, and copyrights in and to the SOFTWARE PRODUCT (including but not limited to any images, photographs, animations, video, audio, music, text, and "applets" incorporated into the SOFTWARE PRODUCT), and any copies of the SOFTWARE PRODUCT, are owned by Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material except that you may either (a) make one copy of the SOFTWARE PRODUCT solely for backup or archival purposes, or (b) install the SOFTWARE PRODUCT on a single computer, provided you keep the original solely for backup or archival purposes. You may not copy the printed materials accompanying the SOFTWARE PRODUCT. - -3. PRERELEASE CODE. The SOFTWARE PRODUCT may contain PRERELEASE CODE that is not at the level of performance and compatibility of the final, generally available, product offering. These portions of the SOFTWARE PRODUCT may not operate correctly and may be substantially modified prior to first commercial shipment. Microsoft is not obligated to make this or any later version of the SOFTWARE PRODUCT commercially available. Microsoft grants you the right to distribute test versions of your Application created using the PRERELEASE CODE provided you comply with the Distribution Requirements described in Section 1 and the following additional provisions: (a) you must mark the test version of your Application "BETA" and (b) you are solely responsible for updating your customers with versions of your Application that operate satisfactorily with the final commercial release of the PRERELEASE CODE. - -4. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. -( Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse-engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation. -( Rental. You may not rent or lease the SOFTWARE PRODUCT. -( Software Transfer. You may permanently transfer all of your rights under this EULA, provided you retain no copies, you transfer all of the SOFTWARE PRODUCT (including all component parts, the media and printed materials, any upgrades, this EULA, and, if applicable, the Certificate of Authenticity), and the recipient agrees to the terms of this EULA. If the SOFTWARE PRODUCT is an upgrade, any transfer must include all prior versions of the SOFTWARE PRODUCT. -( Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts. - -5. EXPORT RESTRICTIONS. You agree that neither you nor your customers intend to or will, directly or indirectly, export or transmit (a) the SOFTWARE PRODUCT or related documentation and technical data or (b) your Application as described in Section 1 of this Agreement (or any part thereof), or process, or service that is the direct product of the SOFTWARE PRODUCT to any country to which such export or transmission is restricted by any applicable U.S. regulation or statute, without the prior written consent, if required, of the Bureau of Export Administration of the U.S. Department of Commerce, or such other governmental entity as may have jurisdiction over such export or transmission. - -NO WARRANTIES. To the maximum extent permitted by applicable law, Microsoft expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation are provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties of merchantability or fitness for a particular purpose. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you. - -LIMITATION OF LIABILITY. Microsoft's entire liability and your exclusive remedy under this EULA shall not exceed one hundred dollars (US$100.00). - -NO LIABILITY FOR CONSEQUENTIAL DAMAGES. To the maximum extent permitted by applicable law, in no event shall Microsoft or its suppliers be liable for any damages whatsoever (including, without limitation, damages for loss of business profit, business interruption, loss of business information, or any other pecuniary loss) arising out of the use or inability to use this Microsoft product, even if Microsoft has been advised of the possibility of such damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to you. - -U.S. GOVERNMENT RESTRICTED RIGHTS.The SOFTWARE and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of The Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software -- Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399. - -If you acquired this product in the United States, this Agreement is governed by the laws of the State of Washington. If you acquired this product outside the United States, local law may apply. - -Should you have any questions concerning this Agreement, if you desire rights to use the product beyond what is listed here, or if you desire to contact Microsoft for any reason, please contact your local Microsoft subsidiary or sales office or write to: Microsoft Sales and Service, One Microsoft Way, Redmond, WA 98052-6399. - -Si vous avez acquis votre produit Microsoft au CANADA, la garantie limitée suivante vous concerne : - -GARANTIE LIMITÉE - -EXCLUSION DE GARANTIES. Microsoft renonce entièrement à toute garantie pour le LOGICIEL. Le LOGICIEL et toute autre documentation s'y rapportant sont fournis «comme tels» sans aucune garantie quelle qu'elle soit, expresse ou implicite, y compris, mais ne se limitant pas, aux garanties implicites de la qualité marchande ou un usage particulier. Le risque total découlant de l'utilisation ou de la performance du LOGICIEL est entre vos mains. - -RESPONSABILITÉ LIMITÉE. La seule obligation de Microsoft et votre recours exclusif concernant ce contrat n'excèderont pas cent dollars (US$100.00). - -ABSENCE DE RESPONSABILITÉ POUR LES DOMMAGES INDIRECTS. Microsoft ou ses fournisseurs ne pourront être tenus responsables en aucune circonstance de tout dommage quel qu'il soit (y compris mais non de façon limitative aux dommages directs ou indirects causés par la perte de bénéfices commerciaux, l'interruption des affaires, la perte d'information commerciale ou toute autre perte pécuniaire) résultant de l'utilisation ou de l'impossibilité d'utilisation de ce produit, et ce, même si la société Microsoft a été avisée de l'éventualité de tels dommages. Certains états/juridictions ne permettent pas l'exclusion ou la limitation de responsabilité relative aux dommages indirects ou consécutifs, et la limitation ci-dessus peut ne pas s'appliquer à votre égard. - -La présente Convention est régie par les lois de la province d'Ontario, Canada. Chacune des parties à la présente reconnaît irrévocablement la compétence des tribunaux de la province d'Ontario et consent à instituer tout litige qui pourrait découler de la présente auprès des tribunaux situés dans le district judiciaire de York, province d'Ontario. - -Au cas où vous auriez des questions concernant cette licence ou que vous désiriez vous mettre en rapport avec Microsoft pour quelque raison que ce soit, veuillez contacter la succursale Microsoft desservant votre pays, dont l'adresse est fournie dans ce produit, ou écrire à : Microsoft Customer Sales and Service, One Microsoft Way, Redmond, Washington 98052-6399. - +Window NT Device Driver Kit +END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE + +IMPORTANT-READ CAREFULLY: This Microsoft End-User License Agreement ("EULA") is a legal agreement between you (either an individual or a single entity) and Microsoft Corporation for the Microsoft software product identified above, which includes computer software and associated media and printed materials, and may include "online" or electronic documentation ("SOFTWARE PRODUCT" or "SOFTWARE"). By installing, copying, or otherwise using the SOFTWARE PRODUCT, you agree to be bound by the terms of this EULA. If you do not agree to the terms of this EULA, promptly return the unused SOFTWARE PRODUCT to the place from which you obtained it for a full refund, or if you received the SOFTWARE PRODUCT as part of a subscription or other service from Microsoft, you may cancel the subscription and receive a refund of a prorata portion of the subscription price. + +SOFTWARE PRODUCT LICENSE +The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold. To develop Windows NT(tm) device drivers, you will need to utilize two computers, one for development and one for debugging. + +1. GRANT OF LICENSE. This EULA grants you the following limited, non-exclusive rights: +* SOFTWARE PRODUCT. (a) You may make two (2) copies of the SOFTWARE PRODUCT for installation and use on two (2) computers, one for use in development and one for use in debugging to design, develop, and test your software product(s), including but not limited to device driver(s) and other software products, for use with Microsoft(r) Windows(r) or Windows NT ("Software Product"). You may make an additional copy of the Windows NT Workstation operating system (licensed and provided separately) for use on a single computer used for debugging purposes. +* Microsoft Developer Network Subscriber. If you acquired the SOFTWARE PRODUCT through a subscription to the Microsoft Developer Network, and you are either an individual developer or an individual designated within a single entity, you are granted the following additional rights with respect to the SOFTWARE PRODUCT: (a) you may make and use copies of the SOFTWARE PRODUCT on up to ten (10) separate computers, provided that you are the only individual using the SOFTWARE PRODUCT on each such computer, and (b) if you are a single entity, you may designate one individual within your organization to have the right to use the SOFTWARE PRODUCT in the manner described herein. +* SAMPLE CODE. You may modify the sample source code ("Sample Code") to design, develop and test your Software Product, and reproduce and distribute the Sample Code with such modifications in source and object code forms, provided that you comply with the Distribution Requirements described below. +* DISTRIBUTION REQUIREMENTS. You may copy and redistribute the Sample Code as described above, provided that (a) you distribute the Sample Code only in conjunction with and as a part of your Software Product; (b) you do not make any statements to the effect or which imply that your Software Product is "certified" by Microsoft or that its performance is guaranteed by Microsoft; (c) you do not use Microsoft's name, logo, or trademarks to market your Software Product; (d) you include a valid copyright notice on your Software Product; and (e) you indemnify, hold harmless, and defend Microsoft from and against any claims or lawsuits, including attorneys' fees, that arise or result from the use or distribution of your Software Product. Contact Microsoft for the applicable royalties due and other licensing terms for all other uses and/or distribution of the Sample Code +* Microsoft reserves all rights not expressly granted to you. + +2. COPYRIGHT. All right, title, and copyrights in and to the SOFTWARE PRODUCT (including but not limited to any images, photographs, animations, video, audio, music, text, and "applets" incorporated into the SOFTWARE PRODUCT), and any copies of the SOFTWARE PRODUCT, are owned by Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material except that you may either (a) make one copy of the SOFTWARE PRODUCT solely for backup or archival purposes, or (b) install the SOFTWARE PRODUCT on a single computer, provided you keep the original solely for backup or archival purposes. You may not copy the printed materials accompanying the SOFTWARE PRODUCT. + +3. PRERELEASE CODE. The SOFTWARE PRODUCT may contain PRERELEASE CODE that is not at the level of performance and compatibility of the final, generally available, product offering. These portions of the SOFTWARE PRODUCT may not operate correctly and may be substantially modified prior to first commercial shipment. Microsoft is not obligated to make this or any later version of the SOFTWARE PRODUCT commercially available. Microsoft grants you the right to distribute test versions of your Application created using the PRERELEASE CODE provided you comply with the Distribution Requirements described in Section 1 and the following additional provisions: (a) you must mark the test version of your Application "BETA" and (b) you are solely responsible for updating your customers with versions of your Application that operate satisfactorily with the final commercial release of the PRERELEASE CODE. + +4. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. +( Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse-engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation. +( Rental. You may not rent or lease the SOFTWARE PRODUCT. +( Software Transfer. You may permanently transfer all of your rights under this EULA, provided you retain no copies, you transfer all of the SOFTWARE PRODUCT (including all component parts, the media and printed materials, any upgrades, this EULA, and, if applicable, the Certificate of Authenticity), and the recipient agrees to the terms of this EULA. If the SOFTWARE PRODUCT is an upgrade, any transfer must include all prior versions of the SOFTWARE PRODUCT. +( Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts. + +5. EXPORT RESTRICTIONS. You agree that neither you nor your customers intend to or will, directly or indirectly, export or transmit (a) the SOFTWARE PRODUCT or related documentation and technical data or (b) your Application as described in Section 1 of this Agreement (or any part thereof), or process, or service that is the direct product of the SOFTWARE PRODUCT to any country to which such export or transmission is restricted by any applicable U.S. regulation or statute, without the prior written consent, if required, of the Bureau of Export Administration of the U.S. Department of Commerce, or such other governmental entity as may have jurisdiction over such export or transmission. + +NO WARRANTIES. To the maximum extent permitted by applicable law, Microsoft expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation are provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties of merchantability or fitness for a particular purpose. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you. + +LIMITATION OF LIABILITY. Microsoft's entire liability and your exclusive remedy under this EULA shall not exceed one hundred dollars (US$100.00). + +NO LIABILITY FOR CONSEQUENTIAL DAMAGES. To the maximum extent permitted by applicable law, in no event shall Microsoft or its suppliers be liable for any damages whatsoever (including, without limitation, damages for loss of business profit, business interruption, loss of business information, or any other pecuniary loss) arising out of the use or inability to use this Microsoft product, even if Microsoft has been advised of the possibility of such damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to you. + +U.S. GOVERNMENT RESTRICTED RIGHTS.The SOFTWARE and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of The Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software -- Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399. + +If you acquired this product in the United States, this Agreement is governed by the laws of the State of Washington. If you acquired this product outside the United States, local law may apply. + +Should you have any questions concerning this Agreement, if you desire rights to use the product beyond what is listed here, or if you desire to contact Microsoft for any reason, please contact your local Microsoft subsidiary or sales office or write to: Microsoft Sales and Service, One Microsoft Way, Redmond, WA 98052-6399. + +Si vous avez acquis votre produit Microsoft au CANADA, la garantie limitée suivante vous concerne : + +GARANTIE LIMITÉE + +EXCLUSION DE GARANTIES. Microsoft renonce entièrement à toute garantie pour le LOGICIEL. Le LOGICIEL et toute autre documentation s'y rapportant sont fournis «comme tels» sans aucune garantie quelle qu'elle soit, expresse ou implicite, y compris, mais ne se limitant pas, aux garanties implicites de la qualité marchande ou un usage particulier. Le risque total découlant de l'utilisation ou de la performance du LOGICIEL est entre vos mains. + +RESPONSABILITÉ LIMITÉE. La seule obligation de Microsoft et votre recours exclusif concernant ce contrat n'excèderont pas cent dollars (US$100.00). + +ABSENCE DE RESPONSABILITÉ POUR LES DOMMAGES INDIRECTS. Microsoft ou ses fournisseurs ne pourront être tenus responsables en aucune circonstance de tout dommage quel qu'il soit (y compris mais non de façon limitative aux dommages directs ou indirects causés par la perte de bénéfices commerciaux, l'interruption des affaires, la perte d'information commerciale ou toute autre perte pécuniaire) résultant de l'utilisation ou de l'impossibilité d'utilisation de ce produit, et ce, même si la société Microsoft a été avisée de l'éventualité de tels dommages. Certains états/juridictions ne permettent pas l'exclusion ou la limitation de responsabilité relative aux dommages indirects ou consécutifs, et la limitation ci-dessus peut ne pas s'appliquer à votre égard. + +La présente Convention est régie par les lois de la province d'Ontario, Canada. Chacune des parties à la présente reconnaît irrévocablement la compétence des tribunaux de la province d'Ontario et consent à instituer tout litige qui pourrait découler de la présente auprès des tribunaux situés dans le district judiciaire de York, province d'Ontario. + +Au cas où vous auriez des questions concernant cette licence ou que vous désiriez vous mettre en rapport avec Microsoft pour quelque raison que ce soit, veuillez contacter la succursale Microsoft desservant votre pays, dont l'adresse est fournie dans ce produit, ou écrire à : Microsoft Customer Sales and Service, One Microsoft Way, Redmond, Washington 98052-6399. + Propchange: trunk/reactos/drivers/storage/class/class2/license.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 32229: Use a generic .spec file, instead of a .def file per architecture
by hpoussin＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: hpoussin Date: Fri Feb 8 22:46:17 2008 New Revision: 32229 URL: http://svn.reactos.org/svn/reactos?rev=32229&view=rev Log: Use a generic .spec file, instead of a .def file per architecture Added: trunk/reactos/drivers/storage/scsiport/scsiport.spec (with props) Removed: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def trunk/reactos/drivers/storage/scsiport/scsiport_i386.def Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Fri Feb 8 22:46:17 2008 @@ -3,10 +3,11 @@ <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <define name="_SCSIPORT_" /> - <importlibrary definition="scsiport_$(ARCH).def" /> + <importlibrary definition="scsiport.spec.def" /> <include base="scsiport">.</include> <library>ntoskrnl</library> <library>hal</library> <file>scsiport.c</file> <file>scsiport.rc</file> + <file>scsiport.spec</file> </module> Added: trunk/reactos/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.spec (added) +++ trunk/reactos/drivers/storage/scsiport/scsiport.spec Fri Feb 8 22:46:17 2008 @@ -1,0 +1,45 @@ +@ cdecl ScsiDebugPrint() +@ stdcall ScsiPortCompleteRequest(ptr long long long long) +@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) +@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger +@ stdcall ScsiPortFlushDma(ptr) +@ stdcall ScsiPortFreeDeviceBase(ptr ptr) +@ stdcall ScsiPortGetBusData(ptr long long long ptr long) +@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long) +@ stdcall ScsiPortGetLogicalUnit(ptr long long long) +@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long) +@ stdcall ScsiPortGetSrb(ptr long long long long) +@ stdcall ScsiPortGetUncachedExtension(ptr ptr long) +@ stdcall ScsiPortGetVirtualAddress(ptr long long) +@ stdcall ScsiPortInitialize(ptr ptr ptr ptr) +@ stdcall ScsiPortIoMapTransfer(ptr ptr long long) +@ stdcall ScsiPortLogError(ptr ptr long long long long long) +@ stdcall ScsiPortMoveMemory(ptr ptr long) +@ cdecl ScsiPortNotification() +@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +@ stdcall ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) +@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor +@ stdcall ScsiPortValidateRange(ptr long long long long long long) +@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG Propchange: trunk/reactos/drivers/storage/scsiport/scsiport.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (removed) @@ -1,51 +1,0 @@ -; -; scsiport.def - export definition file for scsiport driver -; -LIBRARY SCSIPORT.SYS -EXPORTS -ScsiDebugPrint -ScsiPortCompleteRequest -ScsiPortConvertPhysicalAddressToUlong -ScsiPortConvertUlongToPhysicalAddress=NTOSKRNL.RtlConvertUlongToLargeInteger -ScsiPortFlushDma -ScsiPortFreeDeviceBase -ScsiPortGetBusData -ScsiPortGetDeviceBase -ScsiPortGetLogicalUnit -ScsiPortGetPhysicalAddress -ScsiPortGetSrb -ScsiPortGetUncachedExtension -ScsiPortGetVirtualAddress -ScsiPortInitialize -ScsiPortIoMapTransfer -ScsiPortLogError -ScsiPortMoveMemory -ScsiPortNotification -ScsiPortReadPortBufferUchar=HAL.READ_PORT_BUFFER_UCHAR -ScsiPortReadPortBufferUshort=HAL.READ_PORT_BUFFER_USHORT -ScsiPortReadPortBufferUlong=HAL.READ_PORT_BUFFER_ULONG -ScsiPortReadPortUchar=HAL.READ_PORT_UCHAR -ScsiPortReadPortUshort=HAL.READ_PORT_USHORT -ScsiPortReadPortUlong=HAL.READ_PORT_ULONG -ScsiPortReadRegisterBufferUchar=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -ScsiPortReadRegisterBufferUshort=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -ScsiPortReadRegisterBufferUlong=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -ScsiPortReadRegisterUchar=NTOSKRNL.READ_REGISTER_UCHAR -ScsiPortReadRegisterUshort=NTOSKRNL.READ_REGISTER_USHORT -ScsiPortReadRegisterUlong=NTOSKRNL.READ_REGISTER_ULONG -ScsiPortSetBusDataByOffset -ScsiPortStallExecution=HAL.KeStallExecutionProcessor -ScsiPortValidateRange -ScsiPortWritePortUchar=HAL.WRITE_PORT_UCHAR -ScsiPortWritePortUshort=HAL.WRITE_PORT_USHORT -ScsiPortWritePortUlong=HAL.WRITE_PORT_ULONG -ScsiPortWritePortBufferUchar=HAL.WRITE_PORT_BUFFER_UCHAR -ScsiPortWritePortBufferUshort=HAL.WRITE_PORT_BUFFER_USHORT -ScsiPortWritePortBufferUlong=HAL.WRITE_PORT_BUFFER_ULONG -ScsiPortWriteRegisterBufferUchar=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -ScsiPortWriteRegisterBufferUshort=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -ScsiPortWriteRegisterBufferUlong=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -ScsiPortWriteRegisterUchar=NTOSKRNL.WRITE_REGISTER_UCHAR -ScsiPortWriteRegisterUshort=NTOSKRNL.WRITE_REGISTER_USHORT -ScsiPortWriteRegisterUlong=NTOSKRNL.WRITE_REGISTER_ULONG -;EOF Removed: trunk/reactos/drivers/storage/scsiport/scsiport_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_i386.def (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_i386.def (removed) @@ -1,51 +1,0 @@ -; -; scsiport.def - export definition file for scsiport driver -; -LIBRARY SCSIPORT.SYS -EXPORTS -ScsiDebugPrint -ScsiPortCompleteRequest@20 -ScsiPortConvertPhysicalAddressToUlong@8 -ScsiPortConvertUlongToPhysicalAddress(a)4=NTOSKRNL.RtlConvertUlongToLargeInteger -ScsiPortFlushDma@4 -ScsiPortFreeDeviceBase@8 -ScsiPortGetBusData@24 -ScsiPortGetDeviceBase@28 -ScsiPortGetLogicalUnit@16 -ScsiPortGetPhysicalAddress@16 -ScsiPortGetSrb@20 -ScsiPortGetUncachedExtension@12 -ScsiPortGetVirtualAddress@12 -ScsiPortInitialize@16 -ScsiPortIoMapTransfer@16 -ScsiPortLogError@28 -ScsiPortMoveMemory@12 -ScsiPortNotification -ScsiPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR -ScsiPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT -ScsiPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG -ScsiPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR -ScsiPortReadPortUshort(a)4=HAL.READ_PORT_USHORT -ScsiPortReadPortUlong(a)4=HAL.READ_PORT_ULONG -ScsiPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -ScsiPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -ScsiPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -ScsiPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR -ScsiPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT -ScsiPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG -ScsiPortSetBusDataByOffset@28 -ScsiPortStallExecution(a)4=HAL.KeStallExecutionProcessor -ScsiPortValidateRange@28 -ScsiPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR -ScsiPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT -ScsiPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG -ScsiPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR -ScsiPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT -ScsiPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG -ScsiPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -ScsiPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -ScsiPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -ScsiPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR -ScsiPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT -ScsiPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG -;EOF

1 0

[hpoussin] 32228: Add WINEBUILD_FLAGS, and set it to --kill-at for ARM
by hpoussin＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: hpoussin Date: Fri Feb 8 22:45:30 2008 New Revision: 32228 URL: http://svn.reactos.org/svn/reactos?rev=32228&view=rev Log: Add WINEBUILD_FLAGS, and set it to --kill-at for ARM Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=322… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild (original) +++ trunk/reactos/ReactOS-arm.rbuild Fri Feb 8 22:45:30 2008 @@ -12,6 +12,7 @@ <define name="_ARM_" /> <define name="__arm__" /> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> <if property="OPTIMIZE" value="1"> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Feb 8 22:45:30 2008 @@ -1275,10 +1275,10 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", NULL ); Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source) $(module_rbuild) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source_path)$(SEP)$(source_name_noext).spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n", + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );

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