Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29736: make ReactX compile again, it can not load dxg.sys yet.
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 17:49:29 2007 New Revision: 29736 URL: http://svn.reactos.org/svn/reactos?rev=29736&view=rev Log: make ReactX compile again, it can not load dxg.sys yet. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c 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 Sun Oct 21 17:49:29 2007 @@ -105,28 +105,6 @@ return Status; } -BOOL -INTERNAL_CALL -DD_Cleanup(PVOID ObjectBody) -{ - // FIXME remove this line PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; - DPRINT1("DD_Cleanup\n"); - - /* Do not known what the new cleanup code should do at moment */ - return TRUE; -} - -BOOL -INTERNAL_CALL -DDSURF_Cleanup(PVOID pDDSurf) -{ - DPRINT1("DDSURF_Cleanup\n"); - /* Do not known what the new cleanup code should do at moment */ - return TRUE; -} - - - /************************************************************************/ /* DirectX graphic/video driver loading cleanup ends here */ /************************************************************************/ Modified: branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/objects/gdiobj.c Sun Oct 21 17:49:29 2007 @@ -70,8 +70,8 @@ { {0, 0, 0, NULL}, /* 00 reserved entry */ {1, sizeof(DC), GDI_OBJECT_TAG_DC, DC_Cleanup}, /* 01 DC */ - {1, sizeof(DD_DIRECTDRAW), GDI_OBJECT_TAG_DDRAW, DD_Cleanup}, /* 02 DD_DDRAW, should be moved away from gdi objects */ - {1, sizeof(DD_SURFACE), GDI_OBJECT_TAG_DDSURF, DDSURF_Cleanup}, /* 03 DD_SURFACE, should be moved away from gdi objects */ + {0, 0, 0, NULL}, /* 02 DD_DDRAW, unused, should it be here ? */ + {0, 0, 0, NULL}, /* 03 DD_SURFACE, unused, should it be here ? */ {1, sizeof(ROSRGNDATA), GDI_OBJECT_TAG_REGION, RGNDATA_Cleanup}, /* 04 REGION */ {1, sizeof(BITMAPOBJ), GDI_OBJECT_TAG_BITMAP, BITMAP_Cleanup}, /* 05 BITMAP */ {0, sizeof(DC), GDI_OBJECT_TAG_CLIOBJ, GDI_CleanupDummy}, /* 06 CLIOBJ: METADC,... FIXME: don't use DC struct */ @@ -85,10 +85,10 @@ {0, 0, 0, NULL}, /* 0e ICMCXF, unused */ {0, 0, 0, NULL}, /* 0f ICMDLL, unused */ {1, sizeof(GDIBRUSHOBJ), GDI_OBJECT_TAG_BRUSH, BRUSH_Cleanup}, /* 10 BRUSH, PEN, EXTPEN */ - {0, 0, 0, NULL}, /* 11 D3D_HANDLE, unused */ - {0, 0, 0, NULL}, /* 12 DD_VPORT, unused */ + {0, 0, 0, NULL}, /* 11 D3D_HANDLE, unused, should it be here ? */ + {0, 0, 0, NULL}, /* 12 DD_VPORT, unused, should it be here ? */ {0, 0, 0, NULL}, /* 13 SPACE, unused */ - {0, 0, 0, NULL}, /* 14 DD_MOTION, unused */ + {0, 0, 0, NULL}, /* 14 DD_MOTION, unused, should it be here ? */ {0, 0, 0, NULL}, /* 15 META, unused */ {0, 0, 0, NULL}, /* 16 ENUMFONT, unused */ {0, 0, 0, NULL}, /* 17 BMFD, unused */ Modified: branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Oct 21 17:49:29 2007 @@ -916,17 +916,6 @@ { UNIMPLEMENTED; return EHN_ERROR; -} - -/* - * @unimplemented - */ -PDD_SURFACE_LOCAL STDCALL -EngLockDirectDrawSurface( - IN HANDLE Surface) -{ - UNIMPLEMENTED; - return NULL; } /* @@ -1023,17 +1012,6 @@ * @unimplemented */ BOOL STDCALL -EngUnlockDirectDrawSurface( - IN PDD_SURFACE_LOCAL Surface) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL STDCALL EngUnmapFile( IN ULONG_PTR File) {

1 0

