Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29605: fixing few compiling issue with this new header.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 22:27:56 2007 New Revision: 29605 URL: http://svn.reactos.org/svn/reactos?rev=29605&view=rev Log: fixing few compiling issue with this new header. Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 22:27:56 2007 @@ -10,11 +10,10 @@ extern PDRVFN gpDxFuncs; typedef HANDLE (NTAPI* PGD_PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); -typedef HDC (NTAPI *PGD_DDGETDC(HANDLE, PALETTEENTRY *); +typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL); typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); -typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY(HANDLE, PDD_GETAVAILDRIVERMEMORYDATA); typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); typedef NTSTATUS (NTAPI *PGD_DXDDCLEANUPDXGRAPHICS) (VOID); @@ -45,18 +44,18 @@ /* From dvp.c */ typedef DWORD (NTAPI* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA); typedef DWORD (NTAPI* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA); -typedef DWORD (NTAPI* PGD_DVPCREATEVIDEOPORT(HANDLE, PDD_CREATEVPORTDATA); -typedef DWORD (NTAPI* PGD_DVPDESTROYVIDEOPORT(HANDLE, PDD_DESTROYVPORTDATA); +typedef DWORD (NTAPI* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA); +typedef DWORD (NTAPI* PGD_DVPDESTROYVIDEOPORT)(HANDLE, PDD_DESTROYVPORTDATA); typedef DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA); typedef DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA); -typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(hDirectDraw, puGetVPortFlipStatusData); +typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFLIPSTATUS)(HANDLE, PDD_GETVPORTFLIPSTATUSDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTINPUTFORMATS)(HANDLE, PDD_GETVPORTINPUTFORMATDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTLINE)(HANDLE, PDD_GETVPORTLINEDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTOUTPUTFORMATS)(HANDLE, PDD_GETVPORTOUTPUTFORMATDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTCONNECTINFO)(HANDLE, PDD_GETVPORTCONNECTDATA); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOSIGNALSTATUS)(HANDLE, PDD_GETVPORTSIGNALDATA); typedef DWORD (NTAPI *PGD_DXDVPUPDATEVIDEOPORT)(HANDLE, HANDLE*, HANDLE*, PDD_UPDATEVPORTDATA); -typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(hVideoPort, puWaitForVPortSyncData); +typedef DWORD (NTAPI *PGD_DXDVPWAITFORVIDEOPORTSYNC)(HANDLE, PDD_WAITFORVPORTSYNCDATA); typedef DWORD (NTAPI *PGD_DXDVPACQUIRENOTIFICATION)(HANDLE, HANDLE*, LPDDVIDEOPORTNOTIFY); typedef DWORD (NTAPI *PGD_DXDVPRELEASENOTIFICATION)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DXDVPGETVIDEOPORTFIELD)(HANDLE, PDD_GETVPORTFIELDDATA); @@ -87,7 +86,7 @@ typedef DWORD (NTAPI *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL); typedef DWORD (NTAPI *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA); typedef DWORD (NTAPI *PGD_DXDDLOCK)(HANDLE, PDD_LOCKDATA, HDC); -typedef DWORD (NTAPI *PGD_DXDDUNLOCK(HANDLE, PDD_UNLOCKDATA ); +typedef DWORD (NTAPI *PGD_DXDDUNLOCK)(HANDLE, PDD_UNLOCKDATA ); typedef DWORD (NTAPI *PGD_DDBLT)(HANDLE, HANDLE, PDD_BLTDATA); typedef DWORD (NTAPI *PGD_DXDDSETCOLORKEY)(HANDLE, PDD_SETCOLORKEYDATA); typedef DWORD (NTAPI *PGD_DDADDATTACHEDSURFACE)(HANDLE, HANDLE,PDD_ADDATTACHEDSURFACEDATA);

1 0

