Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[ekohl] 27949: - Load and save game settings. - Disable unused dialog controls and menu items.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 28 17:03:13 2007 New Revision: 27949 URL: http://svn.reactos.org/svn/reactos?rev=27949&view=rev Log: - Load and save game settings. - Disable unused dialog controls and menu items. Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "Èçòåãëè &åäíà", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Èçòåãëè &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "Äîáðå", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòêàç", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Ðàçäàâàíå\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Òåñòå...", IDM_GAME_DECK + MENUITEM "&Òåñòå...", IDM_GAME_DECK, GRAYED MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Èç&õîä", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "&Drei ziehen", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK",IDOK,35,97,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Karten geben\t F2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Deckblatt...", IDM_GAME_DECK + MENUITEM "&Deckblatt...", IDM_GAME_DECK, GRAYED MENUITEM "&Optionen...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Beenden", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "Ñßîå ¸&íá", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Ñßîå &Ôñßá", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Áêýñùóç", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "De&ck...", IDM_GAME_DECK + MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED MENUITEM "&ÅðéëïãÝò...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "¸&îïäïò", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "De&ck...", IDM_GAME_DECK + MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Exit", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Repartir\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Barajar...", IDM_GAME_DECK + MENUITEM "&Barajar...", IDM_GAME_DECK, GRAYED MENUITEM "&Opciones...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Salir", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Donne\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Jeux...", IDM_GAME_DECK + MENUITEM "&Jeux...", IDM_GAME_DECK, GRAYED MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Sat Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "&Giliran\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Dek...", IDM_GAME_DECK + MENUITEM "&Dek...", IDM_GAME_DECK, GRAYED MENUITEM "&Opsi...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Keluar", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Sat Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ AUTORADIOBUTTON "Girane &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Girane &Tre", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "&Dai carte\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "Maz&zo...", IDM_GAME_DECK + MENUITEM "Maz&zo...", IDM_GAME_DECK, GRAYED MENUITEM "O&pzioni...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Esci", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Sat Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "&Del ut\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "Kort&stokk...", IDM_GAME_DECK + MENUITEM "Kort&stokk...", IDM_GAME_DECK, GRAYED MENUITEM "&Valg...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Avslutt", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Sat Jul 28 17:03:13 2007 @@ -20,8 +20,8 @@ AUTORADIOBUTTON "Rozdaj &jedn¹", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14 @@ -47,7 +47,7 @@ BEGIN MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Talia...", IDM_GAME_DECK + MENUITEM "&Talia...", IDM_GAME_DECK, GRAYED MENUITEM "&Opcje...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Zakoñcz", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Sat Jul 28 17:03:13 2007 @@ -16,8 +16,8 @@ AUTORADIOBUTTON "Ïî &îäíîé", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Ïî &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, 101, 97, 50, 14 @@ -43,7 +43,7 @@ BEGIN MENUITEM "Í&îâàÿ èãðà\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK + MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK, GRAYED MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Âûõîä", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Sat Jul 28 17:03:13 2007 @@ -23,8 +23,8 @@ AUTORADIOBUTTON "aha &jednu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "aha &tri", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP - AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Zrui", IDCANCEL, 101, 97, 50, 14 @@ -50,7 +50,7 @@ BEGIN MENUITEM "&Rozda\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Balíèek...", IDM_GAME_DECK + MENUITEM "&Balíèek...", IDM_GAME_DECK, GRAYED MENUITEM "&Monosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Sk&onèi", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Sat Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "µ¡Å§", IDOK, 35, 97, 50, 14 PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "á&¨¡ä¾è\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK + MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK, GRAYED MENUITEM "&µÑÇàÅ×Í¡...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&ÍÍ¡", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "&Ïî îäí³é", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Ï&î òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Ðîçäàòè êàðòè\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Êîëîäà...", IDM_GAME_DECK + MENUITEM "&Êîëîäà...", IDM_GAME_DECK, GRAYED MENUITEM "&Ïàðàìåòðè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Â&èõ³ä", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Sat Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "È·¶¨", IDOK, 35, 97, 50, 14 PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "·¢ÅÆ(&D)\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "±³ÃæÍ¼°¸(&C)...", IDM_GAME_DECK + MENUITEM "±³ÃæÍ¼°¸(&C)...", IDM_GAME_DECK, GRAYED MENUITEM "Ñ¡Ïî(&O)...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "ÍË³ö(&X)", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Sat Jul 28 17:03:13 2007 @@ -338,7 +338,7 @@ } else { - int numcards = min((nOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards()); + int numcards = min((dwOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards()); //make a "visible" copy of these cards CardStack temp; Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sat Jul 28 17:03:13 2007 @@ -19,7 +19,7 @@ TCHAR MsgQuit[128]; TCHAR MsgAbout[128]; TCHAR MsgWin[128]; -INT nOptions = 8; +DWORD dwOptions = 8; CardWindow SolWnd; @@ -28,10 +28,64 @@ void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt) { TCHAR *ptr; - + ptr = szDest + GetModuleFileName(GetModuleHandle(0), szDest, nDestLen) - 1; while(*ptr-- != '.'); lstrcpy(ptr + 1, szExt); +} + +VOID LoadSettings(VOID) +{ + DWORD dwDisposition; + DWORD dwSize; + HKEY hKey; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ, + NULL, + &hKey, + &dwDisposition)) + return; + + dwSize = sizeof(DWORD); + RegQueryValueEx(hKey, + _T("Options"), + NULL, + NULL, + (LPBYTE)&dwOptions, + &dwSize); + + RegCloseKey(hKey); +} + +VOID SaveSettings(VOID) +{ + DWORD dwDisposition; + HKEY hKey; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisposition)) + return; + + RegSetValueEx(hKey, + _T("Options"), + 0, + REG_DWORD, + (CONST BYTE *)&dwOptions, + sizeof(DWORD)); + + RegCloseKey(hKey); } // @@ -76,11 +130,11 @@ // InitCardLib(); -// LoadSettings(); + LoadSettings(); //Construct the path to our help file MakePath(szHelpPath, MAX_PATH, _T(".hlp")); - + hwnd = CreateWindow(szAppName, // window class name szAppName, // window caption WS_OVERLAPPEDWINDOW @@ -110,15 +164,11 @@ } } -// SaveSettings(); + SaveSettings(); return msg.wParam; } -VOID LoadSettings(VOID) -{ - -} BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -126,7 +176,7 @@ { case WM_INITDIALOG: CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE, - (nOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE); + (dwOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE); return TRUE; @@ -134,9 +184,9 @@ switch(LOWORD(wParam)) { case IDOK: - nOptions &= ~OPTION_THREE_CARDS; + dwOptions &= ~OPTION_THREE_CARDS; if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED) - nOptions |= OPTION_THREE_CARDS; + dwOptions |= OPTION_THREE_CARDS; EndDialog(hDlg, TRUE); return TRUE; @@ -152,13 +202,13 @@ VOID ShowGameOptionsDlg(HWND hwnd) { - INT nOldOptions = nOptions; - - if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc)) - { - if ((nOldOptions & OPTION_THREE_CARDS) != (nOptions & OPTION_THREE_CARDS)) - NewGame(); - } + DWORD dwOldOptions = dwOptions; + + if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc)) + { + if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS)) + NewGame(); + } } //----------------------------------------------------------------------------- @@ -214,7 +264,6 @@ return 0; case WM_COMMAND: - switch(LOWORD(wParam)) { case IDM_GAME_NEW: @@ -246,9 +295,7 @@ return 0; case WM_CLOSE: - ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); - if(ret == IDOK) { WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sat Jul 28 17:03:13 2007 @@ -7,7 +7,7 @@ #define OPTION_THREE_CARDS 8 -extern INT nOptions; +extern DWORD dwOptions; void CreateSol(); void NewGame(void);

