Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 29525: Send the right number of bytes when setting an env var spotted by Christian Fasshauer <chrfas at googlemail dot com>
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Fri Oct 12 03:36:31 2007 New Revision: 29525 URL: http://svn.reactos.org/svn/reactos?rev=29525&view=rev Log: Send the right number of bytes when setting an env var spotted by Christian Fasshauer <chrfas at googlemail dot com> 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 Fri Oct 12 03:36:31 2007 @@ -519,7 +519,7 @@ 0, Type, (LPBYTE) VarData->lpRawValue, - (DWORD) (_tcslen(VarData->lpRawValue)* sizeof(TCHAR))+1)) // was _tcsclen. lstrlen? + (DWORD)(_tcslen(VarData->lpRawValue) + 1) * sizeof(TCHAR))) { RegCloseKey(hk); return;

1 0

[dreimer] 29524: Translated the few new lines in this RC.
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Fri Oct 12 02:45:18 2007 New Revision: 29524 URL: http://svn.reactos.org/svn/reactos?rev=29524&view=rev Log: Translated the few new lines in this RC. Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Fri Oct 12 02:45:18 2007 @@ -135,11 +135,11 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Angefügt", ID_MENU_ATTACHED + MENUITEM "&Primär", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Identifizieren", ID_MENU_IDENTIFY + MENUITEM "&Eigenschaften", ID_MENU_PROPERTIES END END

1 0

[dreimer] 29523: (Very)Small code cleanup for my Cards.dll
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Fri Oct 12 02:39:37 2007 New Revision: 29523 URL: http://svn.reactos.org/svn/reactos?rev=29523&view=rev Log: (Very)Small code cleanup for my Cards.dll Modified: trunk/rosapps/cardsbav/cardsbav.h Modified: trunk/rosapps/cardsbav/cardsbav.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.h?rev=29… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.h (original) +++ trunk/rosapps/cardsbav/cardsbav.h Fri Oct 12 02:39:37 2007 @@ -42,12 +42,6 @@ #define ectGREENO 7 #define ectSAVEEDGESMASK 0x80000000 -/* Microsoft card dimensions */ -/* -#define CARD_WIDTH 110 -#define CARD_HEIGHT 198 -*/ -/* MacSolitaireX's card dimensions */ #define CARD_WIDTH 110 #define CARD_HEIGHT 198

1 0

[mnordell] 29522: Prevent SEGV
by mnordell＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: mnordell Date: Fri Oct 12 02:20:22 2007 New Revision: 29522 URL: http://svn.reactos.org/svn/reactos?rev=29522&view=rev Log: Prevent SEGV Modified: trunk/reactos/dll/win32/user32/misc/exticon.c Modified: trunk/reactos/dll/win32/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exti… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/exticon.c (original) +++ trunk/reactos/dll/win32/user32/misc/exticon.c Fri Oct 12 02:20:22 2007 @@ -533,7 +533,19 @@ { const IMAGE_RESOURCE_DIRECTORY *xresdir; xresdir = find_entry_by_id(iconresdir, LOWORD(pIconId[i]), rootresdir); + if (!xresdir) + { + WARN("find_entry_by_id failed\n"); + ret = 0xFFFFFFFF; + goto end; + } xresdir = find_entry_default(xresdir, rootresdir); + if (!xresdir) + { + WARN("find_entry_default failed\n"); + ret = 0xFFFFFFFF; + goto end; + } idataent = (PIMAGE_RESOURCE_DATA_ENTRY)xresdir; idata = NULL;

1 0