[dreimer] 29735: Remove Trailing spaces. Add German Translations for joy and tapiui.rc. Fix a typo in en-US of tapiui.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Sun Oct 21 17:49:27 2007 New Revision: 29735 URL: http://svn.reactos.org/svn/reactos?rev=29735&view=rev Log: Remove Trailing spaces. Add German Translations for joy and tapiui.rc. Fix a typo in en-US of tapiui. Added: trunk/reactos/dll/cpl/joy/lang/de-DE.rc (with props) trunk/reactos/dll/win32/tapiui/lang/de-DE.rc (with props) Modified: trunk/reactos/dll/cpl/joy/joy.c trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/win32/tapiui/lang/en-US.rc trunk/reactos/dll/win32/tapiui/tapiui.rc Modified: trunk/reactos/dll/cpl/joy/joy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.c?rev=2973… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.c (original) +++ trunk/reactos/dll/cpl/joy/joy.c Sun Oct 21 17:49:27 2007 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* +/* * * PROJECT: ReactOS Software Control Panel * FILE: dll/cpl/joy/joy.c @@ -36,7 +36,7 @@ /* Applets */ -APPLET Applets[NUM_APPLETS] = +APPLET Applets[NUM_APPLETS] = { {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; Added: trunk/reactos/dll/cpl/joy/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/de-DE.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/de-DE.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/de-DE.rc Sun Oct 21 17:49:27 2007 @@ -1,0 +1,84 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Gamecontroller" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Über diese Einstellungen können an den PC angeschlossene Gamecontroller konfiguriert werden.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "I&nstallierte Gamecontroller", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Entfernen", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "E&rweitert...", IDC_ADVANCED_BUTTON, 100, 157, 65, 14 + PUSHBUTTON "&Problembehandlung...", IDC_TROUBLESHOOT_BUTTON, 170, 157, 75, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Gamecontroller hinzufügen" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Wählen Sie einen Gamecontroller aus der Liste und klicken Sie auf OK. Wenn ihr Gamecontroller nicht in der Liste erscheint, klicken Sie auf Benutzerdefiniert.", -1, 35, 7, 210, 33 + LTEXT "&Gamecontroller:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Ruder und Pedale aktivieren", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 105, 10, WS_GROUP + LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Benutzerdefiniert...", IDC_CUSTOM_BUTTON, 195, 147, 63, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Benutzerdefinierter Gamecontroller" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Spezielle Eigenschaften", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Flugsteuerknüppel", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "&Gamepad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&Lenkrad", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "&Achsen", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Ruder/Pedale", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Z Achse", IDC_Z_AXIS_RADIO, 81, 97, 40, 10, NOT WS_VISIBLE + GROUPBOX "&Tasten", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Beinhaltet eine &Point of View Steuerung", IDC_INC_POINT_CHECKBOX, 7, 123, 140, 10 + LTEXT "C&ontrollername:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 96 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Erweiterte Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 34, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 75, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 163, 75, 50, 14 + LTEXT "Wählen Sie das Gerät aus, welches Sie mit älteren Programmen nutzen wollen.", -1, 7, 7, 208, 20 + LTEXT "&Bevorzugtes Gerät:", -1, 34, 34, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 48, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Gamecontroller" + IDS_CPLSYSTEMDESCRIPTION "Hinzufügen, Entfernen und Konfigurieren von Gamecontroller Hardware, wie Joysticks und Gamepads." + IDS_CONTROLLER "Controller" + IDS_STATUS "Status" +END Propchange: trunk/reactos/dll/cpl/joy/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/joy/rsrc.rc (original) +++ trunk/reactos/dll/cpl/joy/rsrc.rc Sun Oct 21 17:49:27 2007 @@ -1,5 +1,6 @@ #include "resource.h" #include <windows.h> +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/tapiui/lang/de-DE.rc Sun Oct 21 17:49:27 2007 @@ -1,0 +1,445 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +101 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Wählregeln" +FONT 8, "MS Shell Dlg" +{ + ICON 201, 2000, 7, 7, 21, 20 + LTEXT "&Standorte:", -1, 7, 35, 210, 8 + LTEXT "In der folgenden Liste sind alle Standorte aufgelistet. Wählen Sie den Standort aus, von dem aus gewählt wird.", -1, 35, 12, 210, 16 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE + PUSHBUTTON "&Neu...", 1030, 87, 155, 50, 14 + PUSHBUTTON "Be&arbeiten...", 1031, 141, 155, 50, 14 + PUSHBUTTON "&Löschen", 1032, 195, 155, 50, 14 + LTEXT "Rufnummer wird gewählt als:", 1052, 7, 181, 100, 8 + LTEXT "", 1053, 14, 195, 224, 16 +} + +102 DIALOG 0, 0, 252, 255 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +{ + ICON 202, 2000, 7, 7, 20, 20 + LTEXT "Standort&name:", -1, 35, 12, 56, 8, SS_CENTERIMAGE + EDITTEXT 1038, 96, 9, 149, 14, ES_AUTOHSCROLL + LTEXT "Geben Sie den Standort an, von dem aus Sie wählen.", 2001, 7, 35, 238, 8 + LTEXT "Land/&Region:", -1, 7, 49, 161, 8 + COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&Vorwahl:", -1, 190, 49, 48, 8 + EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL + GROUPBOX "Wählregeln", 2002, 7, 80, 238, 92 + LTEXT "Folgende Regeln beim Wählen von diesem Standort verwenden:", 2003, 14, 92, 224, 8 + LTEXT "&Amtskennziffer für Ortsgespräche:", -1, 14, 106, 170, 8 + EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL + LTEXT "Amtskennziffer für &Ferngespräche:", -1, 14, 122, 170, 8 + EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL + LTEXT "&Netzkennzahl für Ferngespräche:", -1, 14, 138, 170, 8 + EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL + LTEXT "Netzkennzahl für A&uslandsgespräche:", -1, 14, 154, 170, 8 + EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL + AUTOCHECKBOX "&Warten beim Wählen deaktivieren:", 1035, 14, 175, 170, 10 + COMBOBOX 1013, 190, 174, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL + LTEXT "Wählverfahren:", -1, 14, 193, 50, 8 + AUTORADIOBUTTON "&Ton", 1036, 68, 192, 50, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "&Impuls", 1037, 122, 192, 50, 10, NOT WS_TABSTOP + LTEXT "Telefonnummer wird gewählt als:", 1052, 7, 219, 105, 8 + LTEXT "", 1053, 14, 232, 224, 16 +} + +103 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Vorwahlregeln" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Eine Vorwahlregel bestimmt, wie Rufnummern eines anderen Vorwahl- bereichs vom aktuellen Vorwahlbereich aus und innerhalb des eigenen Vorwahlbereichs gewählt werden.", 2000, 7, 7, 238, 24 + LTEXT "&Vorwahlregeln:", -1, 7, 31, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE + PUSHBUTTON "&Neu...", 1030, 87, 145, 50, 14 + PUSHBUTTON "Be&arbeiten...", 1031, 141, 145, 50, 14 + PUSHBUTTON "&Löschen", 1032, 195, 145, 50, 14 + GROUPBOX "Bezeichnung", 2006, 7, 166, 238, 45 + LTEXT "", 1039, 14, 180, 224, 24 +} + +104 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Callingcard" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wählen Sie die Callingcard, die Sie verwenden möchten, oder klicken Sie auf Neu, um eine andere Karte hinzuzufügen.", 2000, 7, 7, 238, 16 + LTEXT "Karten&typen:", -1, 7, 23, 238, 8 + CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE + PUSHBUTTON "&Neu...", 1030, 87, 101, 50, 14 + PUSHBUTTON "Be&arbeiten...", 1031, 141, 101, 50, 14 + PUSHBUTTON "&Löschen", 1032, 195, 101, 50, 14 + LTEXT "&Kontonummer:", -1, 7, 127, 91, 8 + EDITTEXT 1018, 102, 125, 143, 12, ES_AUTOHSCROLL + LTEXT "&PIN:", -1, 7, 145, 91, 8 + EDITTEXT 1019, 102, 143, 143, 12, ES_AUTOHSCROLL + GROUPBOX "Zugriffsnummern für", 2001, 7, 158, 238, 53 + LTEXT "Ferngespräche:", -1, 14, 172, 84, 8 + LTEXT "", 1042, 102, 172, 136, 8 + LTEXT "Auslandsgespräche:", -1, 14, 184, 84, 8 + LTEXT "", 1043, 102, 184, 136, 8 + LTEXT "Ortsgespräche:", -1, 14, 196, 84, 8 + LTEXT "", 1051, 102, 196, 136, 8 +} + +105 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +{ + ICON 203, 2000, 7, 7, 20, 20 + LTEXT "&Callingcardname:", -1, 35, 12, 64, 8, SS_CENTERIMAGE + EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL + LTEXT "&Kontonummer:", -1, 7, 35, 238, 8 + EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL + LTEXT "&PIN:", -1, 7, 68, 238, 8 + EDITTEXT 1019, 7, 79, 116, 14, ES_AUTOHSCROLL + LTEXT "Diese Callingcard wird verwendet wenn:", 1056, 14, 117, 224, 8 + GROUPBOX "Callingcarddetails", 2001, 7, 105, 238, 66 + LTEXT "", 1000, 22, 131, 216, 8 + LTEXT "", 1001, 22, 143, 216, 8 + LTEXT "", 1002, 22, 155, 216, 8 +} + +106 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ferngespräche" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Zugriffsnummer &für Ferngespräche:", -1, 7, 7, 238, 8 + EDITTEXT 1044, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Klicken Sie auf die Schaltflächen unten, um Wählschritte für Ferngespräche einzugeben. Geben Sie diese Schritte in der für die Callingcard gültigen Reihenfolge ein.", 2000, 7, 40, 238, 24 + LTEXT "&Wählschritte für die Callingcard:", -1, 7, 72, 100, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Nach &oben", 1022, 195, 83, 50, 14 + PUSHBUTTON "Nach &unten", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Löschen", 1024, 195, 119, 50, 14 + PUSHBUTTON "&Zugriffsnummer", 1025, 7, 161, 90, 14 + PUSHBUTTON "&Kontonummer", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 +} + +107 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Auslandsgespräche" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Zugriffsnummer &für Auslandsgespräche:", -1, 7, 7, 238, 8 + EDITTEXT 1045, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Klicken Sie auf die Schaltflächen unten, um Wählschritte für Auslands- gespräche einzugeben. Geben Sie diese Schritte in der für die Callingcard gültigen Reihenfolge ein.", 2000, 7, 40, 244, 24 + LTEXT "&Wählschritte für die Callingcard:", -1, 7, 72, 100, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Nach &oben", 1022, 195, 83, 50, 14 + PUSHBUTTON "Nach &unten", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Löschen", 1024, 195, 119, 50, 14 + PUSHBUTTON "&Zugriffsnummer", 1025, 7, 161, 90, 14 + PUSHBUTTON "&Kontonummer", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 +} + +108 DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ortsgespräche" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Zugriffsnummer &für Ortsgespräche:", -1, 7, 7, 238, 8 + EDITTEXT 1008, 7, 18, 116, 14, ES_AUTOHSCROLL + LTEXT "Klicken Sie auf die Schaltflächen unten, um Wählschritte für Ortsgespräche einzugeben. Geben Sie diese Schritte in der für die Callingcard gültigen Reihenfolge ein.", 2000, 7, 40, 238, 24 + LTEXT "&Wählschritte für die Callingcard:", -1, 7, 72, 100, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE + PUSHBUTTON "Nach &oben", 1022, 195, 83, 50, 14 + PUSHBUTTON "Nach &unten", 1023, 195, 101, 50, 14 + PUSHBUTTON "&Löschen", 1024, 195, 119, 50, 14 + PUSHBUTTON "&Zugriffsnummer", 1025, 7, 161, 90, 14 + PUSHBUTTON "&Kontonummer", 1018, 101, 161, 90, 14 + PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 + PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 + PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 + PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 +} + +109 DIALOGEX 0, 0, 252, 257 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Neue Vorwahlregel" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Diese Vorwahlregel wird nur für Anrufe der Vorwahl- und Präfixkombination verwendet, die unten angegeben ist.", 2000, 7, 7, 238, 16 + LTEXT "Zu wählende Vorwahl:", -1, 7, 31, 110, 8 + LTEXT "&Vorwahl:", -1, 7, 45, 36, 8 + EDITTEXT 1034, 46, 42, 50, 14, ES_AUTOHSCROLL + LTEXT "Geben Sie die Präfixe an, für die diese Vorwahlregel verwendet werden.", -1, 14, 78, 228, 8 + AUTORADIOBUTTON "&Alle Präfixe dieser Ortskennzahl einbeziehen", 1014, 14, 90, 224, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "N&ur die Präfixe der folgenden Liste einbeziehen:", 1015, 14, 104, 224, 12, NOT WS_TABSTOP + LTEXT "&Einzubeziehende Präfixe:", 1057, 26, 117, 119, 8 + CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE + PUSHBUTTON "&Hinzufügen...", 1005, 95, 128, 50, 14 + PUSHBUTTON "&Löschen", 1024, 95, 146, 50, 14 + LTEXT "Für Rufnummern mit dieser Präfix:", -1, 14, 184, 224, 8 + AUTOCHECKBOX "&Wählen:", 1012, 14, 198, 40, 12 + EDITTEXT 1007, 56, 196, 42, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Vorwahl einbeziehen", 1029, 14, 214, 85, 12 + DEFPUSHBUTTON "OK", 1, 141, 236, 50, 14 + PUSHBUTTON "Abbrechen", 2, 195, 236, 50, 14 + RTEXT "Vorwahl", 2001, 133, 31, 51, 8 + LTEXT "Präfix", 2002, 200, 31, 45, 8 + CONTROL "", 2003, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 180, 41, 1, 6 + CONTROL "", 2004, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 203, 41, 1, 6 + RTEXT "X - X X X - X X X - X X X X", 2005, 133, 48, 112, 8 + GROUPBOX "Präfixe", -1, 7, 64, 238, 102 + GROUPBOX "Regeln", -1, 7, 170, 238, 60 +} + +110 DIALOGEX 0, 0, 227, 82 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1003, 7, 7, 213, 8 + LTEXT "", 1039, 7, 23, 213, 8 + EDITTEXT 1031, 7, 34, 213, 14, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 116, 61, 50, 14 + PUSHBUTTON "Abbrechen", 2, 170, 61, 50, 14 +} + +111 DIALOGEX 0, 0, 252, 124 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Warten auf" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wählen Sie den Typ der Eingabeaufforderung, auf den gewartet werden soll, bevor die Wählsequenz fortgesetzt wird.", 2000, 7, 7, 238, 16 + AUTORADIOBUTTON "Auf &Freizeichen warten", 1009, 7, 31, 238, 10, WS_GROUP + AUTORADIOBUTTON "&Auf das Ende einer Sprachnachricht warten", 1016, 7, 47, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "&Eine bestimmte Zeit warten:", 1048, 7, 63, 238, 10, NOT WS_TABSTOP + LTEXT "&Sekunden", -1, 58, 80, 187, 8 + EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP + CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 77, 11, 14 + DEFPUSHBUTTON "OK", 1, 141, 103, 50, 14 + PUSHBUTTON "Abbrechen", 2, 195, 103, 50, 14 +} + +112 DIALOGEX 0, 0, 252, 111 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Zielnummer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Dieser Schritt wird die Zielrufummer in die Callingcard-Wählfolge einfügen. Welche Teile der Zielrufnummer sollen gewählt werden, wenn sie die Zielnummer anwählen?", 2000, 7, 7, 238, 24 + AUTOCHECKBOX "&Landes-/Regionalkennzahl wählen", 1027, 7, 39, 238, 10 + AUTOCHECKBOX "&Vorwahl wählen", 1034, 7, 55, 238, 10 + AUTOCHECKBOX "&Rufnummer wählen", 1008, 7, 71, 238, 10, WS_DISABLED + DEFPUSHBUTTON "OK", 1, 141, 91, 50, 14 + PUSHBUTTON "Abbrechen", 2, 195, 91, 50, 14 +} + +113 DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg" +{ + ICON 201, 2000, 7, 7, 20, 20 + LTEXT "Die folgenden Telefonieanbieter sind auf diesem Computer installiert:", -1, 40, 12, 205, 16 + LTEXT "&Anbieter:", -1, 7, 35, 238, 8 + LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + PUSHBUTTON "&Hinzufügen...", 1005, 87, 197, 50, 14 + PUSHBUTTON "&Entfernen", 1024, 141, 197, 50, 14 + PUSHBUTTON "&Konfigurieren...", 1031, 195, 197, 50, 14 +} + +114 DIALOG 20, 15, 252, 127 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Anbieter hinzufügen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wählen Sie die zu installierenden Anbieter aus der Liste aus und klicken Sie dann auf Hinzufügen.", 2000, 7, 7, 241, 16 + LTEXT "&Telefonieanbieter:", -1, 7, 23, 144, 10 + LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "&Hinzufügen", 1005, 141, 106, 50, 14 + DEFPUSHBUTTON "Abbrechen", 2, 195, 106, 50, 14 +} + +115 DIALOGEX 10, 10, 303, 228 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Standortinformationen" +FONT 8, "MS Shell Dlg" +{ + CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 + LTEXT "Bevor Sie Telefon- oder Modemverbindungen herstellen können, müssen Sie folgende Informationen bezüglich Ihres Standorts angeben.", 2000, 107, 15, 188, 25 + LTEXT "In welchem &Land/Region sind Sie?", -1, 107, 43, 189, 10 + COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Welche &Vorwahl haben Sie?", -1, 107, 73, 189, 10 + EDITTEXT 1034, 107, 87, 40, 12, ES_AUTOHSCROLL + LTEXT "Falls eine &Netzkennzahl erforderlich ist, wie lautet sie?", -1, 107, 104, 189, 10 + EDITTEXT 1058, 106, 118, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Falls eine &Amtskennziffer erforderlich ist, wie lautet sie?", -1, 107, 136, 189, 10 + EDITTEXT 1010, 107, 149, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "An diesem Standort angewandtes Wählverfahren:", -1, 107, 167, 189, 10 + AUTORADIOBUTTON "&Tonwahl", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Impulswahl", 1037, 175, 178, 57, 14, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 192, 204, 50, 14 + PUSHBUTTON "Abbrechen", 2, 246, 204, 50, 14 +} + +400 DIALOG 0, 0, 290, 151 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +FONT 8, "MS Shell Dlg" +{ + CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 + LTEXT "Bevor Sie Telefon- oder Modemverbindungen herstellen können, müssen Sie folgende Informationen bezüglich Ihres Standorts angeben.", 2000, 95, 0, 188, 25 + LTEXT "In welchem &Land/Region sind Sie?", -1, 95, 30, 188, 10 + COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Welche &Vorwahl haben Sie?", -1, 95, 60, 188, 10 + EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL + LTEXT "Falls eine &Amtskennziffer erforderlich ist, wie lautet sie?", -1, 95, 96, 188, 10 + EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "An diesem Standort angewandtes Wählverfahren:", -1, 95, 129, 159, 10 + AUTORADIOBUTTON "&Tonwahl", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Impulswahl", 1037, 155, 139, 55, 12, NOT WS_TABSTOP +} + +500 DIALOG 0, 0, 235, 88 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOS Explorer" +FONT 8, "MS Shell Dlg" +{ + ICON 504, 501, 13, 14, 21, 20 + LTEXT "", 502, 47, 15, 180, 32 + AUTOCHECKBOX "&Dieser Seite in Zukunft immer vertrauen", 503, 47, 47, 147, 12 + DEFPUSHBUTTON "&OK", 505, 110, 65, 50, 14 + PUSHBUTTON "&Abbrechen", 506, 164, 65, 50, 14 +} + +STRINGTABLE +{ + 1 "Telefon- und Modemoptionen" + 2 "Konfiguriert Wählregeln und Modemeigenschaften." + 3 "Standort" + 4 "Klicken Sie auf Neu, um einen neuen Standort zu erstellen." + 5 "Neuer Standort" + 6 "Standort bearbeiten" + 7 "Neue Callingcard" + 8 "Callingcard bearbeiten" + 9 "Vorwahl" + 10 "Präfixe" + 11 "Regel" + 12 "Das eingegebene Zeichen ist ungültig.\n\nGültige Zeichen sind 0 bis 9, *, # und Komma." + 13 "Das eingegebene Zeichen ist ungültig.\n\nGültige Zeichen sind 0 bis 9, *, #, Leerzeichen und Komma." + 14 "Das eingegebene Zeichen ist ungültig.\n\nGültige Zeichen sind 0 bis 9." + 15 "Das eingegebene Zeichen ist ungültig." + 16 "%1 wählen" + 17 "%1 und Vorwahl wählen" + 18 "Vorwahl wählen" + 19 "Nur Rufnummer wählen" + 20 "Alle" + 21 "Ausgewählte" + 22 "Vorwahlregel bearbeiten" + 23 "Wählen Sie eine Regel aus der Liste aus, um die Beschreibung anzuzeigen, oder klicken Sie auf Neu, um eine Regel hinzuzufügen." + 24 "Wählt %2 plus Vorwahl vor der Rufnummer für alle Anrufe innerhalb des Vorwahlbereichs %1." + 25 "Wählt %2 vor der Rufnummer für alle Anrufe innerhalb des Vorwahlbereichs %1." + 26 "Wählt die Vorwahl vor der Rufnummer für alle Anrufe innerhalb des Vorwahlbereichs %1." + 27 "Wählt nur die Rufnummer für alle Anrufe innerhalb des Vorwahlbereichs %1." + 28 "Wählt %2 plus Vorwahl vor der Rufnummer für Anrufe innerhalb des Vorwahlbereichs %1, die die angegebenen Präfixe enthalten." + 29 "Wählt %2 vor der Rufnummer für Anrufe innerhalb des Vorwahlbereichs %1, die die angegebenen Präfixe enthalten." + 30 "Wählt die Vorwahl vor der Rufnummer für Anrufe innerhalb des Vorwahlbereichs %1, die die angegebenen Präfixe enthalten." + 31 "Wählt nur die Rufnummer für Anrufe innerhalb des Vorwahlbereichs %1, die die angegebenen Präfixe enthalten." + 32 "Wählt eine 1 vor Anrufen in andere Vorwahlbereiche, einschließlich der Vorwahl für alle Präfixe." + 33 "Präfix hinzufügen" + 34 "Geben Sie eine oder mehrere durch Komma getrennte Präfixe ein." + 35 "Ziffern angeben" + 36 "Geben Sie eine oder mehrere Ziffern (einschließlich * und #) zum Wählen ein." + 37 "Sie haben ein ungültiges Zeichen eingegeben.\n\nGültige Zeichen sind 0 bis 9 und das Leerzeichen." + 38 "%1!d! Sekunden warten" + 39 "Die Zugriffsnummer wählen" + 40 "Die Callingcardnummer wählen" + 41 "Die PIN-Nummer wählen" + 42 "Auf Freizeichen warten" + 43 "Auf das Ende eine Sprachnachricht warten" + 44 "Die Landeskennzahl, Vorwahl und Rufnummer wählen" + 45 "Die Vorwahl und Rufnummer wählen" + 47 "Die Landeskennzahl wählen" + 48 "Die Vorwahl wählen" + 49 "Die Rufnummer wählen" + 50 "Ferngespräche" + 51 "Auslandsgespräche" + 52 "Ortsgespräche" + 53 "Keine Regeln für die Verwendungsart der Callingcard definiert." + 54 "Sie müssen die Netzkennzahl für Ferngespräche für diesen Standort eingeben." + 55 "Sie müssen einen Namen für diesen Standort eingeben." + 56 "Sie müssen die Vorwahl für diesen Standort eingeben." + 57 "Sie müssen die zu wählende Nummer auswählen, um die Funktion Anruf wartet zu deaktivieren." + 58 "Sie müssen das Land bzw. die Region angeben, von wo aus Sie anrufen." + 59 "Fehlende Informationen" + 60 "Der Standortname wird bereits verwendet. Geben Sie einen eindeutigen Namen ein." + 61 "Diese Callingcard erfordert bestimmte Angaben. Klicken Sie auf Bearbeiten, um die notwendigen Angaben einzugeben oder wählen Sie eine andere Karte." + 62 "Sie müssen eine Standardcallingcard auswählen. Wählen Sie eine Karte aus der liste aus, oder klicken Sie auf Neu, um eine neue Karte zu erstellen." + 63 "Sie müssen den Callingcardnamen eingeben." + 64 "Sie müssen die Kontonummer eingeben." + 65 "Sie müssen die PIN-Nummer eingeben." + 66 "Für diese Callingcard sind keine Regeln definiert. Wählen Sie die Registerkarte Ferngespräch, Auslandsgespräch oder Ortsgespräch, um eine Regel zu erstellen." + 67 "Die Ferngesprächregel erfordert die Zugriffsnummer der Callingcard für Ferngespräche." + 68 "Die Auslandsgesprächregel erfordert die Zugriffsnummer der Callingcard für Auslandsgespräche." + 69 "Die Ortsgesprächregel erfordert die Zugriffsnummer der Callingcard für Ortsgespräche." + 70 "Keine" + 71 "Soll der gewählte Telefoniedienstanbieter wirklich entfernt werden?" + 72 "<Es wurde kein Dienstanbieter installiert>" + 73 "Sie müssen die Präfix eingeben, für die diese Regel angewendet wird." + 74 "&Ziffern:" + 75 "&Präfixe:" + 76 "Sie haben ein ungültiges Zeichen eingegeben.\n\nGültige Zeichen sind 0 bis 9, Leerzeichen und Komma." + 77 "Löschen bestätigen" + 78 "Sind Sie sicher, dass dieser Standort gelöscht werden soll?" + 79 "Sind Sie sicher, dass diese Callingcard gelöscht werden soll?" + 80 "Sind Sie sicher, dass diese Vorwahlregel gelöscht werden soll?" + 81 "Sie müssen die zu wählenden Ziffern eingeben." + 82 "Der eingegebene Callingcardname wird bereits verwendet. Geben Sie einen eindeutigen Namen ein." + 83 "ReactOS benötigt Telefoninformation bezüglich des Standorts, von dem aus gewählt werden soll. Wenn Sie diese Informationen nicht angeben, kann das Programm eventuell nicht korrekt wählen. Zusätzlich kann es sein, dass dieser Dialog sofort wieder angezeigt wird, wenn Sie versuchen, ihn abzubrechen.\nSind Sie sicher, dass Sie den Vorgang abbrechen möchten?" + 84 "Abbrechen bestätigen" + 85 "Eigener Standort" + 86 "<keine Dienstanbieter für die Installation verfügbar>" + 87 "Das eingegebene Zeichen ist ungültig.\n\nGültige Zeichen sind 0 bis 9, A bis D, *, #, +, !, Leerzeichen und Komma." + 88 "Sie müssen den internationale Netzkennzahl für diesen Standort eingeben." + 89 "Sie müssen die Netzkennzahl für diesen Standort eingeben." + 90 "Diese Seite versucht Telefonanrufe oder andere Multimediaverbindungen auf dem Computer herzustellen bzw. diese zu überwachen.\nSoll dies weiterhin gestattet werden?" + 91 "Diese Seite versucht auf Verzeichnisinformationen des Netzwerks zuzugreifen.\nSoll dies weiterhin gestattet werden?" + 92 "Diese Seite versucht auf Netzwerkkonferenzinformationen zuzugreifen bzw. diese zu ändern.\nSoll dies weiterhin gestattet werden?" + 93 "Diese Seite versucht, auf Registrierungsinformationen zuzugreifen bzw. diese zu ändern.\nMöchten Sie diesen Vorgang zulassen?" + 1064 "Die Systemsteuerungsoption Telefon- und Modemoptionen konnte nicht geöffnet werden. Der Telefoniedienst konnte eventuell nicht gestartet werden." + 1065 "Anbieter entfernen" + 15800 "23" + 15801 "0,\"Keine (Direktwahl)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" + 15802 "1,\"AT&T Direktwahl via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" + 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" + 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" + 15805 "4,\"MCI Direktwahl via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" + 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" + 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" + 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" + 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" + 15810 "9,\"US Sprint Direktwahl via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" + 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" + 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" + 15813 "12,\"Callingcard via 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" + 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" + 15815 "14,\"Mercury (Vereinigtes Königreich)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" + 15816 "15,\"British Telecom (Vereinigtes Königreich)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" + 15817 "16,\"CLEAR Communications (Neuseeland)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" + 15818 "17,\"Telecom Neuseeland\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" + 15819 "18,\"Global Card (Taiwan nach USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" + 15820 "19,\"Telstra (Australia) via 1818 (Sprache)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15821 "20,\"Telstra (Australia) via 1818 (Fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" + 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" + 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" +} Propchange: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/tapiui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/tapiui/lang/en-US.rc Sun Oct 21 17:49:27 2007 @@ -406,7 +406,7 @@ 80 "Are you sure you want to delete this area code rule?" 81 "You must enter the digits to dial." 82 "The calling card name you have entered is already in use. Please enter a unique name." - 83 "Windows needs telephone information about the location from which you will be dialing. If you cancel without providing this information, this program may not function correctly when dialing. In addition, some applications respond to your canceling this dialog box by immediately re-posting it.\nAre you sure you want to cancel?" + 83 "ReactOS needs telephone information about the location from which you will be dialing. If you cancel without providing this information, this program may not function correctly when dialing. In addition, some applications respond to your canceling this dialog box by immediately re-posting it.\nAre you sure you want to cancel?" 84 "Confirm Cancel" 85 "My Location" 86 "<no service providers are available for installation>" Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… ============================================================================== --- trunk/reactos/dll/win32/tapiui/tapiui.rc (original) +++ trunk/reactos/dll/win32/tapiui/tapiui.rc Sun Oct 21 17:49:27 2007 @@ -16,5 +16,6 @@ IDB_RADIO BITMAP "res/301.bmp" IDB_WIZARD BITMAP "res/302.bmp" +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc"