[dreimer] 29604: Bug 2747: French translations by Pierre Schweitzer (heis_spiter@hotmail.com) Bug 2722: Desk.cpl : Italian translation (carlo.bramix@libero.it)
by dreimer＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: dreimer Date: Mon Oct 15 18:14:25 2007 New Revision: 29604 URL: http://svn.reactos.org/svn/reactos?rev=29604&view=rev Log: Bug 2747: French translations by Pierre Schweitzer (heis_spiter(a)hotmail.com) Bug 2722: Desk.cpl : Italian translation (carlo.bramix(a)libero.it) Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Mon Oct 15 18:14:25 2007 @@ -1,0 +1,89 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDC_EVENTVWR MENU +BEGIN + POPUP "Journa&l" + BEGIN + MENUITEM "&Application", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Securité", ID_LOG_SECURITY + MENUITEM "&Système", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Quitter", IDM_EXIT + END + POPUP "Affichage" + BEGIN + MENUITEM "&Rafraîchir", IDM_REFRESH + END + MENUITEM "&Options", ID_OPTIONS + POPUP "Aide" + BEGIN + MENUITEM "Aide", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&À propos...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "À propos" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "Visionneuse des événements ReactOS Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER +CAPTION "Patientez.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Chargement des journaux d'événements. Veuillez patienter ...",IDC_STATIC,49,15,119,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Détail de l'événement" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Fermer",IDOK,12,258,50,14 + PUSHBUTTON "&Précédent",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "Suiva&nt",IDNEXT,144,258,50,14 + PUSHBUTTON "Aide",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Description:",IDC_STATIC,15,70,39,8 + LTEXT "Date:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Heure:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Utilisateur:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "Ordinateur:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "EventID :",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Source:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Type:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Catégorie:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "Données",IDC_STATIC,14,194,16,8 + CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Visionneuse d'événements" + IDC_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Mon Oct 15 18:14:25 2007 @@ -11,3 +11,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" 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 Mon Oct 15 18:14:25 2007 @@ -138,11 +138,11 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Attaché", ID_MENU_ATTACHED + MENUITEM "&Principal", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Identifier", ID_MENU_IDENTIFY + MENUITEM "P&ropriétés", ID_MENU_PROPERTIES END END Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Mon Oct 15 18:14:25 2007 @@ -126,9 +126,9 @@ IDR_PREVIEW_MENU MENU BEGIN - MENUITEM "Normal", ID_MENU_NORMAL - MENUITEM "Disabled", ID_MENU_DISABLED - MENUITEM "Selected", ID_MENU_SELECTED + MENUITEM "Normale", ID_MENU_NORMAL + MENUITEM "Disattivato", ID_MENU_DISABLED + MENUITEM "Selezionato", ID_MENU_SELECTED END IDM_MONITOR_MENU MENU Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Mon Oct 15 18:14:25 2007 @@ -112,121 +112,121 @@ IDD_ADD2 DIALOG 20, 20, 257, 176 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Add Input Language" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 +CAPTION "Ajouter une langue de saisie" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + AUTOCHECKBOX "Reconnaissance de l'écriture manuelle:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + AUTOCHECKBOX "Vocale:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + AUTOCHECKBOX "Plus de services de texte:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 199, 155, 50, 14 } IDD_ADD3 DIALOG 20, 20, 257, 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Add Input Language" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 +CAPTION "Ajouter une langue de saisie" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + AUTOCHECKBOX "Reconnaissance de l'écriture manuelle:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + AUTOCHECKBOX "Vocale:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 199, 126, 50, 14 } IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 9, 5, 209, 60 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 LTEXT "SHIFT", -1, 179, 37, 27, 12 CTEXT "+", -1, 168, 37, 8, 9 AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 227, 44, 50, 14 } IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 LTEXT "SHIFT", -1, 73, 87, 27, 12 CTEXT "+", -1, 62, 87, 8, 9 CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "Accent &grave ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14 } IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "Accent &grave ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 LTEXT "SHIFT", -1, 73, 87, 27, 12 CTEXT "+", -1, 62, 87, 8, 9 AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14 } IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" { LTEXT "", 1240, 16, 5, 250, 10 GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + AUTOCHECKBOX "Activ&er la séquence de touche", 1249, 17, 17, 85, 8 CTEXT "SHIFT", -1, 68, 37, 27, 12 CTEXT "+", -1, 57, 37, 8, 9 CTEXT "+", -1, 98, 37, 8, 10 AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Key:", -1, 110, 37, 14, 10 + AUTORADIOBUTTON "&ALT gauche", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "Touche:", -1, 110, 37, 14, 10 COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 212, 47, 50, 14 } /* FIXME : To improve/complete */ @@ -234,9 +234,9 @@ STRINGTABLE BEGIN //Selected language on "Add Input language" - IDS_SELECTED_LANGUAGE "English (United States)" + IDS_SELECTED_LANGUAGE "Anglais (États-Unis)" //Selected keyboard layout on "Add Input language" - IDS_SELECTED_LAYOUT, "United States-Dvorak" + IDS_SELECTED_LAYOUT, "États-Unis-Dvorak" IDS_CPLSYSTEMNAME "Services texte et langue de saisie" IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." IDS_US_LAYOUT, "US"