[dreimer] 29521: Added German Translation of one missed Dialog. Fixed tons of coordinates and sizes to fit all Text of the German and English Translation into the Buttons, Checkboxes and Text Fields. Moved some stuff to better fit into the Dialog. I mainly kept Johannes's nice small format for the Shortcut etc Dialogs, because it looks nice. This only helps to fit in the Text.
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Fri Oct 12 02:17:08 2007 New Revision: 29521 URL: http://svn.reactos.org/svn/reactos?rev=29521&view=rev Log: Added German Translation of one missed Dialog. Fixed tons of coordinates and sizes to fit all Text of the German and English Translation into the Buttons, Checkboxes and Text Fields. Moved some stuff to better fit into the Dialog. I mainly kept Johannes's nice small format for the Shortcut etc Dialogs, because it looks nice. This only helps to fit in the Text. Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Fri Oct 12 02:17:08 2007 @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2004 Henning Gerhardt + * Copyright 2007 Daniel Reimer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -95,8 +96,8 @@ CAPTION "Verzeichnis auswählen" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -105,6 +106,24 @@ 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Verzeichnis auswählen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Ordner:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Neuen Ordner erstellen", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Meldung" @@ -140,9 +159,9 @@ LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 182, 18 LTEXT "&Öffnen:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Durchsuchen...", 12288, 170, 63, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "&Durchsuchen...", 12288, 160, 63, 59, 14, WS_TABSTOP } SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 @@ -157,17 +176,17 @@ LTEXT "", 14007, 70, 40, 150, 10 LTEXT "Ziel:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT - LTEXT "&Starten in:",14010, 10, 65, 45, 10 + LTEXT "&Starten in:",14010, 10, 65, 57, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT - LTEXT "&Tastenkombination:", 14014, 10, 80, 45, 10 + LTEXT "&Kurztasten:", 14014, 10, 80, 57, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Ausführen:", 14016, 10, 90, 45, 10 + LTEXT "Ausführen:", 14016, 10, 90, 57, 10 EDITTEXT 14017, 70, 90, 150, 10 - LTEXT "K&ommentar:", 14018, 10, 100, 45, 10 + LTEXT "K&ommentar:", 14018, 10, 100, 57, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT - PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 60, 14, ES_LEFT - PUSHBUTTON "I&con wechseln...", 14021, 80, 115, 60, 14, ES_LEFT - PUSHBUTTON "Er&weitert...", 14022, 150, 115, 60, 14, ES_LEFT + PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 63, 14, ES_LEFT + PUSHBUTTON "I&con wechseln...", 14021, 83, 115, 63, 14, ES_LEFT + PUSHBUTTON "Er&weitert...", 14022, 156, 115, 63, 14, ES_LEFT } SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 @@ -175,11 +194,11 @@ CAPTION "Erweiterte Einstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { -LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 190, 10 - CHECKBOX "Als anderer Benutzer ausführen", 14000, 30, 50, 150, 10 - LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter\neinem anderen oder Ihrem eingenen Bentzerkonto auszuführen\nwährend der Computer und Ihre Daten vor unautorisierten\nProgrammaktivitäten geschützt werden können.", -1, 50, 60, 200, 40 - CHECKBOX "In getrennten Speicherbereich ausführen", 14001, 30, 100, 90, 10, WS_DISABLED - PUSHBUTTON "OK", IDOK, 25, 120, 40, 15, WS_VISIBLE +LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 210, 10 + CHECKBOX "Als anderer Benutzer ausführen", 14000, 25, 50, 150, 10 + LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter einem anderen oder Ihrem eingenen Bentzerkonto auszuführen während der Computer und Ihre Daten vor unautorisierten Programmaktivitäten geschützt werden können.", -1, 50, 60, 175, 40 + CHECKBOX "In getrennten Speicherbereich ausführen", 14001, 25, 100, 150, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Abbrechen", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } @@ -205,9 +224,9 @@ LTEXT "Zugegriffen:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 LTEXT "Attribute:", 14020, 10, 115, 45, 10 - CHECKBOX "&Schreibgeschützt", 14021, 70, 115, 45, 10 - CHECKBOX "&Versteckt", 14022, 130, 115, 50, 10 - CHECKBOX "&Archiv", 14023, 180, 115, 45, 10 + CHECKBOX "&Schreibgeschützt", 14021, 70, 115, 67, 10 + CHECKBOX "&Versteckt", 14022, 140, 115, 50, 10 + CHECKBOX "&Archiv", 14023, 190, 115, 45, 10 } SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 @@ -260,7 +279,7 @@ LTEXT "Laufwerk %s", 14010, 100, 170, 40, 10 PUSHBUTTON "Bereinigen", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED } @@ -271,13 +290,13 @@ { GROUPBOX "Fehlerüberprüfung", -1, 5, 5, 230, 60 LTEXT "Bei Wahl dieser Option wird das Volume\nauf Fehler überprüft.", -1, 40, 25, 160, 20 - PUSHBUTTON "Jetzt &prüfen", 14000, 130, 45, 90, 15, WS_TABSTOP + PUSHBUTTON "Jetzt &prüfen...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentierung", -1, 5, 65, 230, 60 LTEXT "Bei Wahl dieser Option werden die Dateien auf\ndem Volume defragmentiert.", -1, 40, 85, 160, 20 - PUSHBUTTON "Jetzt &defragmentieren", 14001, 130, 105, 90, 15, WS_TABSTOP + PUSHBUTTON "Jetzt &defragmentieren...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sicherung", -1, 5, 130, 230, 60 LTEXT "Bei Wahl dieser Option werden die auf dem\nVolume gespeicherten Dateien gesichert.", -1, 40, 150, 160, 20 - PUSHBUTTON "Jetzt &sichern", 14002, 130, 170, 90, 15, WS_TABSTOP + PUSHBUTTON "Jetzt &sichern...", 14002, 130, 170, 90, 15, WS_TABSTOP } DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 @@ -292,16 +311,16 @@ CAPTION "Ausführen als" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 - CHECKBOX "Aktueller Benutzer %s", 14000, 5, 45, 150, 10 - LTEXT "Computer vor unauthorisierten Programmaktiviäten schützen", -1, 40, 65, 150, 10, WS_DISABLED - CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem\nComputer und/oder Ihren persönlichen Daten zu schaden, aber\nes kann auch Programme daran hindern, Ordnungsgemäß zu arbeiten.", 14001, 40, 80, 150, 10, WS_DISABLED - CHECKBOX "Folgender Benutzer:", 14002, 5, 100, 90, 10 - LTEXT "Benutzername:", -1, 15, 115, 60, 10 + LTEXT "Welches Benutzerkonto wollen Sie zum starten dieser Anwendung verwenden?", -1, 10, 20, 220, 20 + CHECKBOX "Aktueller Benutzer %s", 14000, 10, 45, 150, 10 + LTEXT "Computer vor unauthorisierten Programmaktiviäten schützen", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem Computer oder Ihren persönlichen Daten zu schaden, aber es kann auch Programme daran hindern, Ordnungsgemäß zu arbeiten.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "Folgender Benutzer:", 14002, 10, 100, 90, 10 + LTEXT "Benutzername:", -1, 20, 115, 60, 10 COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP - LTEXT "Passwort:", -1, 15, 140, 60, 10 + LTEXT "Passwort:", -1, 20, 140, 60, 10 EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Fri Oct 12 02:17:08 2007 @@ -94,8 +94,8 @@ CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -117,7 +117,7 @@ WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } @@ -157,9 +157,9 @@ LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP } SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 @@ -174,29 +174,29 @@ LTEXT "", 14007, 70, 40, 150, 10 LTEXT "Target:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT - LTEXT "&Start in:",14010, 10, 65, 45, 10 + LTEXT "&Start in:",14010, 10, 65, 57, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT - LTEXT "Shortcut &key:", 14014, 10, 80, 45, 10 + LTEXT "Shortcut &key:", 14014, 10, 80, 57, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Run:", 14016, 10, 90, 45, 10 + LTEXT "Run:", 14016, 10, 90, 57, 10 EDITTEXT 14017, 70, 90, 150, 10 - LTEXT "C&omment:", 14018, 10, 100, 45, 10 + LTEXT "C&omment:", 14018, 10, 100, 57, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT - PUSHBUTTON "&Find Target...", 14020, 10, 115, 60, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 80, 115, 60, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 150, 115, 60, 14, ES_LEFT -} - -SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 260, 150 + PUSHBUTTON "&Find Target...", 14020, 10, 115, 63, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", 14021, 83, 115, 63, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", 14022, 156, 115, 63, 14, ES_LEFT +} + +SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Extended Properties" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 190, 10 - CHECKBOX "Run with different credentials", 14000, 30, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another\nuser, or continue as yourself while protecting your computer\nand data from unauthorized program activity.", -1, 50, 60, 200, 40 - CHECKBOX "Run in seperate memory space", 14001, 30, 100, 90, 10, WS_DISABLED - PUSHBUTTON "OK", IDOK, 25, 120, 40, 15, WS_VISIBLE + LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 + CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 + CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } @@ -222,9 +222,9 @@ LTEXT "Accessed:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 LTEXT "Attributes:", 14020, 10, 115, 45, 10 - CHECKBOX "&Read-only", 14021, 70, 115, 45, 10 - CHECKBOX "&Hidden", 14022, 130, 115, 50, 10 - CHECKBOX "&Archive", 14023, 180, 115, 45, 10 + CHECKBOX "&Read-only", 14021, 70, 115, 67, 10 + CHECKBOX "&Hidden", 14022, 140, 115, 50, 10 + CHECKBOX "&Archive", 14023, 190, 115, 45, 10 } SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 @@ -277,7 +277,7 @@ LTEXT "Drive %s", 14010, 100, 170, 40, 10 PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 180, 10, WS_DISABLED CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } @@ -299,7 +299,7 @@ -DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -311,16 +311,16 @@ CAPTION "Run As" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 - CHECKBOX "Current User %s", 14000, 5, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 40, 65, 150, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your\ncomputer or personal data, but selecting it might cause the\nprogram to function improperly.", 14001, 40, 80, 150, 10, WS_DISABLED - CHECKBOX "The following user:", 14002, 5, 100, 90, 10 - LTEXT "User name:", -1, 15, 115, 60, 10 + LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 + CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 + LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "The following user:", 14002, 10, 100, 90, 10 + LTEXT "User name:", -1, 20, 115, 60, 10 COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP - LTEXT "Password:", -1, 15, 140, 60, 10 + LTEXT "Password:", -1, 20, 140, 60, 10 EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP

1 0

[fireball] 29520: - Fix a long standing bug, which prevented NT to work stable (in fact, it died very soon after booting). The bug was in occasional placing Gdt and Idt into a temporary heap, instead of MemoryData marked area of memory. The possibility of this bug was suggested long time ago by Alex, but I didn't believe him back then :) - Now Windows NT works quite good after booting via WinLdr in QEMU.
by fireball＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: fireball Date: Fri Oct 12 01:07:47 2007 New Revision: 29520 URL: http://svn.reactos.org/svn/reactos?rev=29520&view=rev Log: - Fix a long standing bug, which prevented NT to work stable (in fact, it died very soon after booting). The bug was in occasional placing Gdt and Idt into a temporary heap, instead of MemoryData marked area of memory. The possibility of this bug was suggested long time ago by Alex, but I didn't believe him back then :) - Now Windows NT works quite good after booting via WinLdr in QEMU. Modified: branches/winldr/windows/winldr.c Modified: branches/winldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/winldr.c?rev=295… ============================================================================== --- branches/winldr/windows/winldr.c (original) +++ branches/winldr/windows/winldr.c Fri Oct 12 01:07:47 2007 @@ -232,7 +232,7 @@ /* Allocate space for new GDT + IDT */ BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - *GdtIdt = (PKGDTENTRY)MmAllocateMemory(NumPages * MM_PAGE_SIZE); + *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); if (*GdtIdt == NULL) {

1 0