1 0

[greatlrd] 29734: fixed allot compiling issue
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 17:31:39 2007 New Revision: 29734 URL: http://svn.reactos.org/svn/reactos?rev=29734&view=rev Log: fixed allot compiling issue Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.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 Sun Oct 21 17:31:39 2007 @@ -101,6 +101,12 @@ /* From eng.c */ typedef FLATPTR (NTAPI *PGD_HEAPVIDMEMALLOCALIGNED)(LPVIDMEM, DWORD, DWORD, LPSURFACEALIGNMENT, LPLONG); typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR); +typedef PVOID (NTAPI *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ; +typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); +typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG); +typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); +typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); + /* Standard macro */ #define DXG_GET_INDEX_FUNCTION(INDEX, FUNCTION) \ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sun Oct 21 17:31:39 2007 @@ -258,7 +258,7 @@ PDD_CREATESURFACEDATA puCreateSurfaceData, HANDLE *puhSurface) { - PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn; + PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_DDCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn; if (pfnDdCreateD3DBuffer == NULL) { 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 Sun Oct 21 17:31:39 2007 @@ -68,7 +68,7 @@ /************************************************************************/ /* Enumate all drivers in win32k */ HDEV * -DxEngEnumerateHdev(HDEV *hdev); +DxEngEnumerateHdev(HDEV *hdev) { /* FIXME Enumate all drivers in win32k */ DPRINT1("We do not enumate any device from win32k "); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Sun Oct 21 17:31:39 2007 @@ -33,7 +33,7 @@ if (pfnHeapVidMemAllocAligned == NULL) { DPRINT1("Warring no pfnHeapVidMemAllocAligned"); - return NULL; + return 0; } DPRINT1("Calling on dxg.sys pfnHeapVidMemAllocAligned"); @@ -104,11 +104,12 @@ if (pfnEngFreePrivateUserMem == NULL) { DPRINT1("Warring no pfnEngFreePrivateUserMem"); - return DDHAL_DRIVER_NOTHANDLED; } - - DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem"); - return pfnEngFreePrivateUserMem(psl, pv); + else + { + DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem"); + pfnEngFreePrivateUserMem(psl, pv); + } } /************************************************************************/ @@ -132,7 +133,7 @@ } DPRINT1("Calling on dxg.sys pfnEngDxIoctl"); - return pfnEngFreePrivateUserMem(psl, pv); + return pfnEngDxIoctl(ulIoctl, pBuffer, ulBufferSize); } /************************************************************************/

1 0

