Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[greatlrd] 27157: making portcls can be compile now

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jun 12 19:37:30 2007 New Revision: 27157 URL: http://svn.reactos.org/svn/reactos?rev=27157&view=rev Log: making portcls can be compile now Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c trunk/reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port/factory.c trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/drm.c Tue Jun 12 19:37:30 2007 @@ -10,6 +10,7 @@ http://www.osronline.com/ddkx/stream/aud-prop_9f77.htm */ +#include "private.h" #include <portcls.h> #include <drmk.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/helper/ResourceList.c Tue Jun 12 19:37:30 2007 @@ -9,6 +9,7 @@ * 27 Jan 07 Created */ +#include "../private.h" #include <portcls.h> #include <stdunk.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c Tue Jun 12 19:37:30 2007 @@ -9,9 +9,9 @@ * 27 Jan 07 Created */ + +#include "private.h" #include <portcls.h> -#include "private.h" - /* A safe place for IRPs to be bounced to, if no handler has been Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniport.cpp Tue Jun 12 19:37:30 2007 @@ -10,6 +10,7 @@ http://www.osronline.com/ddkx/stream/audmp-routines_64vn.htm */ +#include "../private.h" #include <portcls.h> NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport/IMiniportMidi.cpp Tue Jun 12 19:37:30 2007 @@ -9,7 +9,7 @@ REFERENCE: http://www.osronline.com/ddkx/stream/audmp-routines_1fsj.htm */ - +#include "../private.h" #include <portcls.h> NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPort.cpp Tue Jun 12 19:37:30 2007 @@ -11,7 +11,7 @@ */ #if 0 - +#include "../private.h" #include <stdunk.h> #include <portcls.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port/IPortMidi.cpp Tue Jun 12 19:37:30 2007 @@ -11,7 +11,7 @@ IPortMidi inherits from IPort. This file contains specific extensions. */ - +#include "../private.h" #include <stdunk.h> #include <portcls.h> #include "port.h" Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port/factory.c (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port/factory.c Tue Jun 12 19:37:30 2007 @@ -5,6 +5,7 @@ by Andrew Greenwood */ +#include "../private.h" #include <portcls.h> #include "port.h" Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Tue Jun 12 19:37:30 2007 @@ -9,6 +9,7 @@ * 27 Jan 07 Created */ +#include "private.h" #include <portcls.h> /*

17 years, 12 months