17 years, 5 months

[cwittich] 27948: delete ocidl.h and autogenerate it from the idl

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 28 16:51:59 2007 New Revision: 27948 URL: http://svn.reactos.org/svn/reactos?rev=27948&view=rev Log: delete ocidl.h and autogenerate it from the idl Removed: trunk/reactos/include/psdk/ocidl.h Modified: trunk/reactos/include/psdk/psdk.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/include/psdk/ocidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ocidl.h?rev=2… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r…

17 years, 5 months

[weiden] 27947: Fix stack corruption

by weiden＠svn.reactos.org

Author: weiden Date: Sat Jul 28 16:48:02 2007 New Revision: 27947 URL: http://svn.reactos.org/svn/reactos?rev=27947&view=rev Log: Fix stack corruption Modified: trunk/rosapps/downloader/xml.c Modified: trunk/rosapps/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/xml.c?rev=27947… ============================================================================== --- trunk/rosapps/downloader/xml.c (original) +++ trunk/rosapps/downloader/xml.c Sat Jul 28 16:48:02 2007 @@ -190,8 +190,7 @@ size_t len = fread (buffer, 1, sizeof(buffer), file); done = len < sizeof(buffer); - buffer[len] = 0; - if(!XML_Parse(parser, buffer, len, done)) + if(len > 0 && !XML_Parse(parser, buffer, len, done)) { MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); return FALSE;