[ekohl] 29733: Simplify a lot of code (e.g.: SendMessage(GetDlgItem(...)...) --> SendDlgItemMessage(...))
by ekohl＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: ekohl Date: Sun Oct 21 17:02:26 2007 New Revision: 29733 URL: http://svn.reactos.org/svn/reactos?rev=29733&view=rev Log: Simplify a lot of code (e.g.: SendMessage(GetDlgItem(...)...) --> SendDlgItemMessage(...)) Modified: trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/hibernate.c trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c Sun Oct 21 17:02:26 2007 @@ -190,7 +190,7 @@ } BOOLEAN SaveCurrentPowerActionPolicy(IN HWND hDlgCtrl, - OUT POWER_ACTION_POLICY * Policy) + OUT POWER_ACTION_POLICY * Policy) { LRESULT Index; LRESULT ItemData; @@ -251,7 +251,7 @@ #else if (LoadString(hApplet, IDS_PowerActionNone1+gGPP.user.LidCloseAc.Action, szAction, MAX_PATH)) { - SendMessage(GetDlgItem(hwndDlg, IDC_LIDCLOSE), + SendDlgItemMessage(hwndDlg, IDC_LIDCLOSE, CB_SELECTSTRING, TRUE, (LPARAM)szAction); @@ -271,7 +271,7 @@ #else if (LoadString(hApplet, IDS_PowerActionNone1+gGPP.user.SleepButtonAc.Action, szAction, MAX_PATH)) { - SendMessage(GetDlgItem(hwndDlg, IDC_SLEEPBUTTON), + SendDlgItemMessage(hwndDlg, IDC_SLEEPBUTTON, CB_SELECTSTRING, TRUE, (LPARAM)szAction); @@ -299,25 +299,25 @@ #else if (LoadString(hApplet, IDS_PowerActionNone1+gGPP.user.LidCloseDc.Action, szAction, MAX_PATH)) { - SendMessage(GetDlgItem(hwndDlg, IDC_LIDCLOSE), + SendDlgItemMessage(hwndDlg, IDC_LIDCLOSE, CB_SELECTSTRING, TRUE, (LPARAM)szAction); } if (LoadString(hApplet, IDS_PowerActionNone1+gGPP.user.PowerButtonDc.Action, szAction, MAX_PATH)) { - SendMessage(GetDlgItem(hwndDlg, IDC_POWERBUTTON), - CB_SELECTSTRING, - TRUE, - (LPARAM)szAction); - } - if (LoadString(hApplet, IDS_PowerActionNone1+gGPP.user.SleepButtonDc.Action, szAction, MAX_PATH)) - { - SendMessage(GetDlgItem(hwndDlg, IDC_SLEEPBUTTON), + SendDlgItemMessage(hwndDlg, IDC_POWERBUTTON, CB_SELECTSTRING, TRUE, (LPARAM)szAction); } + if (LoadString(hApplet, IDS_PowerActionNone1+gGPP.user.SleepButtonDc.Action, szAction, MAX_PATH)) + { + SendDlgItemMessage(hwndDlg, IDC_SLEEPBUTTON, + CB_SELECTSTRING, + TRUE, + (LPARAM)szAction); + } #endif } } @@ -334,18 +334,15 @@ SYSTEM_POWER_CAPABILITIES spc; - SendMessage(GetDlgItem(hAdv, IDC_SYSTRAYBATTERYMETER), - BM_SETCHECK, - (gGPP.user.GlobalFlags & EnableSysTrayBatteryMeter ? BST_CHECKED : BST_UNCHECKED), - (LPARAM)0); - SendMessage(GetDlgItem(hAdv, IDC_PASSWORDLOGON), - BM_SETCHECK, - (gGPP.user.GlobalFlags & EnablePasswordLogon ? BST_CHECKED : BST_UNCHECKED), - (LPARAM)0); - SendMessage(GetDlgItem(hAdv, IDC_VIDEODIMDISPLAY), - BM_SETCHECK, - (gGPP.user.GlobalFlags & EnableVideoDimDisplay ? BST_CHECKED : BST_UNCHECKED), - (LPARAM)0); + CheckDlgButton(hAdv, + IDC_SYSTRAYBATTERYMETER, + gGPP.user.GlobalFlags & EnableSysTrayBatteryMeter ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hAdv, + IDC_PASSWORDLOGON, + gGPP.user.GlobalFlags & EnablePasswordLogon ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hAdv, + IDC_VIDEODIMDISPLAY, + gGPP.user.GlobalFlags & EnableVideoDimDisplay ? BST_CHECKED : BST_UNCHECKED); GetPwrCapabilities(&spc); @@ -375,6 +372,7 @@ } else { + ShowWindow(GetDlgItem(hAdv, IDC_VIDEODIMDISPLAY), FALSE); ShowWindow(GetDlgItem(hAdv, IDC_SLIDCLOSE), FALSE); ShowWindow(hList1, FALSE); } @@ -448,22 +446,18 @@ void Adv_SaveData(HWND hwndDlg) { - BOOLEAN bSystrayBatteryMeter; - BOOLEAN bPasswordLogon; - BOOLEAN bVideoDimDisplay; - - bSystrayBatteryMeter = (BOOLEAN)SendMessage(GetDlgItem(hwndDlg, IDC_SYSTRAYBATTERYMETER), - BM_GETCHECK, - (WPARAM)0, - (LPARAM)0); - bPasswordLogon = (BOOLEAN)SendMessage(GetDlgItem(hwndDlg, IDC_PASSWORDLOGON), - BM_GETCHECK, - (WPARAM)0, - (LPARAM)0); - bVideoDimDisplay = (BOOLEAN)SendMessage(GetDlgItem(hwndDlg, IDC_VIDEODIMDISPLAY), - BM_GETCHECK, - (WPARAM)0, - (LPARAM)0); + BOOL bSystrayBatteryMeter; + BOOL bPasswordLogon; + BOOL bVideoDimDisplay; + + bSystrayBatteryMeter = + (IsDlgButtonChecked(hwndDlg, IDC_SYSTRAYBATTERYMETER) == BST_CHECKED); + + bPasswordLogon = + (IsDlgButtonChecked(hwndDlg, IDC_PASSWORDLOGON) == BST_CHECKED); + + bVideoDimDisplay = + (IsDlgButtonChecked(hwndDlg, IDC_VIDEODIMDISPLAY) == BST_CHECKED); if (bSystrayBatteryMeter) { @@ -479,6 +473,7 @@ gGPP.user.GlobalFlags = gGPP.user.GlobalFlags - EnableSysTrayBatteryMeter; } } + if (bPasswordLogon) { if (!(gGPP.user.GlobalFlags & EnablePasswordLogon)) @@ -493,6 +488,7 @@ gGPP.user.GlobalFlags = gGPP.user.GlobalFlags - EnablePasswordLogon; } } + if (bVideoDimDisplay) { if (!(gGPP.user.GlobalFlags & EnableVideoDimDisplay)) @@ -507,6 +503,7 @@ gGPP.user.GlobalFlags = gGPP.user.GlobalFlags - EnableVideoDimDisplay; } } + if (!IsBatteryUsed()) { SaveCurrentPowerActionPolicy(GetDlgItem(hwndDlg, IDC_POWERBUTTON), &gGPP.user.PowerButtonAc); Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c Sun Oct 21 17:02:26 2007 @@ -64,33 +64,31 @@ if (gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].Enable) { - SendMessage(GetDlgItem(hwndDlg, IDC_ALARM1), - BM_SETCHECK, - (gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].Enable ? BST_CHECKED : BST_UNCHECKED), - (LPARAM)0); + CheckDlgButton(hwndDlg, IDC_ALARM1, + gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].Enable ? BST_CHECKED : BST_UNCHECKED); if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) { - _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); - SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE1),szBatteryLevel); + _stprintf(szBatteryLevel, szTemp, gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); + SetDlgItemText(hwndDlg, IDC_ALARMVALUE1, szBatteryLevel); } - SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendDlgItemMessage(hwndDlg, IDC_ALARMBAR1, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 100)); - SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendDlgItemMessage(hwndDlg, IDC_ALARMBAR1, TBM_SETTICFREQ, (WPARAM)TRUE, (LPARAM)20); - SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendDlgItemMessage(hwndDlg, IDC_ALARMBAR1, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH)) { - SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMAKTION1),szAction); + SetDlgItemText(hwndDlg, IDC_ALARMAKTION1, szAction); } memset(szMessage, 0x0, sizeof(szMessage)); @@ -124,40 +122,37 @@ } } - SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMMSG1),szMessage); + SetDlgItemText(hwndDlg, IDC_ALARMMSG1, szMessage); if (LoadString(hApplet, IDS_PowerActionNone2, szProgram, MAX_PATH)) { - SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMPROG1),szProgram); + SetDlgItemText(hwndDlg, IDC_ALARMPROG1, szProgram); } } + if (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable) { - SendMessage(GetDlgItem(hwndDlg, IDC_ALARM2), - BM_SETCHECK, - (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED), - (LPARAM)0); + CheckDlgButton(hwndDlg, IDC_ALARM2, + gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED); + if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) { - _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); - SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE2),szBatteryLevel); + _stprintf(szBatteryLevel, szTemp, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); + SetDlgItemText(hwndDlg, IDC_ALARMVALUE2, szBatteryLevel); } - SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2), + SendDlgItemMessage(hwndDlg, IDC_ALARMBAR2, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 100)); - SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2), + SendDlgItemMessage(hwndDlg, IDC_ALARMBAR2, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH)) { - SendMessage(GetDlgItem(hwndDlg, IDC_ALARMAKTION2), - WM_SETTEXT, - (WPARAM)0, - (LPARAM)szAction); + SetDlgItemText(hwndDlg, IDC_ALARMAKTION2, szAction); } memset(szMessage, 0x0, sizeof(szMessage)); @@ -191,12 +186,13 @@ } } - SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMMSG2),szMessage); + SetDlgItemText(hwndDlg, IDC_ALARMMSG2, szMessage); if (LoadString(hApplet, IDS_PowerActionNone2, szProgram, MAX_PATH)) { - SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMPROG2),szProgram); + SetDlgItemText(hwndDlg, IDC_ALARMPROG2, szProgram); } } + return TRUE; } Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/hibernate.c (original) +++ trunk/reactos/dll/cpl/powercfg/hibernate.c Sun Oct 21 17:02:26 2007 @@ -76,20 +76,9 @@ if (GetPwrCapabilities(&PowerCaps)) { - if (PowerCaps.HiberFilePresent) - { - SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), - BM_SETCHECK, - (WPARAM)BST_CHECKED, - (LPARAM)0); - } - else - { - SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), - BM_SETCHECK, - (WPARAM)BST_UNCHECKED, - (LPARAM)0); - } + CheckDlgButton(hwndDlg, + IDC_HIBERNATEFILE, + PowerCaps.HiberFilePresent ? BST_CHECKED : BST_UNCHECKED); msex.dwLength = sizeof(msex); if (!GlobalMemoryStatusEx(&msex)) @@ -107,12 +96,13 @@ if (!GetDiskFreeSpaceEx(NULL,&FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) TotalNumberOfFreeBytes.QuadPart = 0; } + if (TotalNumberOfFreeBytes.QuadPart > 0x100000) { if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) { _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000); - SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); + SetDlgItemText(hwndDlg, IDC_FREESPACE, szSize); } } else @@ -120,7 +110,7 @@ if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) { _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart); - SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); + SetDlgItemText(hwndDlg, IDC_FREESPACE, szSize); } } @@ -129,7 +119,7 @@ if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) { _stprintf(szSize,szTemp,msex.ullTotalPhys/0x100000); - SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); + SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE,szSize); } } else @@ -137,9 +127,10 @@ if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) { _stprintf(szSize,szTemp,msex.ullTotalPhys); - SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); + SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE, szSize); } } + if (TotalNumberOfFreeBytes.QuadPart < msex.ullTotalPhys && !PowerCaps.HiberFilePresent) { EnableWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), FALSE); @@ -157,10 +148,8 @@ { BOOLEAN bHibernate; - bHibernate = (BOOLEAN)SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), - BM_GETCHECK, - (WPARAM)0, - (LPARAM)0); + bHibernate = (BOOLEAN)(IsDlgButtonChecked(hwndDlg, IDC_HIBERNATEFILE) == BST_CHECKED); + if (CallNtPowerInformation(SystemReserveHiberFile,&bHibernate, sizeof(bHibernate), NULL, 0) == STATUS_SUCCESS) { Pos_InitData(); @@ -168,5 +157,6 @@ Hib_InitDialog(hwndDlg); return TRUE; } + return FALSE; } Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c Sun Oct 21 17:02:26 2007 @@ -401,7 +401,7 @@ TCHAR szConfig[MAX_PATH]; POWER_POLICY pp; - iCurSel = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = (INT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); @@ -410,56 +410,58 @@ memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); - uiIndex = (UINT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); + uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); if(uiIndex != CB_ERR) { - SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); + SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) { _stprintf(szConfig,szTemp,szProfile); SetWindowText(GetDlgItem(hwndDlg, IDC_GRPDETAIL),szConfig); } } + for(i=0;i<17;i++) { if (Sec[i]==pp.user.VideoTimeoutAc) { - SendMessage(GetDlgItem(hwndDlg, IDC_MONITORACLIST), - CB_SETCURSEL, + SendDlgItemMessage(hwndDlg, IDC_MONITORACLIST, + CB_SETCURSEL, i, (LPARAM)0); } + if (Sec[i]==pp.user.VideoTimeoutDc) { - SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), - CB_SETCURSEL, + SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, + CB_SETCURSEL, i, (LPARAM)0); } if (Sec[i]==pp.user.SpindownTimeoutAc) { - SendMessage(GetDlgItem(hwndDlg, IDC_DISKACLIST), + SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, CB_SETCURSEL, i-2, (LPARAM)0); } if (Sec[i]==pp.user.SpindownTimeoutDc)//IdleTimeoutDc) { - SendMessage(GetDlgItem(hwndDlg, IDC_DISKDCLIST), + SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, CB_SETCURSEL, i-2, (LPARAM)0); } if (Sec[i]==pp.user.IdleTimeoutAc) { - SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), + SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, CB_SETCURSEL, i, (LPARAM)0); } if (Sec[i]==pp.user.IdleTimeoutDc) { - SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), + SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, CB_SETCURSEL, i, (LPARAM)0); @@ -467,14 +469,14 @@ if (Sec[i]==pp.mach.DozeS4TimeoutAc) { - SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), + SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, CB_SETCURSEL, i, (LPARAM)0); } if (Sec[i]==pp.mach.DozeS4TimeoutDc) { - SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), + SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, CB_SETCURSEL, i, (LPARAM)0); @@ -487,14 +489,14 @@ { INT iCurSel=0,tmp=0; - iCurSel = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = (INT) SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); if (iCurSel == CB_ERR) return; - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -502,7 +504,7 @@ { gPP[iCurSel].user.VideoTimeoutAc = Sec[tmp]; } - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_MONITORDCLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -510,7 +512,7 @@ { gPP[iCurSel].user.VideoTimeoutDc = Sec[tmp]; } - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_DISKACLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_DISKACLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -518,7 +520,7 @@ { gPP[iCurSel].user.SpindownTimeoutAc = Sec[tmp+2]; } - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_DISKDCLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -526,7 +528,7 @@ { gPP[iCurSel].user.SpindownTimeoutDc = Sec[tmp+2]; } - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_STANDBYACLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -534,7 +536,7 @@ { gPP[iCurSel].user.IdleTimeoutAc = Sec[tmp]; } - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_STANDBYDCLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -542,7 +544,7 @@ { gPP[iCurSel].user.IdleTimeoutDc = Sec[tmp]; } - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_HYBERNATEACLIST, CB_GETCURSEL, 0, (LPARAM)0); @@ -550,7 +552,7 @@ { gPP[iCurSel].mach.DozeS4TimeoutAc = Sec[tmp]; } - tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), + tmp = (INT) SendDlgItemMessage(hwndDlg, IDC_HYBERNATEDCLIST, CB_GETCURSEL, 0, (LPARAM)0);

1 0