[mnordell] 29519: Make cabman build warning-free
by mnordell＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: mnordell Date: Fri Oct 12 01:01:39 2007 New Revision: 29519 URL: http://svn.reactos.org/svn/reactos?rev=29519&view=rev Log: Make cabman build warning-free Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Fri Oct 12 01:01:39 2007 @@ -80,13 +80,13 @@ NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("ERROR OPENING '%d'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR OPENING '%lu'.\n", (ULONG)GetLastError())); return; } if (!WriteFile(FileHandle, Buffer, Size, &BytesWritten, NULL)) { - DPRINT(MID_TRACE, ("ERROR WRITING '%d'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR WRITING '%lu'.\n", (ULONG)GetLastError())); } CloseFile(FileHandle); @@ -144,7 +144,7 @@ NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("ERROR '%d'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR '%lu'.\n", (ULONG)GetLastError())); return CAB_STATUS_CANNOT_CREATE; } #else /* !WIN32 */ @@ -154,7 +154,7 @@ /* FileHandle = fopen(FullName, "w+b"); if (FileHandle == NULL) { - DPRINT(MID_TRACE, ("ERROR '%d'.\n", (ULONG)errno)); + DPRINT(MID_TRACE, ("ERROR '%lu'.\n", (ULONG)errno)); return CAB_STATUS_CANNOT_CREATE; } */ @@ -200,7 +200,7 @@ FileHandle = tmpfile(); if (FileHandle == NULL) { - DPRINT(MID_TRACE, ("ERROR '%d'.\n", (ULONG)errno)); + DPRINT(MID_TRACE, ("ERROR '%lu'.\n", (ULONG)errno)); return CAB_STATUS_FAILURE; } #endif @@ -662,7 +662,7 @@ if ((Status = ReadBlock(&CABHeader, sizeof(CFHEADER), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } @@ -687,7 +687,7 @@ if ((Status = ReadBlock(&Size, sizeof(ULONG), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } CabinetReserved = Size & 0xFFFF; @@ -762,7 +762,7 @@ if ((Status = ReadBlock(&FolderNode->Folder, sizeof(CFFOLDER), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } } @@ -771,7 +771,7 @@ Status = ReadFileTable(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("ReadFileTable() failed (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("ReadFileTable() failed (%lu).\n", (ULONG)Status)); return Status; } @@ -782,7 +782,7 @@ Status = ReadDataBlocks(FolderNode); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("ReadDataBlocks() failed (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("ReadDataBlocks() failed (%lu).\n", (ULONG)Status)); return Status; } FolderNode = FolderNode->Next; @@ -916,7 +916,7 @@ Status = LocateFile(FileName, &File); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MID_TRACE, ("Cannot locate file (%d).\n", (ULONG)Status)); + DPRINT(MID_TRACE, ("Cannot locate file (%lu).\n", (ULONG)Status)); return Status; } @@ -936,7 +936,7 @@ return CAB_STATUS_UNSUPPCOMP; } - DPRINT(MAX_TRACE, ("Extracting file at uncompressed offset (0x%X) Size (%d bytes) AO (0x%X) UO (0x%X).\n", + DPRINT(MAX_TRACE, ("Extracting file at uncompressed offset (0x%lX) Size (%lu bytes) AO (0x%lX) UO (0x%lX).\n", (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize, (ULONG)File->DataBlock->AbsoluteOffset, @@ -1057,13 +1057,13 @@ { do { - DPRINT(MAX_TRACE, ("CO (0x%lX) ReuseBlock (%d) Offset (0x%lX) Size (%ld) BytesLeftInBlock (%ld)\n", + DPRINT(MAX_TRACE, ("CO (0x%lX) ReuseBlock (%lu) Offset (0x%lX) Size (%ld) BytesLeftInBlock (%ld)\n", File->DataBlock->UncompOffset, (ULONG)ReuseBlock, Offset, Size, BytesLeftInBlock)); if (/*(CurrentDataNode != File->DataBlock) &&*/ (!ReuseBlock) || (BytesLeftInBlock <= 0)) { - DPRINT(MAX_TRACE, ("Filling buffer. ReuseBlock (%d)\n", (ULONG)ReuseBlock)); + DPRINT(MAX_TRACE, ("Filling buffer. ReuseBlock (%lu)\n", (ULONG)ReuseBlock)); CurrentBuffer = Buffer; TotalBytesRead = 0; @@ -1076,11 +1076,11 @@ { CloseFile(DestFile); FreeMemory(Buffer); - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } - DPRINT(MAX_TRACE, ("Data block: Checksum (0x%X) CompSize (%d bytes) UncompSize (%d bytes)\n", + DPRINT(MAX_TRACE, ("Data block: Checksum (0x%lX) CompSize (%lu bytes) UncompSize (%lu bytes)\n", (ULONG)CFData.Checksum, (ULONG)CFData.CompSize, (ULONG)CFData.UncompSize)); @@ -1097,7 +1097,7 @@ { CloseFile(DestFile); FreeMemory(Buffer); - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1145,7 +1145,7 @@ Status = LocateFile(TempName, &File); if (Status == CAB_STATUS_NOFILE) { - DPRINT(MID_TRACE, ("Cannot locate file (%d).\n", (ULONG)Status)); + DPRINT(MID_TRACE, ("Cannot locate file (%lu).\n", (ULONG)Status)); return Status; } @@ -1171,7 +1171,7 @@ } #endif - DPRINT(MAX_TRACE, ("Continuing extraction of file at uncompressed offset (0x%X) Size (%d bytes) AO (0x%X) UO (0x%X).\n", + DPRINT(MAX_TRACE, ("Continuing extraction of file at uncompressed offset (0x%lX) Size (%lu bytes) AO (0x%lX) UO (0x%lX).\n", (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize, (ULONG)File->DataBlock->AbsoluteOffset, @@ -1208,7 +1208,7 @@ } else { - DPRINT(MAX_TRACE, ("Using same buffer. ReuseBlock (%d)\n", (ULONG)ReuseBlock)); + DPRINT(MAX_TRACE, ("Using same buffer. ReuseBlock (%lu)\n", (ULONG)ReuseBlock)); BytesToWrite = BytesLeftInBlock; @@ -1221,7 +1221,7 @@ { CloseFile(DestFile); FreeMemory(Buffer); - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1262,7 +1262,7 @@ if (Size < BytesToWrite) BytesToWrite = Size; - DPRINT(MAX_TRACE, ("Offset (0x%X) CurrentOffset (0x%X) ToWrite (%d) Skipped (%d)(%d) Size (%d).\n", + DPRINT(MAX_TRACE, ("Offset (0x%lX) CurrentOffset (0x%lX) ToWrite (%lu) Skipped (%lu)(%lu) Size (%lu).\n", (ULONG)Offset, (ULONG)CurrentOffset, (ULONG)BytesToWrite, @@ -2081,7 +2081,7 @@ { PCFDATA_NODE Node; - DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%X) FileSize (%d).\n", + DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%lX) FileSize (%lu).\n", (char*)File->FileName, (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize)); @@ -2089,7 +2089,7 @@ Node = CurrentFolderNode->DataListHead; while (Node != NULL) { - DPRINT(MAX_TRACE, ("GetAbsoluteOffset(): Comparing (0x%X, 0x%X) (%d).\n", + DPRINT(MAX_TRACE, ("GetAbsoluteOffset(): Comparing (0x%lX, 0x%lX) (%lu).\n", (ULONG)Node->UncompOffset, (ULONG)Node->UncompOffset + Node->Data.UncompSize, (ULONG)Node->Data.UncompSize)); @@ -2137,7 +2137,7 @@ CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); if (!CurrentFolderNode) { - DPRINT(MID_TRACE, ("Folder with index number (%d) not found.\n", + DPRINT(MID_TRACE, ("Folder with index number (%lu) not found.\n", (ULONG)Node->File.FileControlID)); return CAB_STATUS_INVALID_CAB; } @@ -2187,7 +2187,7 @@ Status = ReadBlock(&String[Offset], Size, &BytesRead); if ((Status != CAB_STATUS_SUCCESS) || (BytesRead != Size)) { - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } @@ -2276,7 +2276,7 @@ if ((Status = ReadBlock(&File->File, sizeof(CFFILE), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } @@ -2292,7 +2292,7 @@ if (Status != CAB_STATUS_SUCCESS) return Status; - DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%X). Size (%d bytes) ControlId (0x%X).\n", + DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%lX). Size (%lu bytes) ControlId (0x%lX).\n", (char*)File->FileName, (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize, @@ -2357,11 +2357,11 @@ if ((Status = ReadBlock(&Node->Data, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from file (%lu).\n", (ULONG)Status)); return CAB_STATUS_INVALID_CAB; } - DPRINT(MAX_TRACE, ("AbsOffset (0x%X) UncompOffset (0x%X) Checksum (0x%X) CompSize (%d) UncompSize (%d).\n", + DPRINT(MAX_TRACE, ("AbsOffset (0x%lX) UncompOffset (0x%lX) Checksum (0x%lX) CompSize (%lu) UncompSize (%lu).\n", (ULONG)AbsoluteOffset, (ULONG)UncompOffset, (ULONG)Node->Data.Checksum, @@ -2648,7 +2648,7 @@ /* FIXME: Doesn't seem to be correct. EXTRACT.EXE won't accept checksums computed by this routine */ - DPRINT(MIN_TRACE, ("Checksumming buffer (0x%p) Size (%d)\n", Buffer, Size)); + DPRINT(MIN_TRACE, ("Checksumming buffer (0x%p) Size (%lu)\n", Buffer, Size)); UlongCount = Size / 4; // Number of ULONGs Checksum = Seed; // Init checksum @@ -3141,7 +3141,7 @@ Status = ScratchFile->ReadBlock(&DataNode->Data, InputBuffer, &BytesRead); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot read from scratch file (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot read from scratch file (%lu).\n", (ULONG)Status)); return Status; } @@ -3241,7 +3241,7 @@ // FIXME: MAKECAB.EXE does not like this checksum algorithm //DataNode->Data.Checksum = ComputeChecksum(CurrentOBuffer, DataNode->Data.CompSize, 0); - DPRINT(MAX_TRACE, ("Writing block. Checksum (0x%X) CompSize (%d) UncompSize (%d).\n", + DPRINT(MAX_TRACE, ("Writing block. Checksum (0x%lX) CompSize (%lu) UncompSize (%lu).\n", (ULONG)DataNode->Data.Checksum, (ULONG)DataNode->Data.CompSize, (ULONG)DataNode->Data.UncompSize)); Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Fri Oct 12 01:01:39 2007 @@ -161,14 +161,14 @@ NULL); // No attribute template if (InfFileHandle == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("Error creating '%d'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("Error creating '%lu'.\n", (ULONG)GetLastError())); return; } #else /* !WIN32 */ InfFileHandle = fopen(buf, "wb"); if (InfFileHandle == NULL) { - DPRINT(MID_TRACE, ("Error creating '%d'.\n", (ULONG)errno)); + DPRINT(MID_TRACE, ("Error creating '%lu'.\n", (ULONG)errno)); return; } #endif @@ -177,7 +177,7 @@ #if defined(WIN32) if (!WriteFile(InfFileHandle, InfLine, (DWORD)strlen(InfLine), (LPDWORD)&BytesWritten, NULL)) { - DPRINT(MID_TRACE, ("ERROR WRITING '%d'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR WRITING '%lu'.\n", (ULONG)GetLastError())); return; } #else @@ -191,7 +191,7 @@ #if defined(WIN32) if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), (LPDWORD)&BytesWritten, NULL)) { - DPRINT(MID_TRACE, ("ERROR WRITING '%d'.\n", (ULONG)GetLastError())); + DPRINT(MID_TRACE, ("ERROR WRITING '%lu'.\n", (ULONG)GetLastError())); return; } #else @@ -347,7 +347,7 @@ if (Status == CAB_STATUS_FAILURE) { - printf("Directive file contains errors at line %d.\n", (ULONG)CurrentLine); + printf("Directive file contains errors at line %lu.\n", (ULONG)CurrentLine); DPRINT(MID_TRACE, ("Error while executing command.\n")); } @@ -361,7 +361,7 @@ if (Status != CAB_STATUS_SUCCESS) { - printf("Directive file contains errors at line %d.\n", (ULONG)CurrentLine); + printf("Directive file contains errors at line %lu.\n", (ULONG)CurrentLine); DPRINT(MID_TRACE, ("Error while copying file.\n")); } @@ -382,8 +382,8 @@ break; default: - printf("Directive file contains errors at line %d.\n", (ULONG)CurrentLine); - DPRINT(MID_TRACE, ("Token is (%d).\n", (ULONG)CurrentToken)); + printf("Directive file contains errors at line %lu.\n", (ULONG)CurrentLine); + DPRINT(MID_TRACE, ("Token is (%lu).\n", (ULONG)CurrentToken)); return CAB_STATUS_SUCCESS; } NextToken(); @@ -402,7 +402,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); return Status; } } @@ -412,7 +412,7 @@ Status = CloseCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot close cabinet (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot close cabinet (%lu).\n", (ULONG)Status)); return Status; } } @@ -455,7 +455,7 @@ Number += 1; - DPRINT(MID_TRACE, ("Giving disk (%d) a label...\n", (ULONG)Number)); + DPRINT(MID_TRACE, ("Giving disk (%lu) a label...\n", (ULONG)Number)); if (GetDiskName(&DiskLabel, Number, Label)) return true; @@ -507,7 +507,7 @@ Number += 1; - DPRINT(MID_TRACE, ("Giving cabinet (%d) a name...\n", (ULONG)Number)); + DPRINT(MID_TRACE, ("Giving cabinet (%lu) a name...\n", (ULONG)Number)); if (GetDiskName(&CabinetName, Number, Buffer)) { @@ -687,7 +687,7 @@ * false if there was not enough free memory available */ { - DPRINT(MID_TRACE, ("Setting label of disk (%d) to '%s'\n", (ULONG)Number, Label)); + DPRINT(MID_TRACE, ("Setting label of disk (%lu) to '%s'\n", (ULONG)Number, Label)); return SetDiskName(&DiskLabel, Number, Label); } @@ -717,7 +717,7 @@ * false if there was not enough free memory available */ { - DPRINT(MID_TRACE, ("Setting name of cabinet (%d) to '%s'\n", (ULONG)Number, Name)); + DPRINT(MID_TRACE, ("Setting name of cabinet (%lu) to '%s'\n", (ULONG)Number, Name)); return SetDiskName(&CabinetName, Number, Name); } @@ -1004,7 +1004,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = false; @@ -1013,7 +1013,7 @@ Status = NewDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create disk (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create disk (%lu).\n", (ULONG)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = true; @@ -1028,7 +1028,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = false; @@ -1037,7 +1037,7 @@ Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create cabinet (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create cabinet (%lu).\n", (ULONG)Status)); return CAB_STATUS_SUCCESS; } DiskCreated = true; @@ -1182,7 +1182,7 @@ Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create cabinet (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create cabinet (%lu).\n", (ULONG)Status)); printf("Cannot create cabinet.\n"); return CAB_STATUS_FAILURE; } @@ -1193,7 +1193,7 @@ Status = NewDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create disk (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create disk (%lu).\n", (ULONG)Status)); printf("Cannot create disk.\n"); return CAB_STATUS_FAILURE; } Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Fri Oct 12 01:01:39 2007 @@ -391,14 +391,14 @@ Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot create cabinet (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot create cabinet (%lu).\n", (ULONG)Status)); return false; } Status = AddFile(FileName); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%lu).\n", (ULONG)Status)); return false; } @@ -407,7 +407,7 @@ Status = CloseDisk(); if (Status != CAB_STATUS_SUCCESS) { - DPRINT(MIN_TRACE, ("Cannot write disk (%d).\n", (ULONG)Status)); + DPRINT(MIN_TRACE, ("Cannot write disk (%lu).\n", (ULONG)Status)); return false; } @@ -514,7 +514,7 @@ return false; default: - printf("Unspecified error code (%d).\n", (ULONG)Status); + printf("Unspecified error code (%lu).\n", (ULONG)Status); return false; } } while (FindNext(&Search) == CAB_STATUS_SUCCESS);