17 years, 5 months

[weiden] 27946: turn assertion on again, this bug should be fixed now

by weiden＠svn.reactos.org

Author: weiden Date: Sat Jul 28 16:22:27 2007 New Revision: 27946 URL: http://svn.reactos.org/svn/reactos?rev=27946&view=rev Log: turn assertion on again, this bug should be fixed now Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sat Jul 28 16:22:27 2007 @@ -54,12 +54,7 @@ IntDestroyClass(IN OUT PWINDOWCLASS Class) { /* there shouldn't be any clones anymore */ - //ASSERT(Class->Windows == 0); - if (Class->Windows) - { - DPRINT1("FIXME: W3Seek's Class Patch is broken!\n"); - Class->Windows = 0; - } + ASSERT(Class->Windows == 0); ASSERT(Class->Clone == NULL); if (Class->Base == Class)

17 years, 5 months

[cwittich] 27945: add hh.exe to bootcd

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 28 16:13:31 2007 New Revision: 27945 URL: http://svn.reactos.org/svn/reactos?rev=27945&view=rev Log: add hh.exe to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Jul 28 16:13:31 2007 @@ -39,6 +39,7 @@ base\applications\mscutils\devmgmt\devmgmt.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 +base\applications\hh\hh.exe 1 base\applications\hostname\hostname.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\network\arp\arp.exe 1

17 years, 5 months