[ekohl] 29732: Fixed indentation (TABs --> Spaces) No code changes.
by ekohl＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: ekohl Date: Sun Oct 21 16:58:35 2007 New Revision: 29732 URL: http://svn.reactos.org/svn/reactos?rev=29732&view=rev Log: Fixed indentation (TABs --> Spaces) No code changes. Modified: trunk/reactos/dll/cpl/joy/joy.c trunk/reactos/dll/cpl/joy/joy.h trunk/reactos/dll/cpl/joy/lang/en-US.rc trunk/reactos/dll/cpl/joy/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/joy/joy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.c?rev=2973… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.c (original) +++ trunk/reactos/dll/cpl/joy/joy.c Sun Oct 21 16:58:35 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: ReactOS Software Control Panel - * FILE: dll/cpl/joy/joy.c - * PURPOSE: ReactOS Software Control Panel - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/joy/joy.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 10-18-2007 Created */ @@ -41,31 +41,36 @@ {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; -VOID AddColumns(HWND hList) -{ - LV_COLUMN dummy; - RECT rect; - int Size; - TCHAR szBuf[256]; - - GetClientRect(hList, &rect); - ZeroMemory(&dummy, sizeof(LV_COLUMN)); - dummy.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; - dummy.iSubItem = 0; - LoadString(hApplet, IDS_STATUS, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - dummy.pszText = (LPTSTR)szBuf; - Size = rect.right - rect.left - 250; - dummy.cx = Size; - (void)ListView_InsertColumn(hList, 0, &dummy); - - GetClientRect(hList, &rect); - ZeroMemory(&dummy, sizeof(LV_COLUMN)); - dummy.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; - dummy.iSubItem = 0; - LoadString(hApplet, IDS_CONTROLLER, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - dummy.pszText = (LPTSTR)szBuf; - dummy.cx = rect.right - rect.left - Size; - (void)ListView_InsertColumn(hList, 0, &dummy); +VOID +AddColumns(HWND hList) +{ + LV_COLUMN dummy; + RECT rect; + int Size; + TCHAR szBuf[256]; + + GetClientRect(hList, &rect); + Size = rect.right - rect.left - 250; + + LoadString(hApplet, IDS_STATUS, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + + ZeroMemory(&dummy, sizeof(LV_COLUMN)); + dummy.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + dummy.iSubItem = 0; + dummy.pszText = (LPTSTR)szBuf; + dummy.cx = Size; + (void)ListView_InsertColumn(hList, 0, &dummy); + + GetClientRect(hList, &rect); + + LoadString(hApplet, IDS_CONTROLLER, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + + ZeroMemory(&dummy, sizeof(LV_COLUMN)); + dummy.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + dummy.iSubItem = 0; + dummy.pszText = (LPTSTR)szBuf; + dummy.cx = rect.right - rect.left - Size; + (void)ListView_InsertColumn(hList, 0, &dummy); } INT_PTR CALLBACK @@ -76,33 +81,34 @@ switch (uMsg) { case WM_INITDIALOG: - - break; + break; case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - case IDCANCEL: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - } - break; - case WM_NOTIFY: - - break; - case WM_SYSCOMMAND: - switch (LOWORD(wParam)) - { - case SC_CONTEXTHELP: - // not implemented - break; - } - break; - } - return 0; + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + + case IDCANCEL: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + + case WM_NOTIFY: + break; + + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; } INT_PTR CALLBACK @@ -113,33 +119,34 @@ switch (uMsg) { case WM_INITDIALOG: - - break; + break; case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - case IDCANCEL: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - } - break; - case WM_NOTIFY: - - break; - case WM_SYSCOMMAND: - switch (LOWORD(wParam)) - { - case SC_CONTEXTHELP: - // not implemented - break; - } - break; - } - return 0; + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + + case IDCANCEL: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + + case WM_NOTIFY: + break; + + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; } INT_PTR CALLBACK @@ -150,39 +157,41 @@ switch (uMsg) { case WM_INITDIALOG: - - break; + break; case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_CUSTOM_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_CUSTOM), - hwndDlg, - CustomPageProc); - break; - case IDOK: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - case IDCANCEL: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - } - break; - case WM_NOTIFY: - - break; - case WM_SYSCOMMAND: - switch (LOWORD(wParam)) - { - case SC_CONTEXTHELP: - // not implemented - break; - } - break; - } - return 0; + switch (LOWORD(wParam)) + { + case IDC_CUSTOM_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_CUSTOM), + hwndDlg, + CustomPageProc); + break; + + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + + case IDCANCEL: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + + case WM_NOTIFY: + break; + + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; } /* Property page dialog callback */ @@ -194,51 +203,55 @@ switch (uMsg) { case WM_INITDIALOG: - AddColumns(GetDlgItem(hwndDlg,IDC_CONTROLLER_LIST)); - break; + AddColumns(GetDlgItem(hwndDlg,IDC_CONTROLLER_LIST)); + break; case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_ADD_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_ADD), - hwndDlg, - AddPageProc); - break; - case IDC_ADVANCED_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_ADVANCED), - hwndDlg, - AdvancedPageProc); - break; - case IDOK: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - } - break; - case WM_NOTIFY: - - break; - case WM_SYSCOMMAND: - switch (LOWORD(wParam)) - { - case SC_CLOSE: - EndDialog(hwndDlg,LOWORD(wParam)); - break; - case SC_CONTEXTHELP: - // not implemented - break; - } - break; - } - return 0; + switch (LOWORD(wParam)) + { + case IDC_ADD_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_ADD), + hwndDlg, + AddPageProc); + break; + + case IDC_ADVANCED_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_ADVANCED), + hwndDlg, + AdvancedPageProc); + break; + + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + + case WM_NOTIFY: + break; + + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CLOSE: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; } /* First Applet */ LONG CALLBACK SystemApplet(VOID) -{ +{ DialogBox(hApplet, MAKEINTRESOURCE(IDD_PROPPAGEMAIN), MainDlg, @@ -274,10 +287,10 @@ break; case CPL_DBLCLK: - { - MainDlg = hwndCPl; - Applets[i].AppletProc(); - } + { + MainDlg = hwndCPl; + Applets[i].AppletProc(); + } break; } Modified: trunk/reactos/dll/cpl/joy/joy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.h?rev=2973… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.h (original) +++ trunk/reactos/dll/cpl/joy/joy.h Sun Oct 21 16:58:35 2007 @@ -16,18 +16,18 @@ typedef struct { - int idIcon; - int idName; - int idDescription; - CPLAPPLET_PROC AppletProc; + int idIcon; + int idName; + int idDescription; + CPLAPPLET_PROC AppletProc; } APPLET, *PAPPLET; typedef struct { - WCHAR szTarget[MAX_PATH]; - WCHAR szWorkingDirectory[MAX_PATH]; - WCHAR szDescription[MAX_PATH]; - WCHAR szLinkName[MAX_PATH]; + WCHAR szTarget[MAX_PATH]; + WCHAR szWorkingDirectory[MAX_PATH]; + WCHAR szDescription[MAX_PATH]; + WCHAR szLinkName[MAX_PATH]; }CREATE_LINK_CONTEXT, *PCREATE_LINK_CONTEXT; Modified: trunk/reactos/dll/cpl/joy/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/en-US.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/joy/lang/en-US.rc Sun Oct 21 16:58:35 2007 @@ -5,80 +5,80 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Game Controllers" FONT 8, "MS Shell Dlg" -{ - ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 - LTEXT "These settings help you configure the game controllers installed on your computer.", -1, 33, 7, 214, 20, NOT WS_GROUP - GROUPBOX "I&nstalled game controllers", -1, 7, 34, 238, 117 - CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 - PUSHBUTTON "&Add...", IDC_ADD_BUTTON, 35, 129, 65, 14 - PUSHBUTTON "&Remove", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED - PUSHBUTTON "&Properties", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED - PUSHBUTTON "A&dvanced...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 - PUSHBUTTON "&Troubleshoot...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 - PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 -} +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "These settings help you configure the game controllers installed on your computer.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "I&nstalled game controllers", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Add...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Remove", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Properties", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "A&dvanced...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "&Troubleshoot...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END IDD_ADD DIALOGEX 0, 0, 265, 200 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Add Game Controller" FONT 8, "MS Shell Dlg" -{ - ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 - LTEXT "Select a game controller from the list below, and then click OK. If your game controller does not appear in the list, click Custom.", -1, 35, 7, 210, 33 - LTEXT "&Game controllers:", -1, 8, 45, 126, 8 - LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Enable rudders and pedals", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP - LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE - COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL - PUSHBUTTON "&Custom...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 - CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 - DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 208, 179, 50, 14 -} +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Select a game controller from the list below, and then click OK. If your game controller does not appear in the list, click Custom.", -1, 35, 7, 210, 33 + LTEXT "&Game controllers:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Enable rudders and pedals", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Custom...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 208, 179, 50, 14 +END IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Custom Game Controller" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Special characteristics", -1, 7, 7, 245, 52 - AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 - AUTORADIOBUTTON "&Flight yoke or flight stick", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 - AUTORADIOBUTTON "&Game pad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 - AUTORADIOBUTTON "&Race car controller", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 - GROUPBOX "&Axes", -1, 7, 67, 116, 44, WS_GROUP - COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTORADIOBUTTON "Rudder/Pedals", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE - AUTORADIOBUTTON "Z Axis", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE - GROUPBOX "&Buttons", -1, 137, 67, 116, 44 - COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE - AUTOCHECKBOX "Includes a &point of view control", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 - LTEXT "C&ontroller name:", -1, 7, 139, 200, 9 - EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 203, 150, 50, 14 -} +BEGIN + GROUPBOX "Special characteristics", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Flight yoke or flight stick", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "&Game pad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&Race car controller", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "&Axes", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Rudder/Pedals", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Z Axis", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "&Buttons", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Includes a &point of view control", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "C&ontroller name:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 203, 150, 50, 14 +END IDD_ADVANCED DIALOGEX 0, 0, 220, 86 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Advanced Settings" FONT 8, "MS Shell Dlg" -{ - ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 - DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 163, 65, 50, 14 - LTEXT "Select the device you want to use with older programs.", -1, 7, 7, 208, 10 - LTEXT "&Preferred device:", -1, 34, 24, 70, 10 - COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL -} +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 163, 65, 50, 14 + LTEXT "Select the device you want to use with older programs.", -1, 7, 7, 208, 10 + LTEXT "&Preferred device:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END -STRINGTABLE +STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Game Controllers" - IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." - IDS_CONTROLLER "Controller" - IDS_STATUS "Status" + IDS_CPLSYSTEMNAME "Game Controllers" + IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." + IDS_CONTROLLER "Controller" + IDS_STATUS "Status" END Modified: trunk/reactos/dll/cpl/joy/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ru-RU.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/joy/lang/ru-RU.rc Sun Oct 21 16:58:35 2007 @@ -5,80 +5,80 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Èãðîâûå óñòðîéñòâà" FONT 8, "MS Shell Dlg" -{ - ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 - LTEXT "Ýòè ïàðàìåòðû ïîçâîëÿþò íàñòðîèòü èãðîâûå óñòðîéñòâà, óñòàíîâëåííûå íà êîìïüþòåðå.", -1, 33, 7, 214, 20, NOT WS_GROUP - GROUPBOX "Óñòàíîâëåííûå &èãðîâûå óñòðîéñòâà", -1, 7, 34, 238, 117 - CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 - PUSHBUTTON "Äî&áàâèòü...", IDC_ADD_BUTTON, 35, 129, 65, 14 - PUSHBUTTON "&Óäàëèòü", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED - PUSHBUTTON "Ñâî&éñòâà", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED - PUSHBUTTON "Ä&îïîëíèòåëüíî...", IDC_ADVANCED_BUTTON, 101, 157, 70, 14 - PUSHBUTTON "Äèà&ãíîñòèêà...", IDC_TROUBLESHOOT_BUTTON, 175, 157, 70, 14 - PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 -} +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Ýòè ïàðàìåòðû ïîçâîëÿþò íàñòðîèòü èãðîâûå óñòðîéñòâà, óñòàíîâëåííûå íà êîìïüþòåðå.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "Óñòàíîâëåííûå &èãðîâûå óñòðîéñòâà", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "Äî&áàâèòü...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Óäàëèòü", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Ñâî&éñòâà", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Ä&îïîëíèòåëüíî...", IDC_ADVANCED_BUTTON, 101, 157, 70, 14 + PUSHBUTTON "Äèà&ãíîñòèêà...", IDC_TROUBLESHOOT_BUTTON, 175, 157, 70, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END IDD_ADD DIALOGEX 0, 0, 265, 200 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Äîáàâëåíèå èãðîâîãî óñòðîéñòâà" FONT 8, "MS Shell Dlg" -{ - ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 - LTEXT "Âûáåðèòå èãðîâîé êîíòðîëëåð â ðàñïîëîæåííîì íèæå ñïèñêå è íàæìèòå êíîïêó ÎÊ. Åñëè âàø èãðîâîé êîíòðîëëåð îòñóòñòâóåò â ñïèñêå, íàæìèòå êíîïêó ""Äðóãîé"".", -1, 35, 7, 210, 33 - LTEXT "&Èãðîâûå óñòðîéñòâà:", -1, 8, 45, 126, 8 - LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Ïîäêëþ÷èòü ðóëü èëè ïåäàëè", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 120, 10, WS_GROUP - LTEXT "&Èãðîâîé ïîðò:", -1, 7, 134, 38, 8, NOT WS_VISIBLE - COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL - PUSHBUTTON "&Äðóãîé...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 - CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 - DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 - PUSHBUTTON "Îòìåíà", IDCANCEL, 208, 179, 50, 14 -} +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Âûáåðèòå èãðîâîé êîíòðîëëåð â ðàñïîëîæåííîì íèæå ñïèñêå è íàæìèòå êíîïêó ÎÊ. Åñëè âàø èãðîâîé êîíòðîëëåð îòñóòñòâóåò â ñïèñêå, íàæìèòå êíîïêó ""Äðóãîé"".", -1, 35, 7, 210, 33 + LTEXT "&Èãðîâûå óñòðîéñòâà:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Ïîäêëþ÷èòü ðóëü èëè ïåäàëè", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 120, 10, WS_GROUP + LTEXT "&Èãðîâîé ïîðò:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Äðóãîé...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 208, 179, 50, 14 +END IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Îñîáîå èãðîâîå óñòðîéñòâî" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Îñîáåííîñòè", -1, 7, 7, 245, 52 - AUTORADIOBUTTON "&Äæîéñòèê", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 - AUTORADIOBUTTON "&Øòóðâàë èëè ðóêîÿòêà óïðàâëåíèÿ", IDC_FLIGHT_YOKE_RADIO, 100, 23, 143, 10 - AUTORADIOBUTTON "&Èãðîâîé ïëàíøåò", IDC_GAME_PAD_RADIO, 17, 40, 75, 10 - AUTORADIOBUTTON "Óïðàâëåíèå ãîíî÷íîé &àâòîìàøèíîé", IDC_RACE_CAR_RADIO, 100, 40, 143, 10 - GROUPBOX "&Ñòåïåíü ñâîáîäû", -1, 7, 67, 116, 44, WS_GROUP - COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTORADIOBUTTON "Ðóëü óïðàâëåíèÿ èëè ïåäàëè", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE - AUTORADIOBUTTON "Îñü Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE - GROUPBOX "Ê&íîïêè", -1, 137, 67, 116, 44 - COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE - AUTOCHECKBOX "Èìååòñÿ &ïåðåêëþ÷àòåëü POV", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 - LTEXT "&Êîíòðîëåð:", -1, 7, 139, 200, 9 - EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 - PUSHBUTTON "Îòìåíà", IDCANCEL, 203, 150, 50, 14 -} +BEGIN + GROUPBOX "Îñîáåííîñòè", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Äæîéñòèê", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Øòóðâàë èëè ðóêîÿòêà óïðàâëåíèÿ", IDC_FLIGHT_YOKE_RADIO, 100, 23, 143, 10 + AUTORADIOBUTTON "&Èãðîâîé ïëàíøåò", IDC_GAME_PAD_RADIO, 17, 40, 75, 10 + AUTORADIOBUTTON "Óïðàâëåíèå ãîíî÷íîé &àâòîìàøèíîé", IDC_RACE_CAR_RADIO, 100, 40, 143, 10 + GROUPBOX "&Ñòåïåíü ñâîáîäû", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Ðóëü óïðàâëåíèÿ èëè ïåäàëè", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Îñü Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "Ê&íîïêè", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Èìååòñÿ &ïåðåêëþ÷àòåëü POV", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "&Êîíòðîëåð:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 203, 150, 50, 14 +END IDD_ADVANCED DIALOGEX 0, 0, 220, 86 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû" FONT 8, "MS Shell Dlg" -{ - ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 - LTEXT "Âûáåðèòå óñòðîéñòâî, êîòîðîå ñëåäóåò èñïîëüçîâàòü ñî ñòàðûìè ïðîãðàììàìè.", -1, 7, 5, 208, 17 - LTEXT "&Ïðåäïî÷èòàåìîå óñòðîéñòâî:", -1, 34, 24, 180, 10 - COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 - PUSHBUTTON "Îòìåíà", IDCANCEL, 163, 65, 50, 14 -} +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + LTEXT "Âûáåðèòå óñòðîéñòâî, êîòîðîå ñëåäóåò èñïîëüçîâàòü ñî ñòàðûìè ïðîãðàììàìè.", -1, 7, 5, 208, 17 + LTEXT "&Ïðåäïî÷èòàåìîå óñòðîéñòâî:", -1, 34, 24, 180, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 163, 65, 50, 14 +END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Èãðîâûå óñòðîéñòâà" - IDS_CPLSYSTEMDESCRIPTION "Äîáàâëåíèå, óäàëåíèå è íàñòðîéêà ïàðàìåòðîâ èãðîâûõ óñòðîéñòâ, íàïðèìåð, äæîéñòèêîâ èëè èãðîâûõ ïëàíøåòîâ." - IDS_CONTROLLER "Óñòðîéñòâî" - IDS_STATUS "Ñîñòîÿíèå" + IDS_CPLSYSTEMNAME "Èãðîâûå óñòðîéñòâà" + IDS_CPLSYSTEMDESCRIPTION "Äîáàâëåíèå, óäàëåíèå è íàñòðîéêà ïàðàìåòðîâ èãðîâûõ óñòðîéñòâ, íàïðèìåð, äæîéñòèêîâ èëè èãðîâûõ ïëàíøåòîâ." + IDS_CONTROLLER "Óñòðîéñòâî" + IDS_STATUS "Ñîñòîÿíèå" END

1 0