1 0

[fireball] 29518: - Mm-rewrite: * Get rid of a hack-based heap allocation in FreeLdr, which makes real data interleaved with temporary data, all that unfreeable and unmanageable. * Introduce new APIs MmHeapAlloc / MmHeapFree to alloc/free memory from a pre-allocated heap. * Add BGET (public domain heap implementation), hook it up to the MmHeapAlloc / MmHeapFree APIs. * MmAllocateMemory still is a backward-compatibility API, will be removed soon. - Change most of allocations to the heap-based rou
by fireball＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: fireball Date: Fri Oct 12 00:40:38 2007 New Revision: 29518 URL: http://svn.reactos.org/svn/reactos?rev=29518&view=rev Log: - Mm-rewrite: * Get rid of a hack-based heap allocation in FreeLdr, which makes real data interleaved with temporary data, all that unfreeable and unmanageable. * Introduce new APIs MmHeapAlloc / MmHeapFree to alloc/free memory from a pre-allocated heap. * Add BGET (public domain heap implementation), hook it up to the MmHeapAlloc / MmHeapFree APIs. * MmAllocateMemory still is a backward-compatibility API, will be removed soon. - Change most of allocations to the heap-based routines, add frees where necessary (I must admit Brian already used MmFreeMemory in a lot of places, so I just had to change those to the corresponding MmHeapFree API). - Remove unneeded and wrong IDT filling, which was commented out. - Temporary disable caching support, because it needs a standalone place to keep its data in. For compatibility's sake it's better to leave it when WinLdr is more mature. Added: branches/winldr/include/bget.h (with props) branches/winldr/rtl/bget.c (with props) Modified: branches/winldr/arch/i386/hardware.c branches/winldr/cache/blocklist.c branches/winldr/freeldr_base.rbuild branches/winldr/fs/fat.c branches/winldr/include/freeldr.h branches/winldr/include/mm.h branches/winldr/mm/meminit.c branches/winldr/mm/mm.c branches/winldr/reactos/binhive.c branches/winldr/reactos/registry.c branches/winldr/rtl/libsupp.c branches/winldr/ui/ui.c branches/winldr/windows/peloader.c branches/winldr/windows/winldr.c branches/winldr/windows/wlmemory.c branches/winldr/windows/wlregistry.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/winldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hardware.c?rev… Modified: branches/winldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/cache/blocklist.c?rev=29… Modified: branches/winldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/branches/winldr/freeldr_base.rbuild?rev=… Modified: branches/winldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/fat.c?rev=29518&r1=29… Added: branches/winldr/include/bget.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/bget.h?rev=29518… Modified: branches/winldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/freeldr.h?rev=29… Modified: branches/winldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/mm.h?rev=29518&r… Modified: branches/winldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/mm/meminit.c?rev=29518&r… Modified: branches/winldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/mm/mm.c?rev=29518&r1=295… Modified: branches/winldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/binhive.c?rev=29… Modified: branches/winldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/registry.c?rev=2… Added: branches/winldr/rtl/bget.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/rtl/bget.c?rev=29518&vie… Modified: branches/winldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/rtl/libsupp.c?rev=29518&… Modified: branches/winldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/ui/ui.c?rev=29518&r1=295… Modified: branches/winldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/peloader.c?rev=2… Modified: branches/winldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/winldr.c?rev=295… Modified: branches/winldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=2… Modified: branches/winldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlregistry.c?rev…