[cwittich] 27944: Updated Norwegian language file for explorer patch by Frode Lillerud (frode at enkelt dot no) See issue #2491 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 28 16:03:46 2007 New Revision: 27944 URL: http://svn.reactos.org/svn/reactos?rev=27944&view=rev Log: Updated Norwegian language file for explorer patch by Frode Lillerud (frode at enkelt dot no) See issue #2491 for more details. Modified: trunk/reactos/base/shell/explorer/explorer-no.rc Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc Sat Jul 28 16:03:46 2007 @@ -30,7 +30,7 @@ BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Utfør...", ID_EXECUTE + MENUITEM "&Kjør...", ID_EXECUTE MENUITEM SEPARATOR MENUITEM "A&vslutt", ID_FILE_EXIT END @@ -38,20 +38,20 @@ BEGIN MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR MENUITEM "&Ekstra verktøylinje", ID_VIEW_EXTRA_BAR - MENUITEM "&Stasjonlinje", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Stasjonslinje", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "S&idelinje", ID_VIEW_SIDE_BAR MENUITEM "Status&linje", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Oppdater\tF5", ID_REFRESH MENUITEM "F&ull Skjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI + MENUITEM "Bruk EDG grensesnitt", ID_VIEW_SDI END POPUP "&Vindu" BEGIN MENUITEM "Nytt &vindu", ID_WINDOW_NEW MENUITEM "Som liste\tShift+F5", ID_WINDOW_CASCADE MENUITEM "Sorter &horisontalt", ID_WINDOW_TILE_HORZ - MENUITEM "Sorter &vertikalt \tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Sorter &vertikalt\tShift+F4", ID_WINDOW_TILE_VERT MENUITEM "Ordne Automatisk", ID_WINDOW_AUTOSORT MENUITEM "Ordne &Symboler", ID_WINDOW_ARRANGE END @@ -116,7 +116,7 @@ MENUITEM SEPARATOR MENUITEM "&Oppdater\tF5", ID_REFRESH MENUITEM "F&ull Skjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI + MENUITEM "&Bruk FDG grensesnitt", ID_VIEW_MDI END POPUP "&Verktøy" BEGIN @@ -138,7 +138,7 @@ IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Utfør" +CAPTION "Kjør" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 @@ -164,60 +164,60 @@ CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Sjekk oppføringer",IDC_CHECK_ENTRIES,143,7,50,14 + PUSHBUTTON "&Søk",IDC_CHECK_ENTRIES,143,7,50,14 END IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Skrivebord innstillinger" +CAPTION "Skrivebordsinnstillinger" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Vennligst velg din foretrukne ikon justering algoritme:", + LTEXT "Velg hvordan ikon skal arrangeres på skrivebordet:", IDC_STATIC,7,7,166,8 - CONTROL "Venstre/topp dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + CONTROL "V/topp ned",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "Venstre/topp høyre",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "V/topp høyre",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "Høyre/topp venstre",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "H/topp vnstr",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./topp dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "H/topp ned",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "Venstre/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "V/bunn opp",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "Venstre/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "V/bunn høyre",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "høyre/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "H/bunn vnstr",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "H/bunn opp",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "kanter ned",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "Kanter ned",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "kanter H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + CONTROL "Kanter vinkel",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + CONTROL "Rundt",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Knapp",BS_OWNERDRAW | BS_BOTTOM | + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Vis &Versjon Nummer",ID_DESKTOP_VERSION,"Button", + CONTROL "Vis &versjonsummer",ID_DESKTOP_VERSION,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "oppgavelinje egenskaper" +CAPTION "Egenskaper for Oppgavelinje" FONT 8, "MS Sans Serif" BEGIN CONTROL "Vis &klokken",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,152,52,10 - CONTROL "&Skjul inaktive kunngjøring ikoner", + CONTROL "&Skjul inaktive notifikasjoner", ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&kunngjøringer...",ID_CONFIG_NOTIFYAREA,153,173,50,14 + PUSHBUTTON "&Notifikasjoner...",ID_CONFIG_NOTIFYAREA,153,173,50,14 END IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Start meny egenskaper" +CAPTION "Egenskaper for Startmeny" FONT 8, "MS Sans Serif" BEGIN END @@ -226,7 +226,7 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Konfigurer underretning Ikoner" +CAPTION "Konfigurer justering av ikoner" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | @@ -257,10 +257,10 @@ IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Velg Explorer vindu mode" +CAPTION "Velg Explorer vindumodus" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Vennligst velg din foretrukne explorer bruker grensesnitt:", + LTEXT "Vennligst velg din foretrukne grensesnitt:", IDC_STATIC,7,7,160,8 CONTROL "&FDG (Flerdokumentsgrensesnitt)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 @@ -367,8 +367,8 @@ IDS_CONNECTIONS "Nettverk tilkoblinger" IDS_DRIVES "Drivere" IDS_SEARCH_COMPUTER "Søk etter datamaskiner..." - IDS_SETTINGS_MENU "Innstilling Meny" - IDS_CONTROL_PANEL "Kontroll Panel" + IDS_SETTINGS_MENU "Kontrollpanel meny" + IDS_CONTROL_PANEL "Kontrollpanel" IDS_PRINTERS "Skrivere" IDS_BROWSE "Bla gjennom filer" IDS_SEARCH_PRG "Søk etter Programmer..." @@ -379,7 +379,7 @@ "Du har valgt mer enn et program.\nEr du sikker på at du vil kjøre alle på en gang?" IDS_DESKTOPBAR_SETTINGS "Skrivebord Innstillinger" IDS_DESKTOP "Skrivebord" - IDS_TASKBAR "oppgavelinje" + IDS_TASKBAR "Oppgavelinje" END #endif // Norwegian (N.O.) resources @@ -397,3 +397,4 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED +

17 years, 5 months

[weiden] 27943: The menu names are on the user heaps now

by weiden＠svn.reactos.org