[dgorbachev] 27156: Dutch translation by Joost de Meij (bug report #2300).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Jun 12 19:35:03 2007 New Revision: 27156 URL: http://svn.reactos.org/svn/reactos?rev=27156&view=rev Log: Dutch translation by Joost de Meij (bug report #2300). Added: trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/intl/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc Tue Jun 12 19:35:03 2007 @@ -1,4 +1,6 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie +// Vertaald door Lionel Lowie en Joost de Meij + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -10,7 +12,7 @@ CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 - LTEXT "Select an image to use as your desktop wallpaper:", + LTEXT "Kies een afbeelding als bureaublad achtergrond:", IDC_STATIC, 8, 87, 180, 8 PUSHBUTTON "&Bladeren...", IDC_BROWSE_BUTTON, 187, 135, 50, 14 PUSHBUTTON "&Kleur...", IDC_COLOR_BUTTON, 187, 155, 50, 14 @@ -21,45 +23,45 @@ IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screensaver" +CAPTION "Schermbeveiliging" FONT 8, "MS Shell Dlg", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "&Instellingen",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Voorbeeld",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Wacht",IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 + LTEXT "minuten", IDC_MINTEXT, 70, 125, 26, 9 CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 - GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + GROUPBOX "&Energie van het beeldscherm", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Om de energie instellingen van uw monitor in te stellen, klik op Energie.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "&Energie...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Appearance" +CAPTION "Vormgeving" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 + LTEXT "Kleurenschema:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "Geavan&ceerd", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Advanced Appearance" +CAPTION "Geavanceerde vormgeving" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", @@ -68,29 +70,29 @@ LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "&Grootte", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "Kleur &1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + LTEXT "Kleur &2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "&Lettertype:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "Grootte:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + LTEXT "Kleur:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -101,7 +103,7 @@ BEGIN LTEXT "&Scherm:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Screen area",1818,3,120,115,43 + GROUPBOX "&Schermresolutie",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Minder",1815,9,130,15,8,NOT WS_GROUP @@ -124,8 +126,8 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Display" - IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_CPLNAME "Beelscherm" + IDS_CPLDESCRIPTION "Past het beeldscherm en schermbeveiliging aan." IDS_NONE "(None)" IDS_CENTER "Center" IDS_STRETCH "Stretch" @@ -150,36 +152,36 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "Inactive Window" - IDS_ACTWIN "Active Window" - IDS_WINTEXT "Window Text" - IDS_MESSBOX "Message Box" - IDS_MESSTEXT "Message Text" + IDS_INACTWIN "Niet-actief venster" + IDS_ACTWIN "Actief venster" + IDS_WINTEXT "Venstertekst" + IDS_MESSBOX "Berichtvenster" + IDS_MESSTEXT "Berichttekst" IDS_BUTTEXT "OK" END STRINGTABLE DISCARDABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_1 "Bureaublad" + IDS_ELEMENT_2 "Bijschrift niet-actieve vensters" + IDS_ELEMENT_3 "Rand niet-actieve vensters" + IDS_ELEMENT_4 "Bijschrift actieve vensters" + IDS_ELEMENT_5 "Rand actieve vensters" IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_7 "Oplichtende elementen" + IDS_ELEMENT_8 "Vensters" + IDS_ELEMENT_9 "Schuifbalken" + IDS_ELEMENT_10 "3D objecten" + IDS_ELEMENT_11 "Palettitel" + IDS_ELEMENT_12 "Symbooltitel" + IDS_ELEMENT_13 "Bijschriftbalk" + IDS_ELEMENT_14 "Gedeactiveerde menu elementen" + IDS_ELEMENT_15 "Dialoog" + IDS_ELEMENT_16 "Schuifbalk handvatten" + IDS_ELEMENT_17 "Toepassing achtergrond" + IDS_ELEMENT_18 "Kleine bijschriftbalk" + IDS_ELEMENT_19 "Symbool afstand (horizontaal)" + IDS_ELEMENT_20 "Symbool afstand (verticaal)" IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_22 "Symbool" END Modified: trunk/reactos/dll/cpl/intl/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/nl-NL.rc Tue Jun 12 19:35:03 2007 @@ -95,6 +95,6 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Landinstallingen" + IDS_CPLNAME "Landinstellingen" IDS_CPLDESCRIPTION "Keuze taal en weergave van getallen, valuta's, data en tijden wijzigen." END Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Tue Jun 12 19:35:03 2007 @@ -1,26 +1,28 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie +// Vertaald door Lionel Lowie en Joost de Meij + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speed" +CAPTION "Snelheid" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Character repeat", -1, 5, 5, 230, 130 + GROUPBOX "Tekenherhaling", -1, 5, 5, 230, 130 ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "Repeat &delay", -1, 40, 15, 50, 10 - LTEXT "Long", -1, 40, 30, 20, 10 - LTEXT "Short", -1, 200, 30, 20, 10 + LTEXT "&Herhaalvertraging:", -1, 40, 15, 50, 10 + LTEXT "Lang", -1, 40, 30, 20, 10 + LTEXT "Kort", -1, 200, 30, 20, 10 CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Repeat rate", -1, 40, 70, 50, 10 - LTEXT "Slow", -1, 40, 85, 20, 10 - LTEXT "Fast", -1, 200, 85, 20, 10 + LTEXT "Herhaal&snelheid:", -1, 40, 70, 50, 10 + LTEXT "Langzaam", -1, 40, 85, 20, 10 + LTEXT "Snel", -1, 200, 85, 20, 10 CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 150, 10 + LTEXT "Klik hier en houd een toets ingedrukt om de herhaalsnelheid te testen:", -1, 15, 105, 150, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Cursor &blink rate:", -1, 5, 145, 230, 50 + GROUPBOX "K&nippersnelheid van aanwijzer:", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 - LTEXT "None", -1, 40, 165, 30, 10 - LTEXT "Fast", -1, 200, 165, 30, 10 + LTEXT "Geen", -1, 40, 165, 30, 10 + LTEXT "Snel", -1, 200, 165, 30, 10 CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 END @@ -33,107 +35,107 @@ IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU -CAPTION "Click Lock" +CAPTION "Klikvergrendeling" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Short", -1, 35, 50, 30, 10 - LTEXT "Long", -1, 140, 50, 30, 10 + LTEXT "Kort", -1, 35, 50, 30, 10 + LTEXT "Lang", -1, 140, 50, 30, 10 CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 - LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + PUSHBUTTON "&Annuleren", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Stel in hoe lang de muisknop ingedrukt moet worden voordat de klik vergrendeld is.",-1,60,15,170,30 ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Button" +CAPTION "Knoppen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Button configuration", -1, 5, 5, 230, 70 - CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + GROUPBOX "Configuratie van de muisknoppen", -1, 5, 5, 230, 70 + CHECKBOX "&Primaire en secundaire knop omwisselen", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE - LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 - GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 - LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 - LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 - LTEXT "Fast", -1, 140, 120, 30, 8 + LTEXT "Selecteer dit schakelvakje om de rechter muisknop te gebruiken voor primaire functies zoals selecteren en slepen.", -1, 10, 30, 150, 30 + GROUPBOX "Dubbelklik snelheid", -1, 5, 75, 230, 70 + LTEXT "Dubbelklik op het plaatje om de instelling te testen.", -1, 10, 85, 150, 30 + LTEXT "&Snelheid: Traag", -1, 10, 120, 90, 8 + LTEXT "Snel", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE - GROUPBOX "ClickLock", -1, 5, 150, 230, 70 - CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 - PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 - LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 + GROUPBOX "Klikvergrendeling", -1, 5, 150, 230, 70 + CHECKBOX "Klikvergren&deling inschakelen", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Instellingen...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + LTEXT "Hiermee kunt u selecteren en slepen zonder de muisknop ingedrukt te houden. Druk kort op de muisknop om in te schakelen. Druk nogmaals op de muisknop om weer uit te schakelen.", -1, 10, 180, 190, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Pointer" +CAPTION "Aanwijzer" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Scheme", -1, 5, 5, 170, 45 + GROUPBOX "Schema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 - PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + PUSHBUTTON "&Opslaan als...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Verwijderen", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE - LTEXT "&Customize", -1, 5, 60, 40, 10 + LTEXT "&Aanpassen", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 - PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 - PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 + CHECKBOX "Aanwijzerschaduw &inschakelen", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + PUSHBUTTON "Stan&daard gebruiken", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 + PUSHBUTTON "&Bladeren", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU -CAPTION "Save Scheme" +CAPTION "Schema Opslaan" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 + LTEXT "Sla dit schema op als:", -1, 5, 5, 100, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 + PUSHBUTTON "&Annuleren", IDCANCEL, 115, 45, 50, 15 END IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Pointer Options" +CAPTION "Aanwijzer Opties" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Motion", -1, 5, 5, 230, 60 - LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 - LTEXT "Slow", -1, 60, 30, 20, 10 + GROUPBOX "Beweging", -1, 5, 5, 230, 60 + LTEXT "Sele&cteer een aanwijzer snelheid:", -1, 60, 15, 110, 10 + LTEXT "Traag", -1, 60, 30, 20, 10 CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 - LTEXT "Fast", -1, 170, 30, 20, 10 + LTEXT "Snel", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 - CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 - GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + CHECKBOX "&Verbeter de precisie van de aanwijzer", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 + GROUPBOX "Uitlijnen", -1, 5, 65, 230, 40 + CHECKBOX "A&utomatisch de aanwijzer op de standaardknop plaatsen in dialoogvensters", IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - GROUPBOX "Visibility", -1, 5, 105, 230, 95 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + GROUPBOX "Zichtbaarheid", -1, 5, 105, 230, 95 + CHECKBOX "&Aanwijzerspoor weergeven", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 - CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 + CHECKBOX "&Aanwijzer verbergen tijdens het typen", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", + CHECKBOX "&Laat zien waar de aanwijzer is met de CTRL toets", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Wheel" +CAPTION "Bladerwieltje" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Scrolling", -1, 5, 5, 230, 80 + GROUPBOX "Schuiven", -1, 5, 5, 230, 80 ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 - LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 - RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP - RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + LTEXT "Bij elke rolbeweging van het bladerwieltje:", -1, 60, 15, 150, 10 + RADIOBUTTON "Dit &aantal regels verschuiven:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&Een scherm tegelijk verschuiven", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END @@ -144,27 +146,27 @@ IDS_CPLDESCRIPTION_1 "De instellingen voor de muis wijzigen." IDS_CPLNAME_2 "Toetsenbord" IDS_CPLDESCRIPTION_2 "De instellingen voor het toetsenbord wijzigen." - IDS_ARROW "Normal Select" - IDS_HELP "Help Select" - IDS_APPSTARTING "Working in Background" - IDS_WAIT "Busy" - IDS_CROSSHAIR "Precision Select" - IDS_IBEAM "Text Select" - IDS_NWPEN "Handwriting" - IDS_NO "Unavailable" - IDS_SIZENS "Vertical Resize" - IDS_SIZEWE "Horizontal Resize" - IDS_SIZENWSE "Diagonal Resize 1" - IDS_SIZENESW "Diagonal Resize 2" - IDS_SIZEALL "Move" - IDS_UPARROW "Alternative Select" - IDS_HAND "Link Select" - IDS_NONE "(None)" - IDS_SYSTEM_SCHEME "(system scheme)" - IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" - IDS_BROWSE_TITLE "Browse" - IDS_REMOVE_TITLE "Confirm Scheme Removal" - IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" - IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" - IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" + IDS_ARROW "Normale Selectie" + IDS_HELP "Help Selecteren" + IDS_APPSTARTING "Bezig op de achtergrond" + IDS_WAIT "Bezig" + IDS_CROSSHAIR "Precies Selecteren" + IDS_IBEAM "Tekst Selecteren" + IDS_NWPEN "Handschrift" + IDS_NO "Onbeschikbaar" + IDS_SIZENS "Verticaal Formaat wijzigen" + IDS_SIZEWE "Horizontaal Formaat wijzigen" + IDS_SIZENWSE "Diagonaal Formaat wijzigen 1" + IDS_SIZENESW "Diagonaal Formaat wijzigen 2" + IDS_SIZEALL "Verplaatsen" + IDS_UPARROW "Alternatief Selecteren" + IDS_HAND "Link Selecteren" + IDS_NONE "(Geen)" + IDS_SYSTEM_SCHEME "(Systeem Schema)" + IDS_BROWSE_FILTER "Aanwijzers (*.ani, *.cur)\0*.ani;*.cur\0Bewegende aanwijzers (*.ani)\0*.ani\0Statische aanwijzers (*.cur)\0*.cur\0Alle Bestanden\0*.*\0\0" + IDS_BROWSE_TITLE "Bladeren" + IDS_REMOVE_TITLE "Bevestig verwijderen schema" + IDS_REMOVE_TEXT "Weet u zeker dat u aanwijzer schema '%s' wilt verwijderen?" + IDS_OVERWRITE_TITLE "Bevestig het overschrijven van dit schema" + IDS_OVERWRITE_TEXT "Het aanwijzer schema met die naam is al in gebruik. Wilt u het bestaande aanwijzer schema overschrijven?" END Added: trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/nl-N… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc Tue Jun 12 19:35:03 2007 @@ -1,0 +1,162 @@ +// Vertaling door Joost de Meij + +LANGUAGE LANG_DUTCH, SUBLANG_DUTCH + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Energie schema's" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 + LTEXT "Selecteer het energie schema met de beste instellingen voor deze computer. Instellingen worden gewijzigd in het geselecteerde schema.", + -1,45,13,194,36 + GROUPBOX "&Energie schema's", -1, 7,57,240,46 + COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Opslaan als...", -1, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Verwijderen", -1, 180,85,55,15,WS_DISABLED + GROUPBOX "Onbekend", IDC_GRPDETAIL, 7,108,240,105 + LTEXT "Wanneer computer:",IDC_SAT,15,120,60,10 + LTEXT "Op netvoeding werkt",IDC_SAC,100,120,45,15 + ICON IDI_AC, IDC_IAC, 75,115,25,15 + LTEXT "Op batterijen werkt",IDC_SDC,197,120,45,15 + ICON IDI_DC, IDC_IDC, 165,115,25,15 + LTEXT "Beeldscherm &uitschakelen:",IDC_MONITOR,15,145,80,10 + COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "V&aste schijven uitschakelen:",IDC_DISK,15,160,80,10 + COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Op stand-&by:",IDC_STANDBY,15,180,80,10 + COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "In slaapstand:",IDC_HYBERNATE,15,195,80,10 + COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Waarschuwingen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Low battery alarm",-1,10,15,235,95 + CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + LTEXT "Onbekend",IDC_ALARMVALUE1,200,25,40,10 + LTEXT "0%",-1,20,40,15,15 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 + LTEXT "100%",-1,215,40,25,10 + PUSHBUTTON "Alar&m Action...",-1,20,70,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,70,50,10 + LTEXT "Onbekend",IDC_ALARMMSG1,145,70,95,10 + LTEXT "Action:",-1,95,80,45,10 + LTEXT "Onbekend",IDC_ALARMAKTION1,145,80,95,10 + LTEXT "Run Program:",-1,95,90,50,10 + LTEXT "Onbekend",IDC_ALARMPROG1,150,90,40,10 + + GROUPBOX "Critical battery alarm",-1,10,115,235,95 + CONTROL "Activate &low battery alarm when power level reaches:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + LTEXT "Onbekend",IDC_ALARMVALUE2,200,125,40,10 + LTEXT "0%",-1,20,140,15,15 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 + LTEXT "100%",-1,215,140,25,10 + PUSHBUTTON "Alar&m Action...",-1,20,170,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,170,50,10 + LTEXT "Onbekend",IDC_ALARMMSG2,145,170,95,10 + LTEXT "Action:",-1,95,180,45,10 + LTEXT "Onbekend",IDC_ALARMAKTION2,145,180,95,10 + LTEXT "Run Program:",-1,95,190,50,10 + LTEXT "Onbekend",IDC_ALARMPROG2,150,190,40,10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Geavanceerd" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC,5,5,20,20 + LTEXT "Selecteer de energiebesparende instellingen die u wilt gebruiken.",-1,30,5,205,20 + GROUPBOX "Opties",-1,5,35,225,55 + CONTROL "&Pictogram altijd in het systeemvak weergeven",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,45,200,10 + CONTROL "&Wachtwoord vragen als de computer uit stand-by wordt gehaald",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,55,200,10 + CONTROL "&Beeldscherm dimmen als de computer op batterijen werkt.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,65,200,10 + GROUPBOX "Energie knoppen",-1,5,100,230,105 + LTEXT "W&anneer ik het deksel van mijn computer sluit:", IDC_SLIDCLOSE,10,110,210,10 + COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Wanneer ik de aan/&uit-schakelaar van de computer indruk:", IDC_SPOWERBUTTON,10,135,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Wanneer ik de slaap&knop van de computer indruk:", IDC_SSLEEPBUTTON,10,165,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Slaapstand" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + LTEXT "Als de computer in de slaapstand gaat, wordt de hele inhoud van het geheugen op schijf opgeslagen, waarna de computer wordt afgesloten. Zodra de computer uit de slaapstand komt, wordt de oude situatie hersteld.", + -1,35,5,195,35 + GROUPBOX "Slaapstand",-1,5,45,235,25 + CONTROL "&Slaapstand inschakelen",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,55,210,10 + GROUPBOX "Schijfruimte voor slaapstand",-1,5,80,240,60 + LTEXT "Beschikbare schijfruimte:",-1,10,90,100,10 + LTEXT "Onbekend",IDC_FREESPACE,120,90,70,10 + LTEXT "Benodigde schijfruimte voor slaapstand:",-1,10,100,115,10 + LTEXT "Onbekend",IDC_SPACEFORHIBERNATEFILE,120,100,55,10 + LTEXT "U heeft onvoldoende schijfruimte om slaapstand in te schakelen. ",IDC_TOLESSFREESPACE,10,115,220,20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Energie opties" + IDS_CPLDESCRIPTION_1 "Configure energy-saving settings for your computer." + IDS_PROCENT "%i%%" + IDS_SOUND "Sound" + IDS_TEXT "Text" + IDS_CONFIG1 "Settings for %1 power scheme" + IDS_CONFIG2 "Advanced settings for %1" + + IDS_SIZEBYTS "%i bytes" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "Doe niets" + + IDS_PowerActionNone1 "Geen actie" + IDS_PowerActionUnknown "Onbekend" + IDS_PowerActionSleep "Stand-by" + IDS_PowerActionHibernate "Slaapstand" + IDS_PowerActionShutdown "Afsluiten" + IDS_PowerActionRestart "Opnieuw opstarten" + IDS_PowerActionShutdownOff "Afsluiten en uitschakelen" + IDS_PowerActionWarmEject "Mij vragen wat te doen" + IDS_PowerActionNone2 "Niets" + + IDS_TIMEOUT1 "Na 1 minuut" + IDS_TIMEOUT2 "Na 2 minuten" + IDS_TIMEOUT3 "Na 3 minuten" + IDS_TIMEOUT4 "Na 5 minuten" + IDS_TIMEOUT5 "Na 10 minuten" + IDS_TIMEOUT6 "Na 15 minuten" + IDS_TIMEOUT7 "Na 20 minuten" + IDS_TIMEOUT8 "Na 25 minuten" + IDS_TIMEOUT9 "Na 30 minuten" + IDS_TIMEOUT10 "Na 45 minuten" + IDS_TIMEOUT11 "Na 1 uur" + IDS_TIMEOUT12 "Na 2 uur" + IDS_TIMEOUT13 "Na 3 uur" + IDS_TIMEOUT14 "Na 4 uur" + IDS_TIMEOUT15 "Na 5 uur" + IDS_TIMEOUT16 "Nooit" +END + Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Tue Jun 12 19:35:03 2007 @@ -20,8 +20,8 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/th-TH.rc" -

17 years, 12 months

[greatlrd] 27155: fixing some header problem for portcls

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jun 12 19:23:28 2007 New Revision: 27155 URL: http://svn.reactos.org/svn/reactos?rev=27155&view=rev Log: fixing some header problem for portcls Modified: trunk/reactos/include/ddk/punknown.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h (original) +++ trunk/reactos/include/ddk/punknown.h Tue Jun 12 19:23:28 2007 @@ -21,6 +21,8 @@ IUnknown */ +#ifndef __IUnknown_INTERFACE_DEFINED__ +#define __IUnknown_INTERFACE_DEFINED__ DEFINE_GUID( IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46); @@ -41,6 +43,7 @@ STDMETHOD_(ULONG, Release)( THIS ) PURE; }; +#endif #undef INTERFACE Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Tue Jun 12 19:23:28 2007 @@ -132,7 +132,10 @@ struct _DRIVE_LAYOUT_INFORMATION; struct _DRIVE_LAYOUT_INFORMATION_EX; +#ifndef _SECURITY_ATTRIBUTES_ +#define _SECURITY_ATTRIBUTES_ typedef PVOID PSECURITY_DESCRIPTOR; +#endif typedef ULONG SECURITY_INFORMATION, *PSECURITY_INFORMATION; typedef PVOID PSID; Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Jun 12 19:23:28 2007 @@ -2539,6 +2539,9 @@ } TOKEN_USER, *PTOKEN_USER; typedef DWORD SECURITY_INFORMATION,*PSECURITY_INFORMATION; typedef WORD SECURITY_DESCRIPTOR_CONTROL,*PSECURITY_DESCRIPTOR_CONTROL; + +#ifndef _SECURITY_ATTRIBUTES_ +#define _SECURITY_ATTRIBUTES_ typedef struct _SECURITY_DESCRIPTOR { BYTE Revision; BYTE Sbz1; @@ -2548,6 +2551,7 @@ PACL Sacl; PACL Dacl; } SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; +#endif typedef struct _SECURITY_DESCRIPTOR_RELATIVE { BYTE Revision; BYTE Sbz1;

17 years, 12 months

[greatlrd] 27154: adding include windows.h it take care for some macro was not declare and COM macro are only in psdk what I known, still create compiling issue

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jun 12 14:26:47 2007 New Revision: 27154 URL: http://svn.reactos.org/svn/reactos?rev=27154&view=rev Log: adding include windows.h it take care for some macro was not declare and COM macro are only in psdk what I known, still create compiling issue Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Tue Jun 12 14:26:47 2007 @@ -7,6 +7,7 @@ #ifndef PORTCLS_PRIVATE_H #define PORTCLS_PRIVATE_H +#include <windows.h> #include <ntddk.h> #include <debug.h>

17 years, 12 months

[hpoussin] 27153: Do not create a new device node if we already know the PDO

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jun 12 12:38:32 2007 New Revision: 27153 URL: http://svn.reactos.org/svn/reactos?rev=27153&view=rev Log: Do not create a new device node if we already know the PDO Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Jun 12 12:38:32 2007 @@ -135,7 +135,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to reference driver object, status=0x%08x\n", Status); + DPRINT("Failed to reference driver object, status=0x%08x\n", Status); return Status; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Tue Jun 12 12:38:32 2007 @@ -694,7 +694,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; + DeviceNode = IopGetDeviceNode(DeviceObject); switch (Operation) { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue Jun 12 12:38:32 2007 @@ -2574,6 +2574,11 @@ */ for (i = 0; i < DeviceRelations->Count; i++) { + if (IopGetDeviceNode(DeviceRelations->Objects[i]) != NULL) + { + ObDereferenceObject(DeviceRelations->Objects[i]); + continue; + } Status = IopCreateDeviceNode( DeviceNode, DeviceRelations->Objects[i],

17 years, 12 months

[arty] 27152: Working syscall. Should be good for both usermode and kernel mode.

by arty＠svn.reactos.org

Author: arty Date: Tue Jun 12 12:03:54 2007 New Revision: 27152 URL: http://svn.reactos.org/svn/reactos?rev=27152&view=rev Log: Working syscall. Should be good for both usermode and kernel mode. Modified: branches/powerpc/reactos/lib/rtl/powerpc/debug.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Modified: branches/powerpc/reactos/lib/rtl/powerpc/debug.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/powerpc… ============================================================================== --- branches/powerpc/reactos/lib/rtl/powerpc/debug.c (original) +++ branches/powerpc/reactos/lib/rtl/powerpc/debug.c Tue Jun 12 12:03:54 2007 @@ -15,14 +15,14 @@ (ULONG Service, const void *Buffer, ULONG Length, PVOID Arg1, PVOID Arg2) { NTSTATUS Result; - __asm__("mr 3,%1\n\t" - "mr 4,%2\n\t" - "mr 5,%3\n\t" - "mr 6,%4\n\t" - "mr 7,%5\n\t" - "mr 8,%6\n\t" + __asm__("mr 3,%2\n\t" + "mr 4,%3\n\t" + "mr 5,%4\n\t" + "mr 6,%5\n\t" + "mr 7,%6\n\t" + "mr 8,%1\n\t" "sc\n\t" - "mr %0,3\n\t" : + "mr %0,3\n\t" : "=r" (Result) : "r" (0x10000), "r" (Service), Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c Tue Jun 12 12:03:54 2007 @@ -40,56 +40,14 @@ ".globl syscall_end\n\t" ".globl KiSystemService\n\t" "syscall_start:\n\t" - "mtsprg1 1\n\t" - "lis 1,_kernel_trap_stack_top@ha\n\t" - "addi 1,1,_kernel_trap_stack_top@l\n\t" + "mr 2,1\n\t" + "lis 1,KiSystemService1@ha\n\t" + "addi 1,1,KiSystemService1@l\n\t" + "mfsrr0 0\n\t" + "mtsrr0 1\n\t" + "lis 1,_kernel_trap_stack@ha\n\t" + "addi 1,1,_kernel_trap_stack@l\n\t" "subi 1,1,0x100\n\t" - "stw 0,0(1)\n\t" - "mfsprg1 0\n\t" /* 10 */ - "stw 0,4(1)\n\t" - "stw 2,8(1)\n\t" - "stw 3,12(1)\n\t" - "stw 4,16(1)\n\t" /* 20 */ - "stw 5,20(1)\n\t" - "stw 6,24(1)\n\t" - "stw 7,28(1)\n\t" - "stw 8,32(1)\n\t" /* 30 */ - "stw 9,36(1)\n\t" - "stw 10,40(1)\n\t" - "stw 11,44(1)\n\t" - "stw 12,48(1)\n\t" /* 40 */ - "stw 13,52(1)\n\t" - "stw 14,56(1)\n\t" - "stw 15,60(1)\n\t" - "stw 16,64(1)\n\t" /* 50 */ - "stw 17,68(1)\n\t" - "stw 18,72(1)\n\t" - "stw 19,76(1)\n\t" - "stw 20,80(1)\n\t" /* 60 */ - "stw 21,84(1)\n\t" - "stw 22,88(1)\n\t" - "stw 23,92(1)\n\t" - "stw 24,96(1)\n\t" /* 70 */ - "stw 25,100(1)\n\t" - "stw 26,104(1)\n\t" - "stw 27,108(1)\n\t" - "stw 28,112(1)\n\t" /* 80 */ - "stw 29,116(1)\n\t" - "stw 30,120(1)\n\t" - "stw 31,124(1)\n\t" - "mflr 0\n\t" /* 90 */ - "stw 0,128(1)\n\t" - "mfctr 0\n\t" - "stw 0,132(1)\n\t" - "mfsrr0 0\n\t" /* a0 */ - "stw 0,136(1)\n\t" - "mfsrr1 0\n\t" - "stw 0,140(1)\n\t" - "mfdsisr 0\n\t" /* b0 */ - "stw 0,144(1)\n\t" - "lis 3,KiSystemService@ha\n\t" /* b8 */ - "addi 3,3,KiSystemService@l\n\t" /* bc */ - "mtsrr0 3\n\t" "rfi\n\t" "syscall_end:\n\t" ".space 4"); Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Tue Jun 12 12:03:54 2007 @@ -749,16 +749,93 @@ return Return; } +ULONG +NTAPI +KdpServiceDispatcher(ULONG Service, PCHAR Buffer, ULONG Length); + +__asm__(".globl KiSystemService\n\t" + ".globl KiSystemService1\n\t" + ".globl kiss_proceed\n\t" + ".globl kiss_end\n" + "KiSystemService1:\n\t" + "stw 2,4(1)\n\t" // r1 + "stw 3,12(1)\n\t" + "stw 4,16(1)\n\t" + "stw 5,20(1)\n\t" + "stw 6,24(1)\n\t" + "stw 7,28(1)\n\t" + "stw 8,32(1)\n\t" + "stw 9,36(1)\n\t" + "stw 10,40(1)\n\t" + "stw 11,44(1)\n\t" + "stw 12,48(1)\n\t" + "stw 13,52(1)\n\t" + "stw 14,56(1)\n\t" + "stw 15,60(1)\n\t" + "stw 16,64(1)\n\t" + "stw 17,68(1)\n\t" + "stw 18,72(1)\n\t" + "stw 19,76(1)\n\t" + "stw 20,80(1)\n\t" + "stw 21,84(1)\n\t" + "stw 22,88(1)\n\t" + "stw 23,92(1)\n\t" + "stw 24,96(1)\n\t" + "stw 25,100(1)\n\t" + "stw 26,104(1)\n\t" + "stw 27,108(1)\n\t" + "stw 28,112(1)\n\t" + "stw 29,116(1)\n\t" + "stw 30,120(1)\n\t" + "stw 31,124(1)\n\t" + /* This save is important */ + "stw 0,140(1)\n\t" // srr0 + "mflr 0\n\t" + "stw 0,128(1)\n\t" + "mfctr 0\n\t" + "stw 0,136(1)\n\t" + "mfsrr1 0\n\t" + "stw 0,144(1)\n\t" + "mfdsisr 0\n\t" + "stw 0,148(1)\n\t" + "mfdar 0\n\t" + "stw 0,152(1)\n\t" + "lis 3,KiSystemService@ha\n\t" + "addi 3,3,KiSystemService@l\n\t" + "mtctr 3\n\t" + "mr 3,1\n\t" + "subi 1,1,0x100\n\t" + "bctrl\n\t" + "addi 1,1,0x100\n\t" + /* Return from kernel */ + "lwz 3,12(1)\n\t" /* Result */ + "lwz 0,128(1)\n\t" + "mtlr 0\n\t" + "lwz 0,140(1)\n\t" + "mtsrr0 0\n\t" + "lwz 0,144(1)\n\t" + "mtsrr1 0\n\t" + "lwz 1,4(1)\n" /* Stack */ + "rfi\n"); + VOID NTAPI -KiSystemService() +KiSystemService(ppc_trap_frame_t *trap_frame) { SetPhysByte(0x800003f8, 'S'); SetPhysByte(0x800003f8, 'C'); SetPhysByte(0x800003f8, '!'); SetPhysByte(0x800003f8, '\r'); SetPhysByte(0x800003f8, '\n'); - while(1); + switch(trap_frame->gpr[8]) + { + case 0x10000: /* DebugService */ + trap_frame->gpr[3] = KdpServiceDispatcher + (trap_frame->gpr[3], + (PCHAR)trap_frame->gpr[4], + trap_frame->gpr[5]); + break; + } } /* EOF */

17 years, 12 months

[fireball] 27151: Massive changes to the driver loading / device creation logic (as a result of collaborative work with Herve): - Really reuse the driver's object, instead of always failing in "IopGetDriverObject()". Fix driver's object creation accordingly in NtLoadDriver() and IopActionInitChildServices(). - Move InvalidateRelations to a later stage, when it really should happen (previously it just delayed the boot process but couldn't load any driver since boot device was inaccessible and reu

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jun 12 02:02:55 2007 New Revision: 27151 URL: http://svn.reactos.org/svn/reactos?rev=27151&view=rev Log: Massive changes to the driver loading / device creation logic (as a result of collaborative work with Herve): - Really reuse the driver's object, instead of always failing in "IopGetDriverObject()". Fix driver's object creation accordingly in NtLoadDriver() and IopActionInitChildServices(). - Move InvalidateRelations to a later stage, when it really should happen (previously it just delayed the boot process but couldn't load any driver since boot device was inaccessible and reusing drivers loaded by the bootloader was not possible). - Minor bugfixes in various places related to these changes. - Add DPRINTs for easier debugging and failure tracking (silent failure is the worst enemy of a developer). Results: - VMWare video driver regression is gone. - "New device found" wizard appears in the 3rd stage like in "old good times". - Network drivers hang somewhere, so a hack is added to temporarily disable installation of pcnet.sys. Modified: trunk/reactos/media/inf/netamd.inf trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Tue Jun 12 02:02:55 2007 @@ -18,7 +18,7 @@ %AMDMfg% = AMDMfg [AMDMfg] -%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 +;%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 ;----------------------------- PCNET DRIVER ----------------------------- Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Jun 12 02:02:55 2007 @@ -125,7 +125,7 @@ /* Open driver object */ Status = ObReferenceObjectByName( &DriverName, - OBJ_OPENIF | OBJ_KERNEL_HANDLE, /* Attributes */ + OBJ_OPENIF | OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, /* Attributes */ NULL, /* PassedAccessState */ 0, /* DesiredAccess */ IoDriverObjectType, @@ -134,9 +134,14 @@ (PVOID*)&Object); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference driver object, status=0x%08x\n", Status); return Status; + } *DriverObject = Object; + + DPRINT("Driver Object: %p\n", Object); return STATUS_SUCCESS; } @@ -498,7 +503,10 @@ &ServiceName, FALSE); if (!NT_SUCCESS(Status)) + { + DPRINT1("IopGetDriverObject() returned status 0x%08x!\n", Status); continue; + } } Status = IopInitializeDevice(DeviceNode, DriverObject); @@ -772,6 +780,7 @@ /* * Initialize the driver */ + DeviceNode->Flags |= DN_DRIVER_LOADED; Status = IopInitializeDriverModule(DeviceNode, LdrEntry, &DeviceNode->ServiceName, FALSE, &DriverObject); @@ -813,6 +822,8 @@ LDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; UNICODE_STRING DriverName; + + DPRINT("IopInitializeBootDrivers()"); /* Use IopRootDeviceNode for now */ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode); @@ -874,6 +885,7 @@ /* Make sure we didn't load this driver already */ if (!(LdrEntry->Flags & LDRP_ENTRY_INSERTED)) { + DPRINT("Initializing bootdriver %wZ\n", &LdrEntry->BaseDllName); /* Initialize it */ IopInitializeBuiltinDriver(LdrEntry); } @@ -1233,7 +1245,7 @@ DriverObject->DriverSize = SizeOfImage; /* Finally, call its init function */ - DPRINT("RegistryKey: %wZ\n", RegistryKey); + DPRINT("RegistryKey: %wZ\n", RegistryPath); DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); Status = (*InitializationFunction)(DriverObject, RegistryPath); if (!NT_SUCCESS(Status)) @@ -1584,42 +1596,55 @@ goto ReleaseCapturedString; } - /* - * Load the driver module - */ - - Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); + /* Get existing DriverObject pointer (in case the driver has + already been loaded and initialized) */ + Status = IopGetDriverObject( + &DriverObject, + &ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); + if (!NT_SUCCESS(Status)) { - DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); - IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; - } - - /* - * Set a service name for the device node - */ - - RtlCreateUnicodeString(&DeviceNode->ServiceName, ServiceName.Buffer); - - /* - * Initialize the driver module - */ - - Status = IopInitializeDriverModule( - DeviceNode, - ModuleObject, - &DeviceNode->ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), - &DriverObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); - MmUnloadSystemImage(ModuleObject); - IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; + /* + * Load the driver module + */ + + Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); + if (!NT_SUCCESS(Status) && Status != STATUS_IMAGE_ALREADY_LOADED) + { + DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); + IopFreeDeviceNode(DeviceNode); + goto ReleaseCapturedString; + } + + /* + * Set a service name for the device node + */ + + RtlCreateUnicodeString(&DeviceNode->ServiceName, ServiceName.Buffer); + + /* + * Initialize the driver module if it's loaded for the first time + */ + if (Status != STATUS_IMAGE_ALREADY_LOADED) + { + Status = IopInitializeDriverModule( + DeviceNode, + ModuleObject, + &DeviceNode->ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), + &DriverObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); + MmUnloadSystemImage(ModuleObject); + IopFreeDeviceNode(DeviceNode); + goto ReleaseCapturedString; + } + } } IopInitializeDevice(DeviceNode, DriverObject); Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Tue Jun 12 02:02:55 2007 @@ -497,19 +497,19 @@ /* Initialize PnP manager */ PnpInit(); + /* Create the group driver list */ + IoCreateDriverList(); + + /* Load boot start drivers */ + IopInitializeBootDrivers(); + + /* Call back drivers that asked for */ + IopReinitializeBootDrivers(); + /* Initialize PnP root relations */ IoSynchronousInvalidateDeviceRelations(IopRootDeviceNode-> PhysicalDeviceObject, BusRelations); - - /* Create the group driver list */ - IoCreateDriverList(); - - /* Load boot start drivers */ - IopInitializeBootDrivers(); - - /* Call back drivers that asked for */ - IopReinitializeBootDrivers(); /* Create ARC names for boot devices */ IopCreateArcNames(LoaderBlock); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue Jun 12 02:02:55 2007 @@ -865,6 +865,7 @@ Status = PnpRootCreateDevice(ServiceName, &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { + DPRINT1("PnpRootCreateDevice() failed with status 0x%08X\n", Status); ExFreePool(Node); return Status; } @@ -2369,29 +2370,44 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; + /* Get existing DriverObject pointer (in case the driver has + already been loaded and initialized) */ + Status = IopGetDriverObject( + &DriverObject, + &DeviceNode->ServiceName, + FALSE); + + if (!NT_SUCCESS(Status)) + { + /* Driver is not initialized, try to load it */ Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); + if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { + /* STATUS_IMAGE_ALREADY_LOADED means this driver + was loaded by the bootloader */ if (Status != STATUS_IMAGE_ALREADY_LOADED) { + /* Initialize the driver */ DeviceNode->Flags |= DN_DRIVER_LOADED; Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &DeviceNode->ServiceName, FALSE, &DriverObject); } else { - /* get existing DriverObject pointer */ - Status = IopGetDriverObject( - &DriverObject, - &DeviceNode->ServiceName, - FALSE); + Status = STATUS_SUCCESS; } + } + } + + /* Driver is loaded and initialized at this point */ if (NT_SUCCESS(Status)) { /* Attach lower level filter drivers. */ IopAttachFilterDrivers(DeviceNode, TRUE); /* Initialize the function driver for the device node */ Status = IopInitializeDevice(DeviceNode, DriverObject); + if (NT_SUCCESS(Status)) { /* Attach upper level filter drivers. */ @@ -2401,7 +2417,6 @@ Status = IopStartDevice(DeviceNode); } } - } else { /*

17 years, 12 months

[hpoussin] 27150: Always complete the IRP_MJ_PNP irp, even if we don't recognize the minor function

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jun 12 01:26:51 2007 New Revision: 27150 URL: http://svn.reactos.org/svn/reactos?rev=27150&view=rev Log: Always complete the IRP_MJ_PNP irp, even if we don't recognize the minor function Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Tue Jun 12 01:26:51 2007 @@ -483,7 +483,8 @@ break; default: - return Irp->IoStatus.Status; + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); break; }

17 years, 12 months

[fireball] 27149: - hpoussin: If minor function is not recognized, you must not change the Irp->IoStatus.Status field.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jun 12 01:20:25 2007 New Revision: 27149 URL: http://svn.reactos.org/svn/reactos?rev=27149&view=rev Log: - hpoussin: If minor function is not recognized, you must not change the Irp->IoStatus.Status field. Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Tue Jun 12 01:20:25 2007 @@ -483,7 +483,7 @@ break; default: - return STATUS_NOT_IMPLEMENTED; + return Irp->IoStatus.Status; break; }

17 years, 12 months

[tkreuzer] 27148: - use LOGFONTW structure from GetFontResourceInfo for face name - use LF_FULLFACESIZE - some cleanup

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 12 00:38:55 2007 New Revision: 27148 URL: http://svn.reactos.org/svn/reactos?rev=27148&view=rev Log: - use LOGFONTW structure from GetFontResourceInfo for face name - use LF_FULLFACESIZE - some cleanup Modified: trunk/rosapps/fontview/display.c trunk/rosapps/fontview/display.h trunk/rosapps/fontview/fontview.c Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=271… ============================================================================== --- trunk/rosapps/fontview/display.c (original) +++ trunk/rosapps/fontview/display.c Tue Jun 12 00:38:55 2007 @@ -35,7 +35,7 @@ typedef struct { int nPageHeight; - WCHAR szTypeFaceName[MAX_TYPEFACENAME]; + WCHAR szTypeFaceName[LF_FULLFACESIZE]; WCHAR szFormat[MAX_FORMAT]; WCHAR szString[MAX_STRING]; @@ -81,9 +81,8 @@ HFONT hOldFont; TEXTMETRIC tm; int i, y; - const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; WCHAR szSize[5]; - WCHAR szCaption[MAX_TYPEFACENAME + 20]; + WCHAR szCaption[LF_FULLFACESIZE + 20]; /* This is the location on the DC where we draw */ y = -nYPos; @@ -132,7 +131,7 @@ GetTextMetrics(hDC, &tm); y += tm.tmHeight + 1; SelectObject(hDC, pData->hSizeFont); - swprintf(szSize, L"%d", nSizes[i]); + swprintf(szSize, L"%d", pData->nSizes[i]); TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, wcslen(szSize)); } SelectObject(hDC, hOldFont); @@ -152,7 +151,7 @@ /* Set the new type face name */ pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); + snwprintf(pData->szTypeFaceName, LF_FULLFACESIZE, (WCHAR*)lParam); /* Create the new fonts */ hDC = GetDC(hwnd); @@ -217,7 +216,7 @@ Display_OnCreate(HWND hwnd) { DISPLAYDATA* pData; - const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; + const int nSizes[MAX_SIZES] = {12, 18, 24, 36, 48, 60, 72}; int i; /* Create data structure */ Modified: trunk/rosapps/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.h?rev=271… ============================================================================== --- trunk/rosapps/fontview/display.h (original) +++ trunk/rosapps/fontview/display.h Tue Jun 12 00:38:55 2007 @@ -7,9 +7,7 @@ /* Size restrictions */ #define MAX_STRING 100 -#define MAX_TYPEFACENAME 32 #define MAX_FORMAT 20 - #define MAX_SIZES 7 extern const WCHAR g_szFontDisplayClassName[]; Modified: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=27… ============================================================================== --- trunk/rosapps/fontview/fontview.c (original) +++ trunk/rosapps/fontview/fontview.c Tue Jun 12 00:38:55 2007 @@ -23,11 +23,13 @@ #include "fontview.h" HINSTANCE g_hInstance; -WCHAR g_szTypeFaceName[MAX_TYPEFACENAME]; +WCHAR g_szTypeFaceName[LF_FULLFACESIZE]; +LOGFONTW g_LogFontW; + static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; /* Tye definition for the GetFontResourceInfo function */ -typedef BOOL (WINAPI *PGFRI)(LPCWSTR, DWORD *, LPWSTR, DWORD); +typedef BOOL (WINAPI *PGFRI)(LPCWSTR, DWORD *, LPVOID, DWORD); DWORD FormatString( @@ -117,6 +119,13 @@ /* Get the font name */ dwSize = sizeof(g_szTypeFaceName); if (!GetFontResourceInfoW(argv[1], &dwSize, g_szTypeFaceName, 1)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + return -1; + } + + dwSize = sizeof(LOGFONTW); + if (!GetFontResourceInfoW(argv[1], &dwSize, &g_LogFontW, 2)) { ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); return -1; @@ -206,7 +215,7 @@ SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); /* Init the display window with the font name */ - SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFontW.lfFaceName); ShowWindow(hDisplay, SW_SHOWNORMAL); /* Create the quit button */ @@ -303,15 +312,15 @@ } break; - case WM_DESTROY: - PostQuitMessage (0); /* send a WM_QUIT to the message queue */ - break; - - default: /* for messages that we don't deal with */ - return DefWindowProcW(hwnd, message, wParam, lParam); - } - - return 0; + case WM_DESTROY: + PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + break; + + default: /* for messages that we don't deal with */ + return DefWindowProcW(hwnd, message, wParam, lParam); + } + + return 0; } /* EOF */

17 years, 12 months

← Newer
1
...
17
18
19
20
21
22
23
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007