1 0

[weiden] 29517: Display a context menu for the selected monitor
by weiden＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: weiden Date: Fri Oct 12 00:23:26 2007 New Revision: 29517 URL: http://svn.reactos.org/svn/reactos?rev=29517&view=rev Log: Display a context menu for the selected monitor Modified: trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/desk/monslctl.h trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Fri Oct 12 00:23:26 2007 @@ -33,6 +33,33 @@ DisplayApplet } }; + +HMENU +LoadPopupMenu(IN HINSTANCE hInstance, + IN LPCTSTR lpMenuName) +{ + HMENU hMenu, hSubMenu = NULL; + + hMenu = LoadMenu(hInstance, + lpMenuName); + + if (hMenu != NULL) + { + hSubMenu = GetSubMenu(hMenu, + 0); + if (hSubMenu != NULL && + !RemoveMenu(hMenu, + 0, + MF_BYPOSITION)) + { + hSubMenu = NULL; + } + + DestroyMenu(hMenu); + } + + return hSubMenu; +} static BOOL CALLBACK PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h (original) +++ trunk/reactos/dll/cpl/desk/desk.h Fri Oct 12 00:23:26 2007 @@ -34,6 +34,10 @@ } DIBITMAP, *PDIBITMAP; extern HINSTANCE hApplet; + +HMENU +LoadPopupMenu(IN HINSTANCE hInstance, + IN LPCTSTR lpMenuName); PDIBITMAP DibLoadImage(LPTSTR lpFilename); VOID DibFreeImage(PDIBITMAP lpBitmap); Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Fri Oct 12 00:23:26 2007 @@ -133,6 +133,18 @@ MENUITEM "Îáèêíîâåíî", ID_MENU_NORMAL MENUITEM "Èçêëþ÷åíî", ID_MENU_DISABLED MENUITEM "Èçáðàíî", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc Fri Oct 12 00:23:26 2007 @@ -130,6 +130,18 @@ MENUITEM "Normální", ID_MENU_NORMAL MENUITEM "Nepøístupné", ID_MENU_DISABLED MENUITEM "Vybráno", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Fri Oct 12 00:23:26 2007 @@ -129,6 +129,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Deaktiviert", ID_MENU_DISABLED MENUITEM "Ausgewählt", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc Fri Oct 12 00:23:26 2007 @@ -129,6 +129,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Fri Oct 12 00:23:26 2007 @@ -131,6 +131,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc Fri Oct 12 00:23:26 2007 @@ -136,6 +136,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Fri Oct 12 00:23:26 2007 @@ -132,6 +132,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Désactivé", ID_MENU_DISABLED MENUITEM "Sélectionné", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc Fri Oct 12 00:23:26 2007 @@ -130,6 +130,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc Fri Oct 12 00:23:26 2007 @@ -129,6 +129,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Dimatikan", ID_MENU_DISABLED MENUITEM "Dipilih", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Fri Oct 12 00:23:26 2007 @@ -129,6 +129,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Fri Oct 12 00:23:26 2007 @@ -129,6 +129,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc Fri Oct 12 00:23:26 2007 @@ -131,6 +131,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Fri Oct 12 00:23:26 2007 @@ -135,6 +135,18 @@ MENUITEM "Normalny", ID_MENU_NORMAL MENUITEM "Wy³¹czony", ID_MENU_DISABLED MENUITEM "Wybrany", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Fri Oct 12 00:23:26 2007 @@ -129,6 +129,18 @@ MENUITEM "Îáû÷íàÿ", ID_MENU_NORMAL MENUITEM "Îòêëþ÷åííàÿ", ID_MENU_DISABLED MENUITEM "Âûáðàííàÿ", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Fri Oct 12 00:23:26 2007 @@ -138,6 +138,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc Fri Oct 12 00:23:26 2007 @@ -132,6 +132,18 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Fri Oct 12 00:23:26 2007 @@ -137,6 +137,18 @@ MENUITEM "Çâè÷àéíå", ID_MENU_NORMAL MENUITEM "Âèìêíåíå", ID_MENU_DISABLED MENUITEM "Âèáðàíå", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Fri Oct 12 00:23:26 2007 @@ -496,6 +496,32 @@ return FALSE; } +static INT +MonSelGetMonitorRect(IN OUT PMONITORSELWND infoPtr, + IN INT Index, + OUT PRECT prc) +{ + RECT rc, rcClient; + + if (Index < 0 || Index >= infoPtr->MonitorsCount) + return -1; + + if (!infoPtr->CanDisplay) + return 0; + + MonSelRectToScreen(infoPtr, + &infoPtr->Monitors[Index].rc, + prc); + + rcClient.left = rcClient.top = 0; + rcClient.right = infoPtr->ClientSize.cx; + rcClient.bottom = infoPtr->ClientSize.cy; + + return IntersectRect(&rc, + &rcClient, + prc) != FALSE; +} + static BOOL MonSelSetCurSelMonitor(IN OUT PMONITORSELWND infoPtr, IN INT Index, @@ -568,7 +594,8 @@ infoPtr->SelectionFrame.cx = infoPtr->SelectionFrame.cy = 4; infoPtr->Margin.cx = infoPtr->Margin.cy = 20; infoPtr->SelectedMonitor = -1; - infoPtr->ControlExStyle = MSLM_EX_ALLOWSELECTDISABLED; + infoPtr->ControlExStyle = MSLM_EX_ALLOWSELECTDISABLED | MSLM_EX_HIDENUMBERONSINGLE | + MSLM_EX_SELECTONRIGHTCLICK; return; } @@ -709,6 +736,10 @@ DWORD Index; RECT rc, rctmp; INT iPrevBkMode; + BOOL bHideNumber; + + bHideNumber = (infoPtr->ControlExStyle & MSLM_EX_HIDENUMBERS) || + ((infoPtr->MonitorsCount == 1) && (infoPtr->ControlExStyle & MSLM_EX_HIDENUMBERONSINGLE)); hbBk = GetSysColorBrush(COLOR_BACKGROUND); hpFg = CreatePen(PS_SOLID, @@ -773,22 +804,25 @@ -1, -1); - hFont = MonSelGetMonitorFont(infoPtr, - hDC, - Index); - if (hFont != NULL) - { - hPrevFont = SelectObject(hDC, - hFont); - - DrawText(hDC, - infoPtr->Monitors[Index].szCaption, - -1, - &rc, - DT_VCENTER | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); - - SelectObject(hDC, - hPrevFont); + if (!bHideNumber) + { + hFont = MonSelGetMonitorFont(infoPtr, + hDC, + Index); + if (hFont != NULL) + { + hPrevFont = SelectObject(hDC, + hFont); + + DrawText(hDC, + infoPtr->Monitors[Index].szCaption, + -1, + &rc, + DT_VCENTER | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + + SelectObject(hDC, + hPrevFont); + } } if (infoPtr->MonitorInfo[Index].Flags & MSL_MIF_DISABLED) @@ -813,6 +847,41 @@ hbOldBk); } +static VOID +MonSelContextMenu(IN OUT PMONITORSELWND infoPtr, + IN SHORT x, + IN SHORT y) +{ + MONSL_MONNMBUTTONCLICKED nm; + INT Index; + + if (!infoPtr->HasFocus) + SetFocus(infoPtr->hSelf); + + nm.pt.x = x; + nm.pt.y = y; + + Index = MonSelHitTest(infoPtr, + &nm.pt); + + MonSelNotifyMonitor(infoPtr, + MSLN_RBUTTONUP, + Index, + (PMONSL_MONNMHDR)&nm); + + /* Send a WM_CONTEXTMENU notification */ + MapWindowPoints(infoPtr->hSelf, + NULL, + &nm.pt, + 1); + + SendMessage(infoPtr->hSelf, + WM_CONTEXTMENU, + (WPARAM)infoPtr->hSelf, + MAKELPARAM(nm.pt.x, + nm.pt.y)); +} + static LRESULT CALLBACK MonitorSelWndProc(IN HWND hwnd, IN UINT uMsg, @@ -873,9 +942,16 @@ break; } + case WM_RBUTTONDOWN: + { + if (!(infoPtr->ControlExStyle & MSLM_EX_SELECTONRIGHTCLICK)) + break; + + /* fall through */ + } + case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: { INT Index; POINT pt; @@ -899,6 +975,14 @@ { if (!infoPtr->HasFocus) SetFocus(hwnd); + break; + } + + case WM_RBUTTONUP: + { + MonSelContextMenu(infoPtr, + (SHORT)LOWORD(lParam), + (SHORT)HIWORD(lParam)); break; } @@ -1081,6 +1165,14 @@ break; } + case MSLM_GETMONITORRECT: + { + Ret = (LRESULT)MonSelGetMonitorRect(infoPtr, + (INT)wParam, + (PRECT)lParam); + break; + } + case WM_CREATE: { infoPtr = (PMONITORSELWND) HeapAlloc(GetProcessHeap(), Modified: trunk/reactos/dll/cpl/desk/monslctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.h (original) +++ trunk/reactos/dll/cpl/desk/monslctl.h Fri Oct 12 00:23:26 2007 @@ -4,6 +4,9 @@ /* Control extended styles */ #define MSLM_EX_ALLOWSELECTNONE 0x1 #define MSLM_EX_ALLOWSELECTDISABLED 0x2 +#define MSLM_EX_HIDENUMBERONSINGLE 0x4 +#define MSLM_EX_HIDENUMBERS 0x8 +#define MSLM_EX_SELECTONRIGHTCLICK 0x10 /* MONSL_MONINFO Flags */ #define MSL_MIF_DISABLED 0x1 @@ -24,6 +27,13 @@ MONSL_MONINFO MonitorInfo; } MONSL_MONNMHDR, *PMONSL_MONNMHDR; +typedef struct _MONSL_MONNMBUTTONCLICKED +{ + /* Used with MSLN_MONITORCHANGING */ + MONSL_MONNMHDR hdr; + POINT pt; +} MONSL_MONNMBUTTONCLICKED, *PMONSL_MONNMBUTTONCLICKED; + typedef struct _MONSL_MONNMMONITORCHANGING { /* Used with MSLN_MONITORCHANGING */ @@ -52,7 +62,19 @@ * * lParam: PMONSL_MONNMHDR */ -#define MSLN_MONITORCHANGED 101 +#define MSLN_MONITORCHANGED 102 + +/* + * MSLN_RBUTTONUP + * This notification code is sent through WM_NOTIFY after the user did a + * right click on the control. If the control's extended style + * MSLM_EX_SELECTONRIGHTCLICK is set and the user clicked on a monitor, + * that monitor is selected and relevant notifications are sent before + * this notification is sent. + * + * lParam: PMONSL_MONNMBUTTONCLICKED + */ +#define MSLN_RBUTTONUP 103 /* * MSLM_SETMONITORSINFO @@ -146,7 +168,15 @@ * Allow deselecting a monitor by clicking into * unused areas of the control. * * MSLM_EX_ALLOWSELECTDISABLED - * Allow selecting disabled monitors + * Allow selecting disabled monitors. + * * MSLM_EX_HIDENUMBERONSINGLE + * Hides the monitor number if the control only + * displays one monitor. + * * MSLM_EX_HIDENUMBERS + * Does not show monitor numbers. + * * MSLM_EX_SELECTONRIGHTCLICK + * Selects a monitor when the user right clicks + * on it. * * Returns non-zero value if successful. */ @@ -160,6 +190,20 @@ * Returns the control's extended style flags. */ #define MSLM_GETEXSTYLE (WM_USER + 0x19) + +/* + * MSLM_GETMONITORRECT + * wParam: INT + * Index of the monitor whose display rectangle is queried. + * lParam: PRECT + * Pointer to a RECT structure that receives the rectangle + * in coordinates relative to the control's client area. + * + * Returns a positive value if the rectangle is visible. + * Returns zero if the rectangle is invisible. + * Returns a negative value if the index is not valid. + */ +#define MSLM_GETMONITORRECT (WM_USER + 0x20) BOOL RegisterMonitorSelectionControl(IN HINSTANCE hInstance); VOID UnregisterMonitorSelectionControl(IN HINSTANCE hInstance); Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Fri Oct 12 00:23:26 2007 @@ -70,6 +70,12 @@ #define ID_MENU_NORMAL 2101 #define ID_MENU_DISABLED 2102 #define ID_MENU_SELECTED 2103 + +#define IDM_MONITOR_MENU 2110 +#define ID_MENU_ATTACHED 2111 +#define ID_MENU_PRIMARY 2112 +#define ID_MENU_IDENTIFY 2113 +#define ID_MENU_PROPERTIES 2114 /* Settings Page */ Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Fri Oct 12 00:23:26 2007 @@ -644,6 +644,106 @@ break; } + case WM_CONTEXTMENU: + { + HWND hwndMonSel; + HMENU hPopup; + UINT uiCmd; + POINT pt, ptClient; + INT Index; + + pt.x = (SHORT)LOWORD(lParam); + pt.y = (SHORT)HIWORD(lParam); + + hwndMonSel = GetDlgItem(hwndDlg, + IDC_SETTINGS_MONSEL); + if ((HWND)wParam == hwndMonSel) + { + if (pt.x == -1 && pt.y == -1) + { + RECT rcMon; + + Index = (INT)SendMessage(hwndMonSel, + MSLM_GETCURSEL, + 0, + 0); + + if (Index >= 0 && + (INT)SendMessage(hwndMonSel, + MSLM_GETMONITORRECT, + Index, + (LPARAM)&rcMon) > 0) + { + pt.x = rcMon.left + ((rcMon.right - rcMon.left) / 2); + pt.y = rcMon.top + ((rcMon.bottom - rcMon.top) / 2); + } + else + pt.x = pt.y = 0; + + MapWindowPoints(hwndMonSel, + NULL, + &pt, + 1); + } + else + { + ptClient = pt; + MapWindowPoints(NULL, + hwndMonSel, + &ptClient, + 1); + + Index = (INT)SendMessage(hwndMonSel, + MSLM_HITTEST, + (WPARAM)&ptClient, + 0); + } + + if (Index >= 0) + { + hPopup = LoadPopupMenu(hApplet, + MAKEINTRESOURCE(IDM_MONITOR_MENU)); + if (hPopup != NULL) + { + /* FIXME: Enable/Disable menu items */ + EnableMenuItem(hPopup, + ID_MENU_ATTACHED, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + EnableMenuItem(hPopup, + ID_MENU_PRIMARY, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + EnableMenuItem(hPopup, + ID_MENU_IDENTIFY, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + EnableMenuItem(hPopup, + ID_MENU_PROPERTIES, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + + uiCmd = (UINT)TrackPopupMenu(hPopup, + TPM_RETURNCMD | TPM_RIGHTBUTTON, + pt.x, + pt.y, + 0, + hwndDlg, + NULL); + + switch (uiCmd) + { + case ID_MENU_ATTACHED: + case ID_MENU_PRIMARY: + case ID_MENU_IDENTIFY: + case ID_MENU_PROPERTIES: + /* FIXME: Implement */ + break; + } + + DestroyMenu(hPopup); + } + } + } + break; + } + case WM_DESTROY: { PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList;