Author: weiden Date: Sat Jul 28 15:35:08 2007 New Revision: 27943 URL: http://svn.reactos.org/svn/reactos?rev=27943&view=rev Log: The menu names are on the user heaps now Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sat Jul 28 15:35:08 2007 @@ -1961,8 +1961,7 @@ if (Ret != 0 && Offset == GCLP_MENUNAME && Window->Class->MenuNameIsString) { - Ret = (ULONG_PTR)DesktopHeapAddressToUser(Window->Class->Desktop, - (PVOID)Ret); + Ret = (ULONG_PTR)UserHeapAddressToUser((PVOID)Ret); } } @@ -2196,10 +2195,9 @@ if (Class->MenuName != NULL && Class->MenuNameIsString) { - lpWndClassEx->lpszMenuName = DesktopHeapAddressToUser(Class->Desktop, - (Ansi ? - (PVOID)Class->AnsiMenuName : - (PVOID)Class->MenuName)); + lpWndClassEx->lpszMenuName = UserHeapAddressToUser(Ansi ? + (PVOID)Class->AnsiMenuName : + (PVOID)Class->MenuName); } /* Undocumented behavior! Return the class atom as a BOOL! */

17 years, 5 months

[cwittich] 27942: fixed "invalid window handle" error msg

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 28 15:11:27 2007 New Revision: 27942 URL: http://svn.reactos.org/svn/reactos?rev=27942&view=rev Log: fixed "invalid window handle" error msg Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sat Jul 28 15:11:27 2007 @@ -231,7 +231,7 @@ 0, REG_MULTI_SZ, (LPBYTE) szPagingFiles, - (DWORD) nPos * sizeof(TCHAR))) + (DWORD) nPos * sizeof(TCHAR)) == ERROR_SUCCESS) { bErr = FALSE; }

17 years, 5 months

[weiden] 27941: Simplify and fix handling of menus for classes

by weiden＠svn.reactos.org