1 0

[dreimer] 29603: Bug 2747: French translations by Pierre Schweitzer (heis_spiter@hotmail.com)
by dreimer＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: dreimer Date: Mon Oct 15 18:12:48 2007 New Revision: 29603 URL: http://svn.reactos.org/svn/reactos?rev=29603&view=rev Log: Bug 2747: French translations by Pierre Schweitzer (heis_spiter(a)hotmail.com) Added: trunk/rosapps/write/Fr.rc (with props) Modified: trunk/rosapps/write/rsrc.rc Added: trunk/rosapps/write/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Fr.rc?rev=29603&view… ============================================================================== --- trunk/rosapps/write/Fr.rc (added) +++ trunk/rosapps/write/Fr.rc Mon Oct 15 18:12:48 2007 @@ -1,0 +1,26 @@ +/* + * English language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Le lancement de Wordpad a échoué" +} Propchange: trunk/rosapps/write/Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=29603&r1… ============================================================================== --- trunk/rosapps/write/rsrc.rc (original) +++ trunk/rosapps/write/rsrc.rc Mon Oct 15 18:12:48 2007 @@ -25,4 +25,5 @@ #include "De.rc" #include "En.rc" +#include "Fr.rc" #include "Ko.rc"

1 0

[hpoussin] 29602: Update msvc backend, so Colin Finck will maybe stop complaining...
by hpoussin＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: hpoussin Date: Mon Oct 15 17:43:51 2007 New Revision: 29602 URL: http://svn.reactos.org/svn/reactos?rev=29602&view=rev Log: Update msvc backend, so Colin Finck will maybe stop complaining... Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Mon Oct 15 17:43:51 2007 @@ -29,7 +29,6 @@ #include <vector> #include "msvc.h" -#include "../mingw/mingw.h" using std::string; using std::vector; Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Mon Oct 15 17:43:51 2007 @@ -121,15 +121,6 @@ const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ ) { - - // explicitly omit win32api directories - if ( !strncmp(incs[i]->directory->relative_path.c_str(), "w32api", 6 ) ) - continue; - - // explicitly omit include/wine directories - if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\wine", 12 ) ) - continue; - string path = Path::RelativeFromDirectory ( incs[i]->directory->relative_path, module.output->relative_path ); Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Oct 15 17:43:51 2007 @@ -187,15 +187,16 @@ continue; } } - // add to another list win32api and include/wine directories - if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) || - !strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) || + // switch between general headers and ros headers + if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) || !strncmp(incs[i]->directory->relative_path.c_str(), "include\\GL", 10 ) || - !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) || - !strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) || !strncmp(incs[i]->directory->relative_path.c_str(), "include\\reactos\\wine", 20 ) ) { - includes_ros.push_back ( path ); + if (strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 )) + // not crt include + includes_ros.push_back ( path ); } else { @@ -226,11 +227,11 @@ baseaddr = prop.value; } } - /* include intermediate path for reactos.rc */ - string version = intdir + "\\include\\reactos"; - includes.push_back (version); - - string include_string; + /* include intermediate path for reactos.rc */ + string version = intdir + "\\include\\reactos"; + includes.push_back (version); + + string include_string; fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); fprintf ( OUT, "<VisualStudioProject\r\n" );

1 0

[greatlrd] 29601: adding one more api to dxeng.c
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 17:10:59 2007 New Revision: 29601 URL: http://svn.reactos.org/svn/reactos?rev=29601&view=rev Log: adding one more api to dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Mon Oct 15 17:10:59 2007 @@ -64,7 +64,7 @@ } /************************************************************************/ -/* Enumate all drivers in win32k */ +/* DxEngEnumerateHdev */ /************************************************************************/ /* Enumate all drivers in win32k */ HDEV * @@ -75,4 +75,18 @@ return 0; } +/************************************************************************/ +/* DxEngGetDeviceGammaRamp */ +/************************************************************************/ +/* same protypes NtGdiEngGetDeviceGammaRamp, diffent is we skipp the user mode checks and seh */ +BOOL +DxEngGetDeviceGammaRamp(HDC hDC, LPVOID lpRamp) +{ + /* FIXME redirect it to NtGdiEngGetDeviceGammaRamp internal call */ + DPRINT1("redirect it to NtGdiEngGetDeviceGammaRamp internal call "); + return FALSE; +} + + +