1 0

[cfinck] 29516: Updated Ukrainian translation by Artem Reznikov (temarez AT yandex DOT ru) See issue #2731 for more details.
by cfinck＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: cfinck Date: Fri Oct 12 00:02:58 2007 New Revision: 29516 URL: http://svn.reactos.org/svn/reactos?rev=29516&view=rev Log: Updated Ukrainian translation by Artem Reznikov (temarez AT yandex DOT ru) See issue #2731 for more details. Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Fri Oct 12 00:02:58 2007 @@ -120,128 +120,128 @@ IDD_ADD2 DIALOG 20, 20, 257, 176 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Add Input Language" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 +CAPTION "Äîäàâàííÿ ìîâè ââîäó" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + AUTOCHECKBOX "Ðîçï³çí&àâàííÿ ðóêîïèñíîãî òåêñòó:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + AUTOCHECKBOX "Ìîâë&åííÿ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + AUTOCHECKBOX "&²íø³ òåêñòîâ³ ñëóæáè:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 155, 50, 14 } IDD_ADD3 DIALOG 20, 20, 257, 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Add Input Language" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 +CAPTION "Äîäàâàííÿ ìîâè ââîäó" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + AUTOCHECKBOX "Ðîçï³çí&àâàííÿ ðóêîïèñíîãî òåêñòó:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + AUTOCHECKBOX "Ìîâë&åííÿ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 126, 50, 14 } IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 9, 5, 209, 60 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 LTEXT "SHIFT", -1, 179, 37, 27, 12 CTEXT "+", -1, 168, 37, 8, 9 AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 227, 44, 50, 14 } IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 LTEXT "SHIFT", -1, 73, 87, 27, 12 CTEXT "+", -1, 62, 87, 8, 9 CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "&Òóïèé íàãîëîñ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14 } IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&Òóïèé íàãîëîñ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 LTEXT "SHIFT", -1, 73, 87, 27, 12 CTEXT "+", -1, 62, 87, 8, 9 AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14 } IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" { LTEXT "", 1240, 16, 5, 250, 10 GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ñïîëó÷åííÿ êëàâ³ø", 1249, 17, 17, 85, 8 CTEXT "SHIFT", -1, 68, 37, 27, 12 CTEXT "+", -1, 57, 37, 8, 9 CTEXT "+", -1, 98, 37, 8, 10 AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Key:", -1, 110, 37, 14, 10 + AUTORADIOBUTTON "ALT ç&ë³âà", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Êëàâ³øà:", -1, 110, 37, 14, 10 COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 212, 47, 50, 14 } STRINGTABLE BEGIN - //Selected language on "Add Input language" + //Selected language on "Add Input language" ("Äîäàâàííÿ ìîâè ââîäó") IDS_SELECTED_LANGUAGE "English (United States)" - //Selected keyboard layout on "Add Input language" + //Selected keyboard layout on "Add Input language" ("Äîäàâàííÿ ìîâè ââîäó") IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó."

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