[dreimer] 29731: Updates to Config by Pierre Schweitzer. Changes: - Continue dralnix code cleanup. - Added checks to avoid buffers overflow. - Updated french translation.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Sun Oct 21 16:23:13 2007 New Revision: 29731 URL: http://svn.reactos.org/svn/reactos?rev=29731&view=rev Log: Updates to Config by Pierre Schweitzer. Changes: - Continue dralnix code cleanup. - Added checks to avoid buffers overflow. - Updated french translation. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sun Oct 21 16:23:13 2007 @@ -13,8 +13,8 @@ CONTROL "Texte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15 CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 110, 21 CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 100, 85, 21 - CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 120, 60, 21 + CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 + CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 120, 90, 21 EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sun Oct 21 16:23:13 2007 @@ -81,7 +81,8 @@ } wcscpy(checkmgw, mingwpath); - wcscat(checkmgw, L"\\bin\\gcc.exe"); + if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH) + wcscat(checkmgw, L"\\bin\\gcc.exe"); hFile = CreateFile(checkmgw, (INT)NULL, (INT)NULL, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { @@ -146,7 +147,8 @@ SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); GetCurrentDirectory(MAX_PATH, defaultmingwpath); - wcscat(defaultmingwpath, MINGWVERSION); + if ((wcslen(defaultmingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) + wcscat(defaultmingwpath, MINGWVERSION); SetDlgItemText(Dlg, ID_MGWDIR, defaultmingwpath); return TRUE; @@ -154,72 +156,8 @@ case WM_COMMAND: { - if (wParam == ID_CANCEL) - { - PostMessage(Dlg, WM_CLOSE, 0, 0); - } - else if (wParam == ID_OK) - { - if (WriteSettings(Dlg)) - PostMessage(Dlg, WM_CLOSE, 0, 0); - } - else if (wParam == ID_BROWSE) - { - WCHAR Path[MAX_PATH]; - BROWSEINFO PathInfo; - ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); - PathInfo.hwndOwner = Dlg; - PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; - LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); - if (pidl && SHGetPathFromIDList(pidl, Path)) - { - SetDlgItemText(Dlg, ID_LOGDIR, Path); - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - } - } - else if (wParam == ID_BROWSEMGW) - { - WCHAR MGWPath[MAX_PATH]; - BROWSEINFO PathInfo; - HINSTANCE hDLL; - ILCREATEFROMPATHW ILCreateFromPathW; - ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); - hDLL = LoadLibrary(L"shell32.dll"); - if (hDLL) - { - ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); - if (ILCreateFromPathW) - { - GetDlgItemText(Dlg, ID_MGWDIR, MGWPath, MAX_PATH); - PathInfo.pidlRoot = ILCreateFromPathW(MGWPath); - } - FreeLibrary(hDLL); - } - PathInfo.hwndOwner = Dlg; - PathInfo.lpszTitle = L"Please choose the directory where MingW is located:"; - LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); - if (pidl && SHGetPathFromIDList(pidl, MGWPath)) - { - SetDlgItemText(Dlg, ID_MGWDIR, MGWPath); - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - } - } - else if (wParam == ID_SAVELOGS) - { - BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, - 0) == BST_CHECKED; - EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); - EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); - } - else if (wParam == ID_STRIP) - { - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - } - else if (wParam == ID_USECCACHE) - { - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - } - else if ((wParam == ID_SHOWBUILDTIME) || ((LOWORD(wParam) == IDC_FONT) && (HIWORD(wParam) == CBN_SELCHANGE)) || ((LOWORD(wParam) == IDC_BACK) && (HIWORD(wParam) == CBN_SELCHANGE))) + if (((LOWORD(wParam) == IDC_FONT) && (HIWORD(wParam) == CBN_SELCHANGE)) || + ((LOWORD(wParam) == IDC_BACK) && (HIWORD(wParam) == CBN_SELCHANGE))) { RECT rcWnd; GetClientRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd); @@ -227,6 +165,74 @@ UpdateWindow(GetDlgItem(Dlg, ID_EXAMPLE)); EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); } + else + { + switch (wParam) + { + case ID_OK: + { + if (!WriteSettings(Dlg)) + break; + } + case ID_CANCEL: + { + PostMessage(Dlg, WM_CLOSE, 0, 0); + break; + } + case ID_BROWSE: + case ID_BROWSEMGW: + { + WCHAR Path[MAX_PATH]; + BROWSEINFO PathInfo; + LPITEMIDLIST pidl; + INT Control = ID_LOGDIR; + ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); + PathInfo.hwndOwner = Dlg; + PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; + if (wParam == ID_BROWSEMGW) + { + HINSTANCE hDLL; + ILCREATEFROMPATHW ILCreateFromPathW; + Control = ID_MGWDIR; + PathInfo.lpszTitle = L"Please choose the directory where MingW is located:"; + hDLL = LoadLibrary(L"shell32.dll"); + if (hDLL) + { + ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); + if (ILCreateFromPathW) + { + GetDlgItemText(Dlg, ID_MGWDIR, Path, MAX_PATH); + PathInfo.pidlRoot = ILCreateFromPathW(Path); + } + FreeLibrary(hDLL); + } + } + pidl = SHBrowseForFolder(&PathInfo); + if (pidl && SHGetPathFromIDList(pidl, Path)) + { + SetDlgItemText(Dlg, Control, Path); + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + } + break; + } + case ID_SAVELOGS: + { + BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, + 0) == BST_CHECKED; + EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); + break; + } + case ID_STRIP: + case ID_USECCACHE: + case ID_SHOWBUILDTIME: + { + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); + break; + } + } + + } return FALSE; } Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Sun Oct 21 16:23:13 2007 @@ -10,14 +10,12 @@ #define ID_BROWSEMGW 0x9 #define ID_DIALOG 0xa #define ID_EXAMPLE 0xb -#define IDC_FONT 0xc -#define IDC_BACK 0xd -#define ID_USECCACHE 0xe -#define ID_STRIP 0xf +#define ID_USECCACHE 0xc +#define ID_STRIP 0xd +#define IDC_FONT 0xe +#define IDC_BACK 0xf /* Strings */ #define MSG_NOGCCFOUND 0x50 #define MSG_FILEFAILED 0x51 #define MSG_DIREFAILED 0x52 - -

1 0

[hpoussin] 29730: Replace STDCALL by APIENTRY Remove keywords property
by hpoussin＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: hpoussin Date: Sun Oct 21 15:50:55 2007 New Revision: 29730 URL: http://svn.reactos.org/svn/reactos?rev=29730&view=rev Log: Replace STDCALL by APIENTRY Remove keywords property Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/bitblt.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/bitblt.h (props changed) trunk/reactos/drivers/video/displays/vga/objects/brush.h (props changed) trunk/reactos/drivers/video/displays/vga/objects/copybits.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/lineto.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/offscreen.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/paint.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/pointer.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/screen.c (props changed) trunk/reactos/drivers/video/displays/vga/objects/transblt.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgaddi.def (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgaddi.h (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgaddi.rc (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c (props changed) trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h (props changed) Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/main/enable.c (original) +++ trunk/reactos/drivers/video/displays/vga/main/enable.c Sun Oct 21 15:50:55 2007 @@ -1,10 +1,5 @@ /* * entry.c - * - * $Revision: 1.5 $ - * $Author$ - * $Date$ - * */ #include "../vgaddi.h" @@ -180,7 +175,7 @@ }; -BOOL STDCALL +BOOL APIENTRY DrvEnableDriver(IN ULONG EngineVersion, IN ULONG SizeOfDED, OUT PDRVENABLEDATA DriveEnableData) @@ -206,7 +201,7 @@ // RETURNS: // NONE -VOID STDCALL +VOID APIENTRY DrvDisableDriver(VOID) { return; @@ -235,7 +230,7 @@ // RETURNS: // DHPDEV a handle to a DPev object -DHPDEV STDCALL +DHPDEV APIENTRY DrvEnablePDEV(IN DEVMODEW *DM, IN LPWSTR LogAddress, IN ULONG PatternCount, @@ -286,7 +281,7 @@ // Called after initialization of PDEV is complete. Supplies // a reference to the GDI handle for the PDEV. -VOID STDCALL +VOID APIENTRY DrvCompletePDEV(IN DHPDEV PDev, IN HDEV Dev) { @@ -294,7 +289,7 @@ } -BOOL STDCALL +BOOL APIENTRY DrvAssertMode(IN DHPDEV DPev, IN BOOL Enable) { @@ -334,7 +329,7 @@ } -VOID STDCALL +VOID APIENTRY DrvDisablePDEV(IN DHPDEV PDev) { PPDEV ppdev = (PPDEV)PDev; @@ -354,7 +349,7 @@ } -VOID STDCALL +VOID APIENTRY DrvDisableSurface(IN DHPDEV PDev) { PPDEV ppdev = (PPDEV)PDev; @@ -442,7 +437,7 @@ } -HSURF STDCALL +HSURF APIENTRY DrvEnableSurface(IN DHPDEV PDev) { PPDEV ppdev = (PPDEV)PDev; @@ -531,7 +526,7 @@ } -ULONG STDCALL +ULONG APIENTRY DrvGetModes(IN HANDLE Driver, IN ULONG DataSize, OUT PDEVMODEW DM) Propchange: trunk/reactos/drivers/video/displays/vga/main/enable.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Sun Oct 21 15:50:55 2007 @@ -7,16 +7,16 @@ #include <debug.h> typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj, - SURFOBJ* InputObj, - SURFOBJ* Mask, - XLATEOBJ* ColorTranslation, - RECTL* OutputRect, - POINTL* InputPoint, - POINTL* MaskOrigin, - BRUSHOBJ* Brush, - POINTL* BrushOrigin, - ROP4 Rop4); +typedef BOOL (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj, + SURFOBJ* InputObj, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* OutputRect, + POINTL* InputPoint, + POINTL* MaskOrigin, + BRUSHOBJ* Brush, + POINTL* BrushOrigin, + ROP4 Rop4); static BOOL FASTCALL VGADDI_IntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2) { @@ -167,7 +167,7 @@ return TRUE; } -BOOL STDCALL +BOOL APIENTRY VGADDI_BltBrush(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* MaskSurf, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, POINTL* MaskPoint, @@ -298,7 +298,7 @@ return TRUE; } -BOOL STDCALL +BOOL APIENTRY VGADDI_BltSrc(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, POINTL* MaskOrigin, BRUSHOBJ* Brush, POINTL* BrushOrigin, ROP4 Rop4) @@ -338,7 +338,7 @@ return(TRUE); } -BOOL STDCALL +BOOL APIENTRY VGADDI_BltMask(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, POINTL* MaskPoint, BRUSHOBJ* Brush, @@ -375,7 +375,7 @@ return TRUE; } -BOOL STDCALL +BOOL APIENTRY DrvBitBlt(SURFOBJ *Dest, SURFOBJ *Source, SURFOBJ *Mask, Propchange: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/objects/bitblt.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/objects/brush.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/copybits.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/copybits.c Sun Oct 21 15:50:55 2007 @@ -2,7 +2,7 @@ #include "../vgavideo/vgavideo.h" #include <debug.h> -BOOL STDCALL +BOOL APIENTRY DrvCopyBits(OUT SURFOBJ* DestObj, IN SURFOBJ* SourceObj, IN CLIPOBJ* ClipObj, Propchange: trunk/reactos/drivers/video/displays/vga/objects/copybits.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/lineto.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/lineto.c Sun Oct 21 15:50:55 2007 @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id$ */ #include "../vgaddi.h" @@ -290,7 +289,7 @@ * FIXME: Use Mix to perform ROPs * FIXME: Non-solid Brush */ -BOOL STDCALL +BOOL APIENTRY DrvLineTo(SURFOBJ *DestObj, CLIPOBJ *Clip, BRUSHOBJ *Brush, Propchange: trunk/reactos/drivers/video/displays/vga/objects/lineto.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/offscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/offscreen.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/offscreen.c Sun Oct 21 15:50:55 2007 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS VGA16 display driver * FILE: drivers/dd/vga/display/objects/offscreen.c * PURPOSE: Manages off-screen video memory. Propchange: trunk/reactos/drivers/video/displays/vga/objects/offscreen.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/paint.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/paint.c Sun Oct 21 15:50:55 2007 @@ -170,7 +170,7 @@ -BOOL STDCALL +BOOL APIENTRY DrvPaint(IN SURFOBJ *Surface, IN CLIPOBJ *ClipRegion, IN BRUSHOBJ *Brush, Propchange: trunk/reactos/drivers/video/displays/vga/objects/paint.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/pointer.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/pointer.c Sun Oct 21 15:50:55 2007 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS VGA16 display driver * FILE: drivers/dd/vga/display/objects/pointer.c * PURPOSE: Draws the mouse pointer. @@ -190,7 +189,7 @@ return(TRUE); } -VOID STDCALL +VOID APIENTRY DrvMovePointer(IN SURFOBJ* pso, IN LONG x, IN LONG y, @@ -210,7 +209,7 @@ } -ULONG STDCALL +ULONG APIENTRY DrvSetPointerShape(SURFOBJ* pso, SURFOBJ* psoMask, SURFOBJ* psoColor, Propchange: trunk/reactos/drivers/video/displays/vga/objects/pointer.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/objects/screen.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/transblt.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/transblt.c Sun Oct 21 15:50:55 2007 @@ -6,7 +6,7 @@ #define NDEBUG #include <debug.h> -BOOL STDCALL +BOOL APIENTRY DrvTransparentBlt(SURFOBJ* Dest, SURFOBJ* Source, CLIPOBJ* Clip, Propchange: trunk/reactos/drivers/video/displays/vga/objects/transblt.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.def (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.def Sun Oct 21 15:50:55 2007 @@ -1,4 +1,4 @@ -; $Id$ +; $Id: vgaddi.def 26978 2007-06-03 16:45:34Z greatlrd $ ; ; vgaddi.def ; Propchange: trunk/reactos/drivers/video/displays/vga/vgaddi.def ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.h (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h Sun Oct 21 15:50:55 2007 @@ -1,3 +1,6 @@ +#ifndef _VGADDI_H_ +#define _VGADDI_H_ + #define _WINBASE_ #define _WINDOWS_H #include <stdarg.h> @@ -275,8 +278,10 @@ PVIDEO_MODE_INFORMATION *modeInformation, DWORD *ModeSize); -void FASTCALL -vgaReadScan ( int x, int y, int w, void *b ); - -void FASTCALL -vgaWriteScan ( int x, int y, int w, void *b ); +VOID FASTCALL +vgaReadScan(int x, int y, int w, void *b); + +VOID FASTCALL +vgaWriteScan(int x, int y, int w, void *b); + +#endif /* _VGADDI_H_ */ Propchange: trunk/reactos/drivers/video/displays/vga/vgaddi.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.rc (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.rc Sun Oct 21 15:50:55 2007 @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VGA Display Driver\0" #define REACTOS_STR_INTERNAL_NAME "vgaddi\0" Propchange: trunk/reactos/drivers/video/displays/vga/vgaddi.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