Author: weiden Date: Sat Jul 28 15:05:33 2007 New Revision: 27941 URL: http://svn.reactos.org/svn/reactos?rev=27941&view=rev Log: Simplify and fix handling of menus for classes Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Jul 28 15:05:33 2007 @@ -47,14 +47,13 @@ PWSTR MenuName; PSTR AnsiMenuName; - ULONG_PTR ClassExtraDataOffset; - UINT Destroying : 1; UINT Unicode : 1; UINT System : 1; UINT Global : 1; UINT GlobalCallProc : 1; UINT GlobalCallProc2 : 1; + UINT MenuNameIsString : 1; } WINDOWCLASS, *PWINDOWCLASS; typedef struct _W32PROCESSINFO Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sat Jul 28 15:05:33 2007 @@ -42,8 +42,7 @@ IntFreeClassMenuName(IN OUT PWINDOWCLASS Class) { /* free the menu name, if it was changed and allocated */ - if (Class->MenuName != NULL && !IS_INTRESOURCE(Class->MenuName) && - Class->MenuName != (PWSTR)(Class + 1)) + if (Class->MenuName != NULL && Class->MenuNameIsString) { UserHeapFree(Class->MenuName); Class->MenuName = NULL; @@ -416,8 +415,7 @@ { /* The window is created on a different desktop, we need to clone the class object to the desktop heap of the window! */ - ClassSize = (SIZE_T)BaseClass->ClassExtraDataOffset + - (SIZE_T)BaseClass->ClsExtra; + ClassSize = sizeof(*BaseClass) + (SIZE_T)BaseClass->ClsExtra; Class = DesktopHeapAlloc(Desktop, ClassSize); @@ -651,8 +649,7 @@ ASSERT(Class->Windows == 0); ASSERT(Class->Clone == NULL); - ClassSize = (SIZE_T)Class->ClassExtraDataOffset + - (SIZE_T)Class->ClsExtra; + ClassSize = sizeof(*Class) + (SIZE_T)Class->ClsExtra; /* allocate the new base class on the shared heap */ NewClass = UserHeapAlloc(ClassSize); @@ -664,15 +661,6 @@ NewClass->Desktop = NULL; NewClass->Base = NewClass; - - if (Class->MenuName == (PWSTR)(Class + 1)) - { - ULONG_PTR AnsiDelta = (ULONG_PTR)Class->AnsiMenuName - (ULONG_PTR)Class->MenuName; - - /* fixup the self-relative MenuName pointers */ - NewClass->MenuName = (PWSTR)(NewClass + 1); - NewClass->AnsiMenuName = (PSTR)((ULONG_PTR)NewClass->MenuName + AnsiDelta); - } if (!NewClass->System && NewClass->CallProc != NULL && !NewClass->GlobalCallProc) @@ -833,6 +821,7 @@ SIZE_T ClassSize; PWINDOWCLASS Class = NULL; RTL_ATOM Atom; + PWSTR pszMenuName = NULL; NTSTATUS Status = STATUS_SUCCESS; TRACE("lpwcx=%p ClassName=%wZ MenuName=%wZ wpExtra=%p dwFlags=%08x Desktop=%p pi=%p\n", @@ -845,11 +834,13 @@ return NULL; } - ClassSize = sizeof(WINDOWCLASS) + lpwcx->cbClsExtra; + ClassSize = sizeof(*Class) + lpwcx->cbClsExtra; if (MenuName->Length != 0) { - ClassSize += MenuName->Length + sizeof(UNICODE_NULL); - ClassSize += RtlUnicodeStringToAnsiSize(MenuName); + pszMenuName = UserHeapAlloc(MenuName->Length + sizeof(UNICODE_NULL) + + RtlUnicodeStringToAnsiSize(MenuName)); + if (pszMenuName == NULL) + goto NoMem; } if (Desktop != NULL) @@ -868,7 +859,7 @@ if (Class != NULL) { RtlZeroMemory(Class, - sizeof(ClassSize)); + ClassSize); Class->Desktop = Desktop; Class->Base = Class; @@ -883,9 +874,7 @@ _SEH_TRY { - PWSTR strBuf; - PSTR strBufA; - ANSI_STRING AnsiString; + PWSTR pszMenuNameBuffer = pszMenuName; /* need to protect with SEH since accessing the WNDCLASSEX structure and string buffers might raise an exception! We don't want to @@ -901,26 +890,29 @@ Class->hbrBackground = lpwcx->hbrBackground; /* make a copy of the string */ - strBuf = (PWSTR)(Class + 1); - if (MenuName->Length != 0) - { - Class->MenuName = strBuf; + if (pszMenuNameBuffer != NULL) + { + Class->MenuNameIsString = TRUE; + + Class->MenuName = pszMenuNameBuffer; RtlCopyMemory(Class->MenuName, MenuName->Buffer, MenuName->Length); - - strBuf += (MenuName->Length / sizeof(WCHAR)) + 1; + Class->MenuName[MenuName->Length / sizeof(WCHAR)] = UNICODE_NULL; + + pszMenuNameBuffer += (MenuName->Length / sizeof(WCHAR)) + 1; } else Class->MenuName = MenuName->Buffer; /* save an ansi copy of the string */ - strBufA = (PSTR)strBuf; - if (MenuName->Length != 0) - { - Class->AnsiMenuName = strBufA; + if (pszMenuNameBuffer != NULL) + { + ANSI_STRING AnsiString; + + Class->AnsiMenuName = (PSTR)pszMenuNameBuffer; AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(MenuName); - AnsiString.Buffer = strBufA; + AnsiString.Buffer = Class->AnsiMenuName; Status = RtlUnicodeStringToAnsiString(&AnsiString, MenuName, FALSE); @@ -931,15 +923,10 @@ /* life would've been much prettier if ntoskrnl exported RtlRaiseStatus()... */ _SEH_LEAVE; } - - strBufA += AnsiString.Length + 1; } else Class->AnsiMenuName = (PSTR)MenuName->Buffer; - /* calculate the offset of the extra data */ - Class->ClassExtraDataOffset = (ULONG_PTR)strBufA - (ULONG_PTR)Class; - if (!(dwFlags & REGISTERCLASS_ANSI)) Class->Unicode = TRUE; @@ -957,6 +944,9 @@ DPRINT1("Failed creating the class: 0x%x\n", Status); SetLastNtError(Status); + + if (pszMenuName != NULL) + UserHeapFree(pszMenuName); DesktopHeapFree(Desktop, Class); @@ -967,7 +957,11 @@ } else { +NoMem: DPRINT1("Failed to allocate class on Desktop 0x%p\n", Desktop); + + if (pszMenuName != NULL) + UserHeapFree(pszMenuName); IntDeregisterClassAtom(Atom); @@ -1423,7 +1417,7 @@ return 0; } - Data = (PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset + Index); + Data = (PULONG_PTR)((ULONG_PTR)(Class + 1) + Index); /* FIXME - Data might be a unaligned pointer! Might be a problem on certain architectures, maybe using RtlCopyMemory is a @@ -1550,6 +1544,7 @@ IntFreeClassMenuName(Class); Class->MenuName = strBufW; Class->AnsiMenuName = AnsiString.Buffer; + Class->MenuNameIsString = TRUE; /* update the clones */ Class = Class->Clone; @@ -1557,6 +1552,7 @@ { Class->MenuName = strBufW; Class->AnsiMenuName = AnsiString.Buffer; + Class->MenuNameIsString = TRUE; Class = Class->Next; } @@ -1578,6 +1574,7 @@ IntFreeClassMenuName(Class); Class->MenuName = MenuName->Buffer; Class->AnsiMenuName = (PSTR)MenuName->Buffer; + Class->MenuNameIsString = FALSE; /* update the clones */ Class = Class->Clone; @@ -1585,6 +1582,7 @@ { Class->MenuName = MenuName->Buffer; Class->AnsiMenuName = (PSTR)MenuName->Buffer; + Class->MenuNameIsString = FALSE; Class = Class->Next; } @@ -1619,7 +1617,7 @@ return 0; } - Data = (PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset + Index); + Data = (PULONG_PTR)((ULONG_PTR)(Class + 1) + Index); /* FIXME - Data might be a unaligned pointer! Might be a problem on certain architectures, maybe using RtlCopyMemory is a @@ -1631,7 +1629,7 @@ Class = Class->Clone; while (Class != NULL) { - *(PULONG_PTR)((ULONG_PTR)Class + Class->ClassExtraDataOffset + Index) = NewLong; + *(PULONG_PTR)((ULONG_PTR)(Class + 1) + Index) = NewLong; Class = Class->Next; } @@ -1961,7 +1959,7 @@ Offset, Ansi); - if (Ret != 0 && Offset == GCLP_MENUNAME && !IS_INTRESOURCE(Ret)) + if (Ret != 0 && Offset == GCLP_MENUNAME && Window->Class->MenuNameIsString) { Ret = (ULONG_PTR)DesktopHeapAddressToUser(Window->Class->Desktop, (PVOID)Ret); @@ -2196,8 +2194,7 @@ lpWndClassEx->lpszClassName = CapturedClassName.Buffer; /* FIXME - handle Class->Desktop == NULL!!!!! */ - if (Class->MenuName != NULL && - !IS_INTRESOURCE(Class->MenuName)) + if (Class->MenuName != NULL && Class->MenuNameIsString) { lpWndClassEx->lpszMenuName = DesktopHeapAddressToUser(Class->Desktop, (Ansi ?