1 0

[greatlrd] 29600: comment some protypes and how they work.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 16:40:29 2007 New Revision: 29600 URL: http://svn.reactos.org/svn/reactos?rev=29600&view=rev Log: comment some protypes and how they work. Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Mon Oct 15 16:40:29 2007 @@ -50,8 +50,22 @@ /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ -/* Check see if termal server got a connections or not */ +/* Notes : Check see if termal server got a connections or not */ BOOL DxEngNUIsTermSrv(); + +/* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ +BOOL DxEngRedrawDesktop(); + +/* Notes : return the DisplayUniqVisrgn counter from gdishare memory */ +ULONG DxEngDispUniq(); + +/* Notes : return the VisRgnUniq counter for win32k */ +ULONG DxEngVisRgnUniq(); + +/* Enumate all drivers in win32k */ +HDEV * +DxEngEnumerateHdev(HDEV *hdev); + @@ -64,22 +78,10 @@ DxEngScreenAccessCheck(); DWORD -DxEngRedrawDesktop(); - -DWORD -DxEngDispUniq(); - -ULONG -DxEngVisRgnUniq(); - -DWORD DxEngLockShareSem(); DWORD DxEngUnlockShareSem(); - -DWORD -DxEngEnumerateHdev(x); DWORD DxEngLockHdev(x); Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Mon Oct 15 16:40:29 2007 @@ -40,7 +40,7 @@ #define DXG_INDEX_DxDdGetBltStatus 0x1D #define DXG_INDEX_DxDdGetDC 0x1E #define DXG_INDEX_DxDdGetDriverInfo 0x1F - +#define DXG_INDEX_DxDdGetDxHandle 0x20 #define DXG_INDEX_DxDdGetFlipStatus 0x21 #define DXG_INDEX_DxDdGetInternalMoCompInfo 0x22 #define DXG_INDEX_DxDdGetMoCompBuffInfo 0x23 @@ -87,7 +87,6 @@ #define DXG_INDEX_DxDvpReleaseNotification 0x49 /* not addedd yet */ -#define DXG_INDEX_DxDdGetDxHandle 0x20 #define DXG_INDEX_DxDdReleaseDC 0x2C #define DXG_INDEX_DxDdResetVisrgn 0x2E #define DXG_INDEX_DxDdSetGammaRamp 0x31

1 0

[greatlrd] 29599: start implement the dxeng driver api that are need it for dxg.sys I manger kill of some local tree with this commit. ReactX can not be build
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 16:38:50 2007 New Revision: 29599 URL: http://svn.reactos.org/svn/reactos?rev=29599&view=rev Log: start implement the dxeng driver api that are need it for dxg.sys I manger kill of some local tree with this commit. ReactX can not be build Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (with props) Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 16:38:50 2007 @@ -4,6 +4,7 @@ #include <ddrawint.h> #include <ddkernel.h> #include <reactos/drivers/directx/dxg.h> +#include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ extern PDRVFN gpDxFuncs; Added: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (added) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Mon Oct 15 16:38:50 2007 @@ -1,0 +1,78 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver enumate of dxeng implementation + * FILE: subsys/win32k/ntddraw/dxeng.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + +#include <w32k.h> +#include <debug.h> + +/************************************************************************/ +/* DxEngNUIsTermSrv */ +/************************************************************************/ + +/* Notes : Check see if termal server got a connections or not */ +BOOL +DxEngNUIsTermSrv() +{ + /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */ + DPRINT1("We need termal server connections check"); + return FALSE; +} + +/************************************************************************/ +/* DxEngRedrawDesktop */ +/************************************************************************/ + +/* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ +BOOL +DxEngRedrawDesktop() +{ + /* FIXME add redraw code */ + DPRINT1("We need add code for redraw whole desktop"); + return TRUE; +} + + +/************************************************************************/ +/* DxEngDispUniq */ +/************************************************************************/ + +/* Notes : return the DisplayUniqVisrgn counter from gdishare memory */ +ULONG +DxEngDispUniq() +{ + /* FIXME DisplayUniqVisrgn from gdishare memory */ + DPRINT1("We need DisplayUniqVisrgn from gdishare memory"); + return 0; +} + +/************************************************************************/ +/* DxEngVisRgnUniq */ +/************************************************************************/ +/* Notes : return the VisRgnUniq counter for win32k */ +ULONG +DxEngVisRgnUniq() +{ + /* FIXME DisplayUniqVisrgn from gdishare memory */ + DPRINT1("We need VisRgnUniq from win32k"); + return 0; +} + +/************************************************************************/ +/* Enumate all drivers in win32k */ +/************************************************************************/ +/* Enumate all drivers in win32k */ +HDEV * +DxEngEnumerateHdev(HDEV *hdev); +{ + /* FIXME Enumate all drivers in win32k */ + DPRINT1("We do not enumate any device from win32k "); + return 0; +} + + Propchange: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ branches/reactx/reactos/subsystems/win32/win32k/win32k.rbuild Mon Oct 15 16:38:50 2007 @@ -99,7 +99,8 @@ <file>d3d.c</file> <file>dvp.c</file> <file>mocomp.c</file> - <file>stubs.c</file> + <file>eng.c</file> + <file>dxeng.c</file> </directory> <directory name="ntuser"> <file>accelerator.c</file>