1 0

[ekohl] 29729: - Keep the value type of each environment variable that was read from the registry and assign the right type for new and modified variables. - Read and write the the raw (non-expanded) environment variables and display the cooked (expanded) ones only.
by ekohl＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: ekohl Date: Sun Oct 21 15:13:03 2007 New Revision: 29729 URL: http://svn.reactos.org/svn/reactos?rev=29729&view=rev Log: - Keep the value type of each environment variable that was read from the registry and assign the right type for new and modified variables. - Read and write the the raw (non-expanded) environment variables and display the cooked (expanded) ones only. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sun Oct 21 15:13:03 2007 @@ -12,6 +12,7 @@ typedef struct _VARIABLE_DATA { + DWORD dwType; LPTSTR lpName; LPTSTR lpRawValue; LPTSTR lpCookedValue; @@ -53,7 +54,7 @@ case IDOK: dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); - if (dwNameLength != 0 && dwValueLength != 0) + if (dwNameLength > 0 && dwValueLength > 0) { if (VarData->lpName == NULL) { @@ -77,20 +78,26 @@ } SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); + if (VarData->lpCookedValue != NULL) + { + GlobalFree(VarData->lpCookedValue); + VarData->lpCookedValue = NULL; + } + if (_tcschr(VarData->lpRawValue, _T('%'))) { - if (VarData->lpCookedValue == NULL) - { - VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); - } + VarData->dwType = REG_EXPAND_SZ; + VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); ExpandEnvironmentStrings(VarData->lpRawValue, VarData->lpCookedValue, 2 * MAX_PATH); } - else if (VarData->lpCookedValue) + else { - GlobalFree(VarData->lpCookedValue); + VarData->dwType = REG_SZ; + VarData->lpCookedValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpCookedValue, VarData->lpRawValue); } } EndDialog(hwndDlg, 1); @@ -119,7 +126,7 @@ DWORD i; LPTSTR lpName; LPTSTR lpData; - LPTSTR lpExpandData = NULL; + LPTSTR lpExpandData; DWORD dwNameLength; DWORD dwDataLength; DWORD dwType; @@ -167,19 +174,28 @@ return; } + lpExpandData = GlobalAlloc(GPTR, 2048 * sizeof(TCHAR)); + if (lpExpandData == NULL) + { + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); + return; + } + for (i = 0; i < dwValues; i++) { dwNameLength = dwMaxValueNameLength + 1; dwDataLength = dwMaxValueDataLength + 1; if (RegEnumValue(hKey, - i, - lpName, - &dwNameLength, - NULL, - &dwType, - (LPBYTE)lpData, - &dwDataLength)) + i, + lpName, + &dwNameLength, + NULL, + &dwType, + (LPBYTE)lpData, + &dwDataLength)) { GlobalFree(lpName); GlobalFree(lpData); @@ -187,7 +203,12 @@ return; } + if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) + continue; + VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + + VarData->dwType = dwType; VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); _tcscpy(VarData->lpName, lpName); @@ -195,25 +216,10 @@ VarData->lpRawValue = GlobalAlloc(GPTR, (dwDataLength + 1) * sizeof(TCHAR)); _tcscpy(VarData->lpRawValue, lpData); - if (dwType == REG_EXPAND_SZ) - { - lpExpandData = GlobalAlloc(GPTR, MAX_PATH * 2* sizeof(TCHAR)); - if (lpExpandData == NULL) - { - GlobalFree(lpName); - GlobalFree(lpData); - RegCloseKey(hKey); - return; - } - - ExpandEnvironmentStrings(lpData, - lpExpandData, - 2 * MAX_PATH); - - VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpCookedValue, lpExpandData); - GlobalFree(lpExpandData); - } + ExpandEnvironmentStrings(lpData, lpExpandData, 2048); + + VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpCookedValue, lpExpandData); memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; @@ -222,10 +228,10 @@ lvi.state = (i == 0) ? LVIS_SELECTED : 0; iItem = ListView_InsertItem(hwndListView, &lvi); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); - } - + ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); + } + + GlobalFree(lpExpandData); GlobalFree(lpName); GlobalFree(lpData); RegCloseKey(hKey); @@ -316,7 +322,7 @@ if (!DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - (DLGPROC) EditVariableDlgProc, + (DLGPROC)EditVariableDlgProc, (LPARAM)VarData) > 0) { if (VarData->lpName != NULL) @@ -332,7 +338,7 @@ } else { - if(VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue)) + if (VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue)) { memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; @@ -341,8 +347,7 @@ lvi.state = 0; iItem = ListView_InsertItem(hwndListView, &lvi); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); } } } @@ -373,12 +378,11 @@ if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - (DLGPROC) EditVariableDlgProc, + (DLGPROC)EditVariableDlgProc, (LPARAM)VarData) > 0) { ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); } } } @@ -468,6 +472,7 @@ } } + VOID SetAllVars(HWND hwndDlg, INT iDlgItem) @@ -477,7 +482,6 @@ LV_ITEM lvi; INT iItem; HKEY hk; - DWORD Type = 0; memset(&lvi, 0x00, sizeof(lvi)); @@ -503,28 +507,26 @@ return; } - /* loop through all system variables */ + /* Loop through all variables */ while(ListView_GetItem(hwndListView, &lvi)) { /* Get the data in each item */ VarData = (PVARIABLE_DATA)lvi.lParam; if (VarData != NULL) { - /* Get the type */ - RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); - /* Set the new value */ if (RegSetValueEx(hk, VarData->lpName, 0, - Type, - (LPBYTE) VarData->lpRawValue, + VarData->dwType, + (LPBYTE)VarData->lpRawValue, (DWORD)(_tcslen(VarData->lpRawValue) + 1) * sizeof(TCHAR))) { RegCloseKey(hk); return; } } + /* Fill struct for next item */ lvi.mask = LVIF_PARAM; lvi.iItem = ++iItem; @@ -532,6 +534,7 @@ RegCloseKey(hk); } + /* Environment dialog procedure */ INT_PTR CALLBACK @@ -576,13 +579,18 @@ case IDOK: SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + EndDialog(hwndDlg, 0); + return TRUE; case IDCANCEL: - ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); - ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); EndDialog(hwndDlg, 0); return TRUE; } + break; + + case WM_DESTROY: + ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); + ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); break; case WM_NOTIFY:

1 0

[cfinck] 29728: - Apply the spanish translation for eventvwr by Marc Piulachs (marc DOT piulachs AT codexchange DOT net, bug 2758) - Use a consistent indentation in all resource files - Change the metrics of some controls to make the full text visible - Add a manifest file to enable visual styles See issue #2758 for more details.
by cfinck＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: cfinck Date: Sun Oct 21 14:41:11 2007 New Revision: 29728 URL: http://svn.reactos.org/svn/reactos?rev=29728&view=rev Log: - Apply the spanish translation for eventvwr by Marc Piulachs (marc DOT piulachs AT codexchange DOT net, bug 2758) - Use a consistent indentation in all resource files - Change the metrics of some controls to make the full text visible - Add a manifest file to enable visual styles See issue #2758 for more details. Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ IDC_EVENTVWR MENU BEGIN - POPUP "&Protokoll" - BEGIN - MENUITEM "&Anwendung", ID_LOG_APPLICATION, CHECKED - MENUITEM "&Sicherheit", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR - MENUITEM "B&eenden", IDM_EXIT - END - POPUP "&Ansicht" - BEGIN - MENUITEM "&Aktualisieren", IDM_REFRESH - END - MENUITEM "&Optionen", ID_OPTIONS - POPUP "&Hilfe" - BEGIN - MENUITEM "H&ilfe", IDM_HELP - MENUITEM SEPARATOR - MENUITEM "Ü&ber...", IDM_ABOUT - END + POPUP "&Protokoll" + BEGIN + MENUITEM "&Anwendung", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Sicherheit", ID_LOG_SECURITY + MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "B&eenden", IDM_EXIT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "&Aktualisieren", IDM_REFRESH + END + MENUITEM "&Optionen", ID_OPTIONS + POPUP "&Hilfe" + BEGIN + MENUITEM "H&ilfe", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "Ü&ber...", IDM_ABOUT + END END IDC_EVENTVWR ACCELERATORS BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 @@ -34,10 +34,10 @@ CAPTION "Über" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "ReactOS Ereignisanzeige 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 + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Ereignisanzeige 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 @@ -45,7 +45,7 @@ CAPTION "Bitte warten.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Lade Ereignis-Protokolle. Bitte warten...",IDC_STATIC,49,15,130,8,SS_NOPREFIX + LTEXT "Ereignis-Protokolle werden geladen. Bitte warten...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ CAPTION "Ereignisdetails" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Schliessen",IDOK,12,258,50,14 - PUSHBUTTON "&Vorige",IDPREVIOUS,78,258,50,14 - PUSHBUTTON "&Nächste",IDNEXT,144,258,50,14 - PUSHBUTTON "&Hilfe",IDHELP,210,258,50,14 - EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY - LTEXT "&Bezeichnung:",IDC_STATIC,15,70,39,8 - LTEXT "Datum:",IDC_STATIC,14,14,36,8 - LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 - LTEXT "Zeit:",IDC_STATIC,14,27,36,8 - LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 - LTEXT "&Benutzer:",IDC_STATIC,14,41,36,8 - LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 - LTEXT "&Computer:",IDC_STATIC,14,54,36,8 - LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 - LTEXT "Ereignis-ID :",IDC_STATIC,133,15,36,8 - LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 - LTEXT "Quelle:",IDC_STATIC,133,28,36,8 - LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 - LTEXT "Typ:",IDC_STATIC,133,42,36,8 - LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 - LTEXT "Kategorie:",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 "D&aten",IDC_STATIC,14,194,16,8 - CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 - CONTROL "&Wörter",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 + DEFPUSHBUTTON "&Schließen",IDOK,12,258,50,14 + PUSHBUTTON "&Vorige",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Nächste",IDNEXT,144,258,50,14 + PUSHBUTTON "&Hilfe",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Bezeichnung:",IDC_STATIC,15,70,39,8 + LTEXT "Datum:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Zeit:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Benutzer:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Computer:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "Ereignis-ID:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Quelle:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Typ:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Kategorie:",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 "D&aten",IDC_STATIC,14,194,16,8 + CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Wörter",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 END STRINGTABLE BEGIN - IDS_APP_TITLE "Ereignisanzeige" - IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." - IDC_EVENTLOG_ERROR_TYPE "Fehler" - IDC_EVENTLOG_WARNING_TYPE "Warnung" - IDC_EVENTLOG_INFORMATION_TYPE "Informationen" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" - IDC_EVENTLOG_SUCCESS "Erfolgreich" - IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" + IDS_APP_TITLE "Ereignisanzeige" + IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." + IDC_EVENTLOG_ERROR_TYPE "Fehler" + IDC_EVENTLOG_WARNING_TYPE "Warnung" + IDC_EVENTLOG_INFORMATION_TYPE "Informationen" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" + IDC_EVENTLOG_SUCCESS "Erfolgreich" + IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ IDC_EVENTVWR MENU BEGIN - POPUP "&Log" - BEGIN - MENUITEM "&Application", ID_LOG_APPLICATION, CHECKED - MENUITEM "&Security", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Refresh", IDM_REFRESH - END - MENUITEM "&Options", ID_OPTIONS - POPUP "&Help" - BEGIN - MENUITEM "H&elp", IDM_HELP - MENUITEM SEPARATOR - MENUITEM "&About...", IDM_ABOUT - END + POPUP "&Log" + BEGIN + MENUITEM "&Application", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Security", ID_LOG_SECURITY + MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Refresh", IDM_REFRESH + END + MENUITEM "&Options", ID_OPTIONS + POPUP "&Help" + BEGIN + MENUITEM "H&elp", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&About...", IDM_ABOUT + END END IDC_EVENTVWR ACCELERATORS BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 @@ -34,10 +34,10 @@ CAPTION "About" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "ReactOS Event Viewer 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 + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Event Viewer 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 @@ -45,7 +45,7 @@ CAPTION "Wait.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Loading Event Logs. Please wait ...",IDC_STATIC,49,15,119,8,SS_NOPREFIX + LTEXT "Loading Event Logs. Please wait ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ CAPTION "Event Detail" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Close",IDOK,12,258,50,14 - PUSHBUTTON "&Previous",IDPREVIOUS,78,258,50,14 - PUSHBUTTON "&Next",IDNEXT,144,258,50,14 - PUSHBUTTON "&Help",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 "Time:",IDC_STATIC,14,27,36,8 - LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 - LTEXT "&User:",IDC_STATIC,14,41,36,8 - LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 - LTEXT "&Computer:",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 "Category:",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 "D&ata",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 + DEFPUSHBUTTON "&Close",IDOK,12,258,50,14 + PUSHBUTTON "&Previous",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Next",IDNEXT,144,258,50,14 + PUSHBUTTON "&Help",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 "Time:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&User:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Computer:",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 "Category:",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 "D&ata",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 "Event Viewer" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_APP_TITLE "Event Viewer" + IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc Sun Oct 21 14:41:11 2007 @@ -1,0 +1,96 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDC_EVENTVWR MENU +BEGIN + POPUP "&Log" + BEGIN + MENUITEM "&Aplicación", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Seguridad", ID_LOG_SECURITY + MENUITEM "&Sistema", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "S&alir", IDM_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Actualizar", IDM_REFRESH + END + MENUITEM "&Opciones", ID_OPTIONS + POPUP "A&yuda" + BEGIN + MENUITEM "A&yuda", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Sobre...", 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 "About" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Visor de sucesos 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 "Wait.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Recuperando eventos. Por favor, espere ...",IDC_STATIC,0,15,230,8,SS_CENTER | 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 "Event Detail" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Cerrar",IDOK,12,258,50,14 + PUSHBUTTON "&Anterior",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Siguiente",IDNEXT,144,258,50,14 + PUSHBUTTON "&Ayuda",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Descripción:",IDC_STATIC,15,70,39,8 + LTEXT "Fecha:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Hora:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Usuario:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Equipo:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "ID de suceso:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Origen:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Tipo:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Categoría:",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 "D&atos",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 "Visor de sucesos" + IDC_EVENTSTRINGIDNOTFOUND "La descripción para el evento con ID ( %lu ) con origen ( %s ) no pudo ser recuperada.El equipo local puede no tener la información necesaria en el registro o las DLLs requeridas para mostrar los mensajes de un equipo remoto." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Advertencia" + IDC_EVENTLOG_INFORMATION_TYPE "Información" + IDC_EVENTLOG_AUDIT_SUCCES "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Acierto" + IDC_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ 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 + 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 + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 @@ -34,10 +34,10 @@ 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 + 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 @@ -45,7 +45,7 @@ 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 + LTEXT "Chargement des journaux d'événements. Veuillez patienter ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ 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 + 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." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + 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." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ IDC_EVENTVWR MENU BEGIN - POPUP "&Ëîãè" - BEGIN - MENUITEM "&Ïðèëîæåíèé", ID_LOG_APPLICATION, CHECKED - MENUITEM "&Áåçîïàñíîñòè", ID_LOG_SECURITY - MENUITEM "&Ñèñòåìû", ID_LOG_SYSTEM - MENUITEM SEPARATOR - MENUITEM "Â&ûõîä", IDM_EXIT - END - POPUP "&Âèä" - BEGIN - MENUITEM "&Îáíîâèòü", IDM_REFRESH - END - MENUITEM "&Íàñòðîéêè", ID_OPTIONS - POPUP "&Ñïðàâêà" - BEGIN - MENUITEM "&Ïîìîùü", IDM_HELP - MENUITEM SEPARATOR - MENUITEM "&Î ïðîãðàììå", IDM_ABOUT - END + POPUP "&Ëîãè" + BEGIN + MENUITEM "&Ïðèëîæåíèé", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Áåçîïàñíîñòè", ID_LOG_SECURITY + MENUITEM "&Ñèñòåìû", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Â&ûõîä", IDM_EXIT + END + POPUP "&Âèä" + BEGIN + MENUITEM "&Îáíîâèòü", IDM_REFRESH + END + MENUITEM "&Íàñòðîéêè", ID_OPTIONS + POPUP "&Ñïðàâêà" + BEGIN + MENUITEM "&Ïîìîùü", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Î ïðîãðàììå", IDM_ABOUT + END END IDC_EVENTVWR ACCELERATORS BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 200, 75 @@ -34,10 +34,10 @@ CAPTION "Î ïðîãðàììå" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "Ïðîñìîòð ñîáûòèé ReactOS. Âåðñèÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX - LTEXT "Àâòîðñêèå ïðàâà (Ñ) 2007 Ìàðê Ïèóëà÷ñ (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,140,22 - DEFPUSHBUTTON "OK",IDOK,80,48,42,16,WS_GROUP + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "Ïðîñìîòð ñîáûòèé ReactOS. Âåðñèÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Àâòîðñêèå ïðàâà (Ñ) 2007 Ìàðê Ïèóëà÷ñ (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,140,22 + DEFPUSHBUTTON "OK",IDOK,80,48,42,16,WS_GROUP END IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 @@ -45,7 +45,7 @@ CAPTION "Ïîäîæäèòå.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Èäåò çàãðóçêà. Ïîäîæäèòå ...",IDC_STATIC,49,15,119,8,SS_NOPREFIX + LTEXT "Èäåò çàãðóçêà. Ïîäîæäèòå ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ CAPTION "Ñâîéñòâà ñîáûòèÿ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Çàêðûòü",IDOK,14,258,55,14 - PUSHBUTTON "&Ïðåäûäóùåå",IDPREVIOUS,78,258,55,14 - PUSHBUTTON "Ñ&ëåäóþùåå",IDNEXT,142,258,55,14 - PUSHBUTTON "Ï&îìîùü",IDHELP,206,258,55,14 - EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY - LTEXT "Îïèñàíèå:",IDC_STATIC,15,70,39,8 - LTEXT "Äàòà:",IDC_STATIC,14,14,36,8 - LTEXT "",IDC_EVENTDATESTATIC,68,14,72,8 - LTEXT "Âðåìÿ:",IDC_STATIC,14,27,36,8 - LTEXT "",IDC_EVENTTIMESTATIC,68,27,72,8 - LTEXT "Ïîëüçîâàòåëü:",IDC_STATIC,14,41,50,8 - LTEXT "",IDC_EVENTUSERSTATIC,68,41,72,8 - LTEXT "Êîìïüþòåð:",IDC_STATIC,14,54,45,8 - LTEXT "",IDC_EVENTCOMPUTERSTATIC,68,54,72,8 - LTEXT "Êîä (ID):",IDC_STATIC,143,15,45,8 - LTEXT "",IDC_EVENTIDSTATIC,190,15,87,8 - LTEXT "Èñòî÷íèê:",IDC_STATIC,143,28,36,8 - LTEXT "",IDC_EVENTSOURCESTATIC,190,28,127,8 - LTEXT "Òèï:",IDC_STATIC,143,42,36,8 - LTEXT "",IDC_EVENTTYPESTATIC,190,42,87,8 - LTEXT "Êàòåãîðèÿ:",IDC_STATIC,143,55,38,8 - LTEXT "",IDC_EVENTCATEGORYSTATIC,190,55,87,8 - EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY - LTEXT "Äàííûå:",IDC_STATIC,14,192,30,8 - CONTROL "&Áàéòû",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,49,192,34,10 - CONTROL "&Ñëîâà",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,87,192,33,10 + DEFPUSHBUTTON "&Çàêðûòü",IDOK,14,258,55,14 + PUSHBUTTON "&Ïðåäûäóùåå",IDPREVIOUS,78,258,55,14 + PUSHBUTTON "Ñ&ëåäóþùåå",IDNEXT,142,258,55,14 + PUSHBUTTON "Ï&îìîùü",IDHELP,206,258,55,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "Îïèñàíèå:",IDC_STATIC,15,70,39,8 + LTEXT "Äàòà:",IDC_STATIC,14,14,36,8 + LTEXT "",IDC_EVENTDATESTATIC,68,14,72,8 + LTEXT "Âðåìÿ:",IDC_STATIC,14,27,36,8 + LTEXT "",IDC_EVENTTIMESTATIC,68,27,72,8 + LTEXT "Ïîëüçîâàòåëü:",IDC_STATIC,14,41,50,8 + LTEXT "",IDC_EVENTUSERSTATIC,68,41,72,8 + LTEXT "Êîìïüþòåð:",IDC_STATIC,14,54,45,8 + LTEXT "",IDC_EVENTCOMPUTERSTATIC,68,54,72,8 + LTEXT "Êîä (ID):",IDC_STATIC,143,15,45,8 + LTEXT "",IDC_EVENTIDSTATIC,190,15,87,8 + LTEXT "Èñòî÷íèê:",IDC_STATIC,143,28,36,8 + LTEXT "",IDC_EVENTSOURCESTATIC,190,28,127,8 + LTEXT "Òèï:",IDC_STATIC,143,42,36,8 + LTEXT "",IDC_EVENTTYPESTATIC,190,42,87,8 + LTEXT "Êàòåãîðèÿ:",IDC_STATIC,143,55,38,8 + LTEXT "",IDC_EVENTCATEGORYSTATIC,190,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "Äàííûå:",IDC_STATIC,14,192,30,8 + CONTROL "&Áàéòû",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,49,192,34,10 + CONTROL "&Ñëîâà",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,87,192,33,10 END STRINGTABLE BEGIN - IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" + IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Added: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml Sun Oct 21 14:41:11 2007 @@ -1,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly + xmlns="urn:schemas-microsoft-com:asm.v1" + manifestVersion="1.0"> +<assemblyIdentity + name="Win32 Application.default.App" + processorArchitecture="x86" + version="1.0.0.0" + type="win32"/> +<description>ReactOS EventLog Viewer</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="x86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml ------------------------------------------------------------------------------ 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 Sun Oct 21 14:41:11 2007 @@ -2,6 +2,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 24 DISCARDABLE "manifest.xml" // Shared icons IDI_EVENTVWR ICON "res/eventvwr.ico"