17 years, 5 months

[cwittich] 27940: better control placement for syssetup Italian rc file patch by devpao (devotip at tiscali.it) See issue #2475 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 28 14:29:23 2007 New Revision: 27940 URL: http://svn.reactos.org/svn/reactos?rev=27940&view=rev Log: better control placement for syssetup Italian rc file patch by devpao (devotip at tiscali.it) See issue #2475 for more details. Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Sat Jul 28 14:29:23 2007 @@ -31,14 +31,14 @@ BEGIN LTEXT "Gli sviluppatori di ReactOS desiderano citare i seguenti progetti Open Source, "\ "che sono stati usati (in tutto o in parte) per creare ReactOS:", - IDC_STATIC,15,7,286,19 - LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + IDC_STATIC,20,7,286,19 + LISTBOX IDC_PROJECTS,20,30,280,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOS è soggetto alla licenza GPL, per cui se si desidera riusarlo o ridistribuirlo "\ "(in tutto o in parte) è necessario rispettare la GPL", - IDC_STATIC,15,110,227,19 + IDC_STATIC,20,110,227,19 PUSHBUTTON "&Mostra la GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "Selezionare Avanti per proseguire con la configurazione.",IDC_STATIC,15,136, + LTEXT "Selezionare Avanti per proseguire con la configurazione.",IDC_STATIC,20,136, 195,17 END @@ -49,10 +49,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Scrivere il proprio nome completo e il nome della propria ditta o organizzazione.", - IDC_STATIC, 44, 7, 242, 21 - LTEXT "No&me:", IDC_STATIC, 44, 37, 120, 8 + IDC_STATIC, 20, 7, 242, 21 + LTEXT "No&me:", IDC_STATIC, 20, 37, 120, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organizzazione:", IDC_STATIC, 44, 57, 120, 8 + LTEXT "&Organizzazione:", IDC_STATIC, 20, 57, 120, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -64,18 +64,18 @@ BEGIN LTEXT "Scrivere un nome per il computer che sia lungo al massimo 63 caratteri.\n"\ "Se si è in rete, il nome del computer deve essere univoco.", - IDC_STATIC, 44, 7, 250, 24 - LTEXT "Nome del &computer:", IDC_STATIC, 44, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + IDC_STATIC, 20, 7, 250, 24 + LTEXT "Nome del &computer:", IDC_STATIC, 20, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 140, 35, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Questa procedura creerà su questo computer un account utente chiamato Administrator. "\ "Si potrà usare questo account se si necessita l'accesso completo al computer.", - IDC_STATIC, 44, 57, 250, 25 + IDC_STATIC, 20, 57, 250, 25 LTEXT "Scrivere una password per Administrator che sia lunga al massimo 14 caratteri.", - IDC_STATIC, 44, 87, 250, 8 - LTEXT "Password per &Administrator:", IDC_STATIC, 44, 104, 95, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfermare la password:", IDC_STATIC, 44, 123, 95, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + IDC_STATIC, 20, 87, 250, 8 + LTEXT "Password per &Administrator:", IDC_STATIC, 20, 105, 95, 8 + EDITTEXT IDC_ADMINPASSWORD1, 140, 100, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfermare la password:", IDC_STATIC, 20, 125, 95, 8 + EDITTEXT IDC_ADMINPASSWORD2, 140, 120, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -86,17 +86,17 @@ BEGIN LTEXT "Le impostazioni linguistiche del sistema devono coincidere con la lingua degli applicativi "\ "che si desidera usare. Le impostazioni linguistiche dell'utente stabiliscono come appaiono "\ - "i numeri, i valori monetari e le date.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + "i numeri, i valori monetari e le date.", IDC_STATIC, 20, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 20, 29, 250, 16 LTEXT "Per cambiare le impostazioni linguistiche del sistema o dell'utente, selezionare Personalizza.", - IDC_STATIC, 53, 50, 184, 8 - PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 245, 47, 50, 14 + IDC_STATIC, 20, 50, 184, 16 + PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 250, 50, 50, 16 LTEXT "Il formato della tastiera stabilisce i caratteri che appaiono quando si preme un tasto.", - IDC_STATIC, 53, 86, 253, 8 - LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + IDC_STATIC, 20, 86, 253, 16 + LTEXT "", IDC_LAYOUTTEXT, 20, 100, 250, 16 LTEXT "Per cambiare il formato della tastiera, selezionare Personalizza.", - IDC_STATIC, 53, 106, 184, 8 - PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 245, 102, 50, 14 + IDC_STATIC, 20, 110, 184, 16 + PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 250, 110, 50, 16 END @@ -105,16 +105,16 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Data e ora", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Data e ora", IDC_STATIC, 20, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 17, 137, 10 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Fuso orario", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 10 + LTEXT "Fuso orario", IDC_STATIC, 20, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 20, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Cambia automaticamente con l'ora &legale", - IDC_AUTODAYLIGHT, 53, 124, 201, 10 + IDC_AUTODAYLIGHT, 20, 124, 201, 10 END @@ -123,10 +123,10 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 20, 7, 253, 20 + LTEXT "", IDC_ITEM, 20, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", - PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 70, 253, 8 END

17 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007