1 0

[greatlrd] 29598: add two empty folder for now, it si for dxg.sys and dxapi.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 15:03:28 2007 New Revision: 29598 URL: http://svn.reactos.org/svn/reactos?rev=29598&view=rev Log: add two empty folder for now, it si for dxg.sys and dxapi.sys Added: branches/reactx/reactos/drivers/directx/ branches/reactx/reactos/drivers/directx/dxapi/ branches/reactx/reactos/drivers/directx/dxg/

1 0

[greatlrd] 29597: Start Build the next header we need, see https://www.openrce.org/forums/posts/535 only avail docs for it on the net.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 14:57:08 2007 New Revision: 29597 URL: http://svn.reactos.org/svn/reactos?rev=29597&view=rev Log: Start Build the next header we need, see https://www.openrce.org/forums/posts/535 only avail docs for it on the net. Added: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (with props) Added: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (added) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Mon Oct 15 14:57:08 2007 @@ -1,0 +1,195 @@ + +/************************************************************************/ +/* This driver interface are exported from win32k.sys to dxg.sys */ +/************************************************************************/ +#define DXENG_INDEX_Resverd0 0x00 +#define DXENG_INDEX_DxEngNUIsTermSrv 0x01 +#define DXENG_INDEX_DxEngScreenAccessCheck 0x02 +#define DXENG_INDEX_DxEngRedrawDesktop 0x03 +#define DXENG_INDEX_DxEngDispUniq 0x04 +#define DXENG_INDEX_DxEngIncDispUniq 0x05 +#define DXENG_INDEX_DxEngVisRgnUniq 0x06 +#define DXENG_INDEX_DxEngLockShareSem 0x07 +#define DXENG_INDEX_DxEngUnlockShareSem 0x08 +#define DXENG_INDEX_DxEngEnumerateHdev 0x09 +#define DXENG_INDEX_DxEngLockHdev 0x0A +#define DXENG_INDEX_DxEngUnlockHdev 0x0B +#define DXENG_INDEX_DxEngIsHdevLockedByCurrentThread 0x0C +#define DXENG_INDEX_DxEngReferenceHdev 0x0D +#define DXENG_INDEX_DxEngUnreferenceHdev 0x0E +#define DXENG_INDEX_DxEngGetDeviceGammaRamp 0x0F +#define DXENG_INDEX_DxEngSetDeviceGammaRamp 0x10 +#define DXENG_INDEX_DxEngSpTearDownSprites 0x11 +#define DXENG_INDEX_DxEngSpUnTearDownSprites 0x12 +#define DXENG_INDEX_DxEngSpSpritesVisible 0x13 +#define DXENG_INDEX_DxEngGetHdevData 0x14 +#define DXENG_INDEX_DxEngSetHdevData 0x15 +#define DXENG_INDEX_DxEngCreateMemoryDC 0x16 +#define DXENG_INDEX_DxEngGetDesktopDC 0x17 +#define DXENG_INDEX_DxEngDeleteDC 0x18 +#define DXENG_INDEX_DxEngCleanDC 0x19 +#define DXENG_INDEX_DxEngSetDCOwner 0x1A +#define DXENG_INDEX_DxEngLockDC 0x1B +#define DXENG_INDEX_DxEngUnlockDC 0x1C +#define DXENG_INDEX_DxEngSetDCState 0x1D +#define DXENG_INDEX_DxEngGetDCState 0x1E +#define DXENG_INDEX_DxEngSelectBitmap 0x1F +#define DXENG_INDEX_DxEngSetBitmapOwner 0x20 +#define DXENG_INDEX_DxEngDeleteSurface 0x21 +#define DXENG_INDEX_DxEngGetSurfaceData 0x22 +#define DXENG_INDEX_DxEngAltLockSurface 0x23 +#define DXENG_INDEX_DxEngUploadPaletteEntryToSurface 0x24 +#define DXENG_INDEX_DxEngMarkSurfaceAsDirectDraw 0x25 +#define DXENG_INDEX_DxEngSelectPaletteToSurface 0x26 +#define DXENG_INDEX_DxEngSyncPaletteTableWithDevice 0x27 +#define DXENG_INDEX_DxEngSetPaletteState 0x28 +#define DXENG_INDEX_DxEngGetRedirectionBitmap 0x29 +#define DXENG_INDEX_DxEngLoadImage 0x2A + +/************************************************************************/ +/* win32k.sys internal protypes for the driver functions it export */ +/************************************************************************/ + +/* Check see if termal server got a connections or not */ +BOOL DxEngNUIsTermSrv(); + + + +/* prototypes are not done yet, I need gather all my notes + * to make them correct + */ + +/* +DWORD +DxEngScreenAccessCheck(); + +DWORD +DxEngRedrawDesktop(); + +DWORD +DxEngDispUniq(); + +ULONG +DxEngVisRgnUniq(); + +DWORD +DxEngLockShareSem(); + +DWORD +DxEngUnlockShareSem(); + +DWORD +DxEngEnumerateHdev(x); + +DWORD +DxEngLockHdev(x); + +DWORD +DxEngUnlockHdev(x); + +DWORD +DxEngReferenceHdev(x); + +DWORD +DxEngIsHdevLockedByCurrentThread(x); + +DWORD +DxEngReferenceHdev(x); + +DWORD +DxEngUnreferenceHdev(x); + +DWORD +DxEngGetDeviceGammaRamp(x,x); + +DWORD +DxEngSetDeviceGammaRamp(x,x,x); + +DWORD +DxEngSpTearDownSprites(x,x,x); + +DWORD +DxEngSpUnTearDownSprites(x,x,x); + +DWORD +DxEngSpSpritesVisible(x); + +DWORD +DxEngGetHdevData(x,x); + +DWORD +DxEngSetHdevData(x,x,x); + +DWORD +DxEngCreateMemoryDC(x); + +DWORD +DxEngGetDesktopDC(x,x,x); + +DWORD +DxEngDeleteDC(x,x); + +DWORD +DxEngCleanDC(x); + +DWORD +DxEngSetDCOwner(x,x) + +DWORD +DxEngLockDC(x); + +DWORD +DxEngUnlockDC(x); + +DWORD +DxEngSetDCState(x,x,x); + +DWORD +DxEngGetDCState(x,x); + +DWORD +DxEngSelectBitmap(x,x); + +DWORD +DxEngSetBitmapOwner(x,x); + +DWORD +DxEngDeleteSurface(x); + +DWORD +DxEngGetSurfaceData(x,x); + +DWORD +DxEngAltLockSurface(x); + +DWORD +DxEngUploadPaletteEntryToSurface(x,x,x,x); + +DWORD +DxEngMarkSurfaceAsDirectDraw(x,x); + +DWORD +DxEngSelectPaletteToSurface(x,x) + +DWORD +DxEngSyncPaletteTableWithDevice(x,x) + +DWORD +DxEngSetPaletteState(x,x,x) + +DWORD +DxEngGetRedirectionBitmap(x) + +DWORD +DxEngLoadImage(x,x); +*/ + + + + + + + + + + Propchange: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 29596: add one more redirect to dxg.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 13:49:58 2007 New Revision: 29596 URL: http://svn.reactos.org/svn/reactos?rev=29596&view=rev Log: add one more redirect to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 13:49:58 2007 @@ -8,6 +8,7 @@ /* From ddraw.c */ extern PDRVFN gpDxFuncs; +typedef HANDLE (NTAPI* PGD_PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); typedef HDC (NTAPI *PGD_DDGETDC(HANDLE, PALETTEENTRY *); typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Oct 15 13:49:58 2007 @@ -493,7 +493,20 @@ HANDLE hSurface, BOOL bRelease) { - + + PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDxHandle, pfnDdGetDxHandle); + + if (pfnDdGetDxHandle == NULL) + { + DPRINT1("Warring no pfnDdGetDxHandle"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdGetDxHandle"); + return pfnDdGetDxHandle(hDirectDraw, hSurface, bRelease); }

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