1 0

[fireball] 29727: - When adding new items into a submenu, they are placed incorrectly. Fix this.
by fireball＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: fireball Date: Sun Oct 21 13:08:04 2007 New Revision: 29727 URL: http://svn.reactos.org/svn/reactos?rev=29727&view=rev Log: - When adding new items into a submenu, they are placed incorrectly. Fix this. Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h Sun Oct 21 13:08:04 2007 @@ -86,7 +86,8 @@ int FASTCALL IntGetMenuItemByFlag(PMENU_OBJECT MenuObject, UINT uSearchBy, UINT fFlag, - PMENU_ITEM *MenuItem, PMENU_ITEM *PrevMenuItem); + PMENU_OBJECT *SubMenu, PMENU_ITEM *MenuItem, + PMENU_ITEM *PrevMenuItem); UINT FASTCALL IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sun Oct 21 13:08:04 2007 @@ -248,7 +248,7 @@ BOOL bRecurse) { PMENU_ITEM PrevMenuItem, MenuItem; - if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, &MenuItem, + if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, NULL, &MenuItem, &PrevMenuItem) > -1) { if(MenuItem) @@ -566,7 +566,8 @@ int FASTCALL IntGetMenuItemByFlag(PMENU_OBJECT Menu, UINT uSearchBy, UINT fFlag, - PMENU_ITEM *MenuItem, PMENU_ITEM *PrevMenuItem) + PMENU_OBJECT *SubMenu, PMENU_ITEM *MenuItem, + PMENU_ITEM *PrevMenuItem) { PMENU_ITEM PrevItem = NULL; PMENU_ITEM CurItem = Menu->MenuItemList; @@ -611,18 +612,24 @@ *MenuItem = CurItem; if(PrevMenuItem) *PrevMenuItem = PrevItem; + if(SubMenu) + *SubMenu = Menu; + return p; } - else if (0 != (CurItem->fType & MF_POPUP)) - { - Menu = UserGetMenuObject(CurItem->hSubMenu); - if (NULL != Menu) + else + { + if(CurItem->fType & MF_POPUP) { - ret = IntGetMenuItemByFlag(Menu, uSearchBy, fFlag, - MenuItem, PrevMenuItem); - if (-1 != ret) + PMENU_OBJECT NewMenu = UserGetMenuObject(CurItem->hSubMenu); + if(Menu) { - return ret; + ret = IntGetMenuItemByFlag(NewMenu, uSearchBy, fFlag, + SubMenu, MenuItem, PrevMenuItem); + if(ret != -1) + { + return ret; + } } } } @@ -922,6 +929,7 @@ { int pos = (int)uItem; PMENU_ITEM MenuItem; + PMENU_OBJECT SubMenu; if (MAX_MENU_ITEMS <= MenuObject->MenuInfo.MenuItemCount) { @@ -931,6 +939,7 @@ if (fByPosition) { + SubMenu = MenuObject; /* calculate position */ if(MenuObject->MenuInfo.MenuItemCount < pos) { @@ -939,7 +948,7 @@ } else { - pos = IntGetMenuItemByFlag(MenuObject, uItem, MF_BYCOMMAND, NULL, NULL); + pos = IntGetMenuItemByFlag(MenuObject, uItem, MF_BYCOMMAND, &SubMenu, NULL, NULL); } if (pos < -1) { @@ -963,7 +972,7 @@ RtlInitUnicodeString(&MenuItem->Text, NULL); MenuItem->hbmpItem = (HBITMAP)0; - if (! IntSetMenuItemInfo(MenuObject, MenuItem, ItemInfo)) + if(!IntSetMenuItemInfo(SubMenu, MenuItem, ItemInfo)) { ExFreePool(MenuItem); return FALSE; @@ -972,7 +981,7 @@ /* Force size recalculation! */ MenuObject->MenuInfo.Height = 0; - pos = IntInsertMenuItemToList(MenuObject, MenuItem, pos); + pos = IntInsertMenuItemToList(SubMenu, MenuItem, pos); DPRINT("IntInsertMenuItemToList = %i\n", pos); @@ -983,7 +992,7 @@ IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable) { PMENU_ITEM MenuItem; - UINT res = IntGetMenuItemByFlag(MenuObject, uIDEnableItem, uEnable, &MenuItem, NULL); + UINT res = IntGetMenuItemByFlag(MenuObject, uIDEnableItem, uEnable, NULL, &MenuItem, NULL); if(!MenuItem || (res == (UINT)-1)) { return (UINT)-1; @@ -1129,7 +1138,7 @@ PMENU_ITEM MenuItem; int res = -1; - if((IntGetMenuItemByFlag(MenuObject, uIDCheckItem, uCheck, &MenuItem, NULL) < 0) || !MenuItem) + if((IntGetMenuItemByFlag(MenuObject, uIDCheckItem, uCheck, NULL, &MenuItem, NULL) < 0) || !MenuItem) { return -1; } @@ -1154,7 +1163,7 @@ UINT uItemHilite, UINT uHilite) { PMENU_ITEM MenuItem; - BOOL res = IntGetMenuItemByFlag(MenuObject, uItemHilite, uHilite, &MenuItem, NULL); + BOOL res = IntGetMenuItemByFlag(MenuObject, uItemHilite, uHilite, NULL, &MenuItem, NULL); if(!MenuItem || !res) { return FALSE; @@ -1331,7 +1340,7 @@ { PMENU_ITEM mi; if(IntGetMenuItemByFlag(Menu, Item, (fByPos ? MF_BYPOSITION : MF_BYCOMMAND), - &mi, NULL) > -1) + NULL, &mi, NULL) > -1) { mi->Rect = *rcRect; return TRUE; @@ -1753,7 +1762,7 @@ kmbi.hMenu = hMenu; if (idItem) /* Non-Zero-Based. */ { - if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1) kmbi.rcBar = mi->Rect; else { @@ -1802,7 +1811,7 @@ } if (idItem) { - if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1) kmbi.rcBar = mi->Rect; else { @@ -1852,7 +1861,7 @@ kmbi.hMenu = SysMenuObject->MenuInfo.Self; if (idItem) { - if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1) kmbi.rcBar = mi->Rect; else { @@ -1953,7 +1962,7 @@ RETURN(FALSE); } - if (IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, &MenuItem, NULL) > -1) + if (IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, NULL, &MenuItem, NULL) > -1) Rect = MenuItem->Rect; else RETURN(FALSE); @@ -2213,7 +2222,7 @@ if (IntGetMenuItemByFlag(Menu, Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND), - &MenuItem, NULL) < 0) + NULL, &MenuItem, NULL) < 0) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return( FALSE);

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