Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[spetreolle] 32508: include Fr.rc and Nl.rc

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Feb 27 15:52:07 2008 New Revision: 32508 URL: http://svn.reactos.org/svn/reactos?rev=32508&view=rev Log: include Fr.rc and Nl.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Wed Feb 27 15:52:07 2008 @@ -26,6 +26,8 @@ #include "De.rc" #include "El.rc" #include "En.rc" +#include "Fr.rc" #include "Ko.rc" +#include "Nl.rc" #include "Pl.rc" #include "Ru.rc"

16 years, 10 months

[cwittich] 32507: fix path to msvc def file

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 27 15:27:45 2008 New Revision: 32507 URL: http://svn.reactos.org/svn/reactos?rev=32507&view=rev Log: fix path to msvc def file Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Wed Feb 27 15:27:45 2008 @@ -274,6 +274,9 @@ { intermediatedir = module.output->relative_path + vcdir; importLib = _strip_gcc_deffile(module.importLibrary->source->name, module.importLibrary->source->relative_path, intermediatedir); + importLib = Path::RelativeFromDirectory ( + importLib, + module.output->relative_path ); } fprintf ( OUT, "\t<Configurations>\r\n" ); @@ -854,8 +857,8 @@ NewFilename = _replace_str(NewFilename, "_msvc.de", "_msvc.def"); Filename = sourcedir + "\\" + Filename; - Directory dir(objdir); - dir.GenerateTree(IntermediateDirectory, false); + Directory dir(objdir); + dir.GenerateTree(IntermediateDirectory, false); std::fstream in_file(Filename.c_str(), std::ios::in); std::fstream out_file(NewFilename.c_str(), std::ios::out);

16 years, 10 months

[cwittich] 32506: fix formatting and msvc build

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 27 15:27:16 2008 New Revision: 32506 URL: http://svn.reactos.org/svn/reactos?rev=32506&view=rev Log: fix formatting and msvc build Modified: trunk/reactos/dll/cpl/appwiz/updates.c Modified: trunk/reactos/dll/cpl/appwiz/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/updates.c?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/updates.c (original) +++ trunk/reactos/dll/cpl/appwiz/updates.c Wed Feb 27 15:27:16 2008 @@ -45,16 +45,16 @@ { case WM_INITDIALOG: { - CallInformation(hDlg, UpdInfoDialog, IDC_UPDATESLIST); + CallInformation(hDlg, UpdInfoDialog, IDC_UPDATESLIST); } case WM_COMMAND: { - switch (LOWORD(wParam)) - { - case IDCANCEL: - EndDialog(hDlg,LOWORD(wParam)); - break; - } + switch (LOWORD(wParam)) + { + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + break; + } } break; } @@ -66,79 +66,75 @@ INT_PTR CALLBACK UpdatesPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + TCHAR Buf[256]; + UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); - TCHAR Buf[256]; switch (uMsg) { case WM_INITDIALOG: - AddItemsToViewControl(hwndDlg, IDC_UPD_VIEW_COMBO); - LoadString(hApplet, IDS_UPDATESLIST, Buf, sizeof(Buf) / sizeof(TCHAR)); - AddListColumn(GetDlgItem(hwndDlg, IDC_UPDATESLIST),Buf); - FillSoftwareList(hwndDlg, TRUE, IDC_UPDATESLIST); - UpdInfoDialog = hwndDlg; + AddItemsToViewControl(hwndDlg, IDC_UPD_VIEW_COMBO); + LoadString(hApplet, IDS_UPDATESLIST, Buf, sizeof(Buf) / sizeof(TCHAR)); + AddListColumn(GetDlgItem(hwndDlg, IDC_UPDATESLIST),Buf); + FillSoftwareList(hwndDlg, TRUE, IDC_UPDATESLIST); + UpdInfoDialog = hwndDlg; break; case WM_COMMAND: switch (LOWORD(wParam)) { - case IDC_UPD_FIND_EDIT: - if (HIWORD(wParam) == EN_CHANGE) - { - FindItems(hwndDlg,IDC_UPDATESLIST,IDC_UPD_FIND_EDIT,IDC_UPD_REMOVE,IDC_UPD_INFO_BUTTON); - } - break; - case ID_UPD_INFORMATION: - case IDC_UPD_INFO_BUTTON: - { - if (IsItemSelected(hwndDlg, IDC_SOFTWARELIST)) - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_INFORMATION), - hwndDlg, - InfoPropDlgProc); - } - break; - case ID_UPD_REMOVE: - case IDC_UPD_REMOVE: + case IDC_UPD_FIND_EDIT: + if (HIWORD(wParam) == EN_CHANGE) + { + FindItems(hwndDlg,IDC_UPDATESLIST,IDC_UPD_FIND_EDIT,IDC_UPD_REMOVE,IDC_UPD_INFO_BUTTON); + } + break; + case ID_UPD_INFORMATION: + case IDC_UPD_INFO_BUTTON: + { + if (IsItemSelected(hwndDlg, IDC_SOFTWARELIST)) + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_INFORMATION), + hwndDlg, + InfoPropDlgProc); + } + break; + case ID_UPD_REMOVE: + case IDC_UPD_REMOVE: CallUninstall(hwndDlg, IDC_UPDATESLIST, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON, TRUE); break; - case IDC_UPD_VIEW_COMBO: - if (HIWORD(wParam) == CBN_SELCHANGE) - GetCurrentView(hwndDlg, IDC_UPD_VIEW_COMBO, IDC_UPDATESLIST); - break; - } - break; - case WM_NOTIFY: - switch (LOWORD(wParam)) - { + case IDC_UPD_VIEW_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + GetCurrentView(hwndDlg, IDC_UPD_VIEW_COMBO, IDC_UPDATESLIST); + break; + } + break; + case WM_NOTIFY: + switch (LOWORD(wParam)) + { case IDC_UPDATESLIST: - switch (((LPNMHDR)lParam)->code) - { - case NM_DBLCLK: - CallUninstall(hwndDlg, IDC_UPDATESLIST, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON, TRUE); - break; - case NM_CLICK: - { - if (!IsItemSelected(hwndDlg, IDC_UPDATESLIST)) - ButtonStatus(hwndDlg, FALSE, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON); - else - ButtonStatus(hwndDlg, TRUE, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON); - } - break; - } + switch (((LPNMHDR)lParam)->code) + { + case NM_DBLCLK: + CallUninstall(hwndDlg, IDC_UPDATESLIST, IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON, TRUE); + break; + case NM_CLICK: + ButtonStatus(hwndDlg, (IsItemSelected(hwndDlg, IDC_UPDATESLIST)), IDC_UPD_REMOVE, IDC_UPD_INFO_BUTTON); + break; + } break; - } - break; - case WM_CONTEXTMENU: - { - ShowPopupMenu(hwndDlg, - IDR_POPUP_UPD, - GET_X_LPARAM(lParam), - GET_Y_LPARAM(lParam), - IDC_UPDATESLIST); - } - break; + } + break; + case WM_CONTEXTMENU: + { + ShowPopupMenu(hwndDlg, + IDR_POPUP_UPD, + GET_X_LPARAM(lParam), + GET_Y_LPARAM(lParam), + IDC_UPDATESLIST); + } + break; } return FALSE;

16 years, 10 months

[dreimer] 32505: Somehow these got lost in a past sync. Added French and Netherlands Translation to XCopy.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 27 15:04:30 2008 New Revision: 32505 URL: http://svn.reactos.org/svn/reactos?rev=32505&view=rev Log: Somehow these got lost in a past sync. Added French and Netherlands Translation to XCopy. Added: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc (with props) Added: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc Wed Feb 27 15:04:30 2008 @@ -1,0 +1,82 @@ +/* + * XCOPY - Wine-compatible xcopy program + * French language support + * + * Copyright 2007 JonathanÂ Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma code_page(65001) + + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_INVPARMS, "Nombre invalide de paramÃ¨tres - Utilisez xcopy /? pour obtenir de l'aide\n" + STRING_INVPARM, "ParamÃ¨tre invalide Â«Â %sÂ Â» - Utilisez xcopy /? pour obtenir de l'aide\n" + STRING_PAUSE, "Appuyez sur ENTRÃE pour dÃ©marrer la copie\n" + STRING_SIMCOPY, "%d fichier(s) seront copiÃ©s\n" + STRING_COPY, "%d fichier(s) copiÃ©s\n" + STRING_QISDIR, "Est-ce que Â«Â %sÂ Â» est un fichier ou un rÃ©pertoire\n" \ + "dans la destinationÂ ?\n" \ + "(F - Fichier, R - RÃ©pertoire)\n" + STRING_SRCPROMPT,"%sÂ ? (Oui|Non)\n" + STRING_OVERWRITE,"Ãcraser %sÂ ? (Oui|Non|Tous)\n" + STRING_COPYFAIL, "La copie de Â«Â %sÂ Â» vers Â«Â %sÂ Â» a Ã©chouÃ© avec le c/r %d\n" + STRING_OPENFAIL, "Impossible d'ouvrir Â«Â %sÂ Â»\n" + STRING_READFAIL, "Impossible de lire Â«Â %sÂ Â»\n" + STRING_YES_CHAR, "O" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "R" + + STRING_HELP, +"XCOPY - Copie les fichiers ou rÃ©pertoires source vers une destination\n\ +\n\ +SyntaxeÂ :\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +OÃ¹Â :\n\ +\n\ +[/I] Suppose que la destination est un rÃ©pertoire si elle n'existe pas et que l'on copie plus\n\ +\td'un fichier\n\ +[/S] Copie les rÃ©pertoires et sous-rÃ©pertoires\n\ +[/E] Copie les rÃ©pertoires et sous-rÃ©pertoires, y compris ceux qui sont vides\n\ +[/Q] Ne pas afficher la liste des fichiers copiÃ©s (mode silencieux)\n\ +[/F] Afficher la source et la destination complÃ¨te lors de la copie\n\ +[/L] Simuler l'opÃ©ration, en montrant le nom des fichiers qui auraient Ã©tÃ© copiÃ©s\n\ +[/W] Demande avant de dÃ©marrer la copie\n\ +[/T] CrÃ©er une structure de rÃ©pertoires vides, mais ne copie pas les fichiers\n\ +[/Y] Ne demande pas de confirmation lors de l'Ã©crasement des fichiers\n\ +[/-Y] Demande une confirmation lors de l'Ã©crasement des fichiers\n\ +[/P] Demande avant de copier chaque fichier source\n\ +[/N] Copie en utilisant des noms courts\n\ +[/U] Copie uniquement les fichiers qui existent dÃ©jÃ dans la destination\n\ +[/R] Ãcrase mÃªme les fichiers en lecture seule\n\ +[/H] Inclure les fichiers cachÃ©s et systÃ¨me dans la copie\n\ +[/C] Continue mÃªme si une erreur survient pendant la copie\n\ +[/A] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini\n\ +[/M] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini, supprime \n\ +\tensuite l'attribut\n\ +[/D | /D:m-d-y] Copie uniquement les fichiers nouveaux ou ceux modifiÃ©s aprÃ¨s la date spÃ©cifiÃ©e.\n\ +\t\tSi aucune date n'est spÃ©cifiÃ©e, copie uniquement lorsque le fichier de destination est plus vieux\n\ +\t\tque le fichier source\n\n" + +} + +#pragma code_page(default) Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc Wed Feb 27 15:04:30 2008 @@ -1,0 +1,78 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Dutch language support + * + * Copyright (C) 2008 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_INVPARMS, "Onjuist aantal parameters - Gebruik xcopy /? om hulp te krijgen\n" + STRING_INVPARM, "Onjuiste parameter '%s' - Gebruik xcopy /? om hulp te krijgen\n" + STRING_PAUSE, "Druk op <enter> om te beginnen met copiÃ«ren\n" + STRING_SIMCOPY, "%d bestand(en) zouden worden gecopiÃ«erd\n" + STRING_COPY, "%d bestand(en) gecopiÃ«erd\n" + STRING_QISDIR, "Is '%s' een bestand of een directory\n" \ + "op de bestemming?\n" \ + "(B - Bestand, D - Directory)\n" + STRING_SRCPROMPT,"%s? (Ja|Nee)\n" + STRING_OVERWRITE,"Overschrijven %s? (Ja|Nee|Alles)\n" + STRING_COPYFAIL, "CopiÃ«ren van '%s' naar '%s' mislukt met r/c %d\n" + STRING_OPENFAIL, "Fout tijdens openen van '%s'\n" + STRING_READFAIL, "Fout tijdens lezen van '%s'\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"B" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - CopiÃ«erd bron bestanden of directory bomen naar een bestemming\n\ +\n\ +Gebruik:\n\ +XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Parameters:\n\ +\n\ +[/I] Als bestemming niet bestaat en 2 of meer bestanden worden\n\ +\tgecopiÃ«erd, neem aan dat een directory werd bedoeld\n\ +[/S] CopiÃ«er directories en subdirectories\n\ +[/E] CopiÃ«er directories en subdirectories, inclusief lege\n\ +[/Q] Toon geen namen tijdens copiÃ«ren (stil).\n\ +[/F] Toon volledige bron- en bestemmingnamen tijdens copiÃ«ren\n\ +[/L] Simuleer de actie, toon de namen die gecopiÃ«erd zouden worden\n\ +[/W] Wacht op gebruiker actie voordat de copiÃ«eractie begint\n\ +[/T] CreÃ«ert de lege directory structuur maar copiÃ«ert geen bestanden\n\ +[/Y] Onderdrukt gebruikersactie wanneer bestanden worden overschreven\n\ +[/-Y] Vraagt gebruikersactie wanneer bestanden worden overschreven\n\ +[/P] Vraagt gebruikersactie voor ieder bron bestand voor copiÃ«ren\n\ +[/N] CopiÃ«er m.b.v korte bestandsnamen\n\ +[/U] CopiÃ«er alleen bestanden die al bestaan op de bestemming\n\ +[/R] Overschrijf alle schrijf-beveiligde bestanden\n\ +[/H] Inclusief verborgen en systeem bestanden\n\ +[/C] Ga door zelfs als er een fout optreed tijdens het copiÃ«ren\n\ +[/A] CopiÃ«er alleen bestanden met archiverings attribuut aan\n\ +[/M] CopiÃ«er alleen bestanden met archiverings attribuut aan, verwijderd \n\ +\tdit archiverings attribuut\n\ +[/D | /D:m-d-y] CopiÃ«er nieuwe bestanden of die gewijzigd zijn na de opgegeven\n\ +\t\tdatum. Als geen detum wordt gegeven, copiÃ«er alleen als bron nieuwer is.\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 10 months

[dreimer] 32504: Update Winhelp and Wordpad to Wine 0.9.56

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 27 14:55:59 2008 New Revision: 32504 URL: http://svn.reactos.org/svn/reactos?rev=32504&view=rev Log: Update Winhelp and Wordpad to Wine 0.9.56 Removed: trunk/reactos/base/applications/wordpad/resource.h Modified: trunk/reactos/base/applications/winhelp/lang/nl-NL.rc trunk/reactos/base/applications/winhelp/lang/pl-PL.rc trunk/reactos/base/applications/winhelp/lex.yy.c trunk/reactos/base/applications/winhelp/macro.lex.l trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Tr.rc Modified: trunk/reactos/base/applications/winhelp/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/nl-NL.rc Wed Feb 27 14:55:59 2008 @@ -2,6 +2,7 @@ * Help Viewer (Dutch resources) * * Copyright 2003 Hans Leidekker + * Copyright 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,6 +50,16 @@ } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Annuleren", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { @@ -65,5 +76,5 @@ STID_TOPICS, "&Onderwerpen" STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" } Modified: trunk/reactos/base/applications/winhelp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/pl-PL.rc Wed Feb 27 14:55:59 2008 @@ -51,6 +51,16 @@ } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Indeks" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Anuluj", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT { Modified: trunk/reactos/base/applications/winhelp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lex.yy.c (original) +++ trunk/reactos/base/applications/winhelp/lex.yy.c Wed Feb 27 14:55:59 2008 @@ -407,7 +407,13 @@ #define quote 1 #line 26 "macro.lex.l" +#include "config.h" #include <assert.h> + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #include "macro.h" #include "wine/debug.h" @@ -423,7 +429,7 @@ #define YY_INPUT(buf,result,max_size)\ if ((result = *macroptr ? 1 : 0)) buf[0] = *macroptr++; -#line 427 "lex.yy.c" +#line 433 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -574,10 +580,10 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 43 "macro.lex.l" - - -#line 581 "lex.yy.c" +#line 49 "macro.lex.l" + + +#line 587 "lex.yy.c" if ( yy_init ) { @@ -662,32 +668,32 @@ case 1: YY_RULE_SETUP -#line 45 "macro.lex.l" +#line 51 "macro.lex.l" yylval.integer = strtol(yytext, NULL, 10); return INTEGER; YY_BREAK case 2: YY_RULE_SETUP -#line 46 "macro.lex.l" +#line 52 "macro.lex.l" yylval.integer = strtol(yytext, NULL, 16); return INTEGER; YY_BREAK case 3: YY_RULE_SETUP -#line 48 "macro.lex.l" +#line 54 "macro.lex.l" return MACRO_Lookup(yytext, &yylval); YY_BREAK case 4: -#line 51 "macro.lex.l" +#line 57 "macro.lex.l" case 5: -#line 52 "macro.lex.l" +#line 58 "macro.lex.l" case 6: -#line 53 "macro.lex.l" +#line 59 "macro.lex.l" case 7: -#line 54 "macro.lex.l" +#line 60 "macro.lex.l" case 8: -#line 55 "macro.lex.l" +#line 61 "macro.lex.l" case 9: YY_RULE_SETUP -#line 55 "macro.lex.l" +#line 61 "macro.lex.l" { if (quote_stk_idx == 0 || (yytext[0] == '\"' && quote_stack[quote_stk_idx - 1] != '\"') || @@ -720,34 +726,34 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 85 "macro.lex.l" +#line 91 "macro.lex.l" *strptr++ = yytext[0]; YY_BREAK case 11: YY_RULE_SETUP -#line 86 "macro.lex.l" +#line 92 "macro.lex.l" *strptr++ = yytext[1]; YY_BREAK case YY_STATE_EOF(quote): -#line 87 "macro.lex.l" +#line 93 "macro.lex.l" return 0; YY_BREAK case 12: YY_RULE_SETUP -#line 89 "macro.lex.l" +#line 95 "macro.lex.l" YY_BREAK case 13: YY_RULE_SETUP -#line 90 "macro.lex.l" +#line 96 "macro.lex.l" return yytext[0]; YY_BREAK case 14: YY_RULE_SETUP -#line 91 "macro.lex.l" +#line 97 "macro.lex.l" ECHO; YY_BREAK -#line 751 "lex.yy.c" +#line 757 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1633,7 +1639,7 @@ return 0; } #endif -#line 91 "macro.lex.l" +#line 97 "macro.lex.l" #if 0 Modified: trunk/reactos/base/applications/winhelp/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/macro.lex.l (original) +++ trunk/reactos/base/applications/winhelp/macro.lex.l Wed Feb 27 14:55:59 2008 @@ -1,4 +1,4 @@ -%{ +%{ /* -*-C-*- */ /* * Help Viewer * @@ -23,7 +23,13 @@ %option nounput interactive 8bit %x quote %{ +#include "config.h" #include <assert.h> + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #include "macro.h" #include "wine/debug.h" Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc (original) +++ trunk/reactos/base/applications/wordpad/De.rc Wed Feb 27 14:55:59 2008 @@ -22,7 +22,7 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Neu\tStrg+N", ID_FILE_NEW + MENUITEM "&Neu...\tStrg+N", ID_FILE_NEW MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern &unter...", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc (original) +++ trunk/reactos/base/applications/wordpad/En.rc Wed Feb 27 14:55:59 2008 @@ -22,7 +22,7 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&New . . .\tCtrl+N", ID_FILE_NEW MENUITEM "&Open . . .\tCtrl+O", ID_FILE_OPEN MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE MENUITEM "Save &as . . .", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc Wed Feb 27 14:55:59 2008 @@ -22,7 +22,7 @@ BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Nouveau\tCtrl+N", ID_FILE_NEW + MENUITEM "&Nouveau...\tCtrl+N", ID_FILE_NEW MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc Wed Feb 27 14:55:59 2008 @@ -22,7 +22,7 @@ BEGIN POPUP "&Fájl" BEGIN - MENUITEM "&Új\tCtrl+N", ID_FILE_NEW + MENUITEM "&Új...\tCtrl+N", ID_FILE_NEW MENUITEM "&Megnyitás...\tCtrl+O", ID_FILE_OPEN MENUITEM "M&entés\tCtrl+S", ID_FILE_SAVE MENUITEM "Mentés má&sként...", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc Wed Feb 27 14:55:59 2008 @@ -24,7 +24,7 @@ BEGIN POPUP "ÆÄÀÏ(&F)" BEGIN - MENUITEM "»õ ÆÄÀÏ(&N)\tCtrl+N", ID_FILE_NEW + MENUITEM "»õ ÆÄÀÏ(&N)...\tCtrl+N", ID_FILE_NEW MENUITEM "¿±â(&O)...\tCtrl+O", ID_FILE_OPEN MENUITEM "ÀúÀå(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM "´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå(&A)...", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc Wed Feb 27 14:55:59 2008 @@ -22,7 +22,7 @@ BEGIN POPUP "&Bestand" BEGIN - MENUITEM "&Nieuw\tCtrl+N" ID_FILE_NEW + MENUITEM "&Nieuw...\tCtrl+N" ID_FILE_NEW MENUITEM "&Openen...\tCtrl+O", ID_FILE_OPEN MENUITEM "O&pslaan\tCtrl+S", ID_FILE_SAVE MENUITEM "Ops&laan als...", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc (original) +++ trunk/reactos/base/applications/wordpad/No.rc Wed Feb 27 14:55:59 2008 @@ -22,7 +22,7 @@ BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW + MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW MENUITEM "&Åpne . . .\tCtrl+O", ID_FILE_OPEN MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE MENUITEM "Lagre &som . . .", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc Wed Feb 27 14:55:59 2008 @@ -23,14 +23,14 @@ BEGIN POPUP "&Plik" BEGIN - MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW + MENUITEM "&Nowy...\tCtrl+N", ID_FILE_NEW MENUITEM "&Otwórz...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Zapisz\tCtrl+S", ID_FILE_SAVE MENUITEM "Z&apisz jako...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP + MENUITEM "&Drukuj...\tCtrl+P", ID_PRINT + MENUITEM "&Podgl¹d wydruku...", ID_PREVIEW + MENUITEM "&Ustawienia strony...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "Za&koñcz", ID_FILE_EXIT END @@ -45,9 +45,9 @@ MENUITEM "&Usuñ\tDel", ID_EDIT_CLEAR MENUITEM "&Zaznacz wszystko\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND - MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "Znaj&d...\tCrtl+F", ID_FIND + MENUITEM "Z&najd nastêpny\tF3", ID_FIND_NEXT + MENUITEM "Za&mieñ...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Tylko do &odczytu", ID_EDIT_READONLY MENUITEM "&Zmodifykowany", ID_EDIT_MODIFIED @@ -61,34 +61,34 @@ MENUITEM "&Pobie¿ tekst", ID_EDIT_GETTEXT END END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR - MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR - MENUITEM "&Ruler", ID_TOGGLE_RULER - MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES - END - POPUP "&Insert" - BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "Tab&s . . ." ID_TABSTOPS - POPUP "&T³o" + POPUP "Wido&k" + BEGIN + MENUITEM "Pasek &narzêdzi", ID_TOGGLE_TOOLBAR + MENUITEM "Pasek &formatu", ID_TOGGLE_FORMATBAR + MENUITEM "&Linijka", ID_TOGGLE_RULER + MENUITEM "Pasek &stanu", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opcje...", ID_VIEWPROPERTIES + END + POPUP "&Wstaw" + BEGIN + MENUITEM "&Data i godzina...", ID_DATETIME + END + POPUP "For&mat" + BEGIN + MENUITEM "&Czcionka...", ID_FONTSETTINGS + MENUITEM "&Wypunktowanie" ID_BULLET + MENUITEM "&Akapit..." ID_PARAFORMAT + MENUITEM "&Tabulatory..." ID_TABSTOPS + POPUP "T³&o" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 MENUITEM "&PostThat (¿ó³ty)\tCtrl+2", ID_BACK_2 END END - POPUP "&Help" - BEGIN - MENUITEM "&About Wine Wordpad" ID_ABOUT + POPUP "Pomo&c" + BEGIN + MENUITEM "Wine Wordpad - &informacje" ID_ABOUT END END @@ -100,63 +100,63 @@ MENUITEM "&Kopiuj", ID_EDIT_COPY MENUITEM "Wkl&ej", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "&Wypunktowanie" ID_BULLET + MENUITEM "&Akapit..." ID_PARAFORMAT END END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" +CAPTION "Data i godzina" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Dostêpne formaty",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 + PUSHBUTTON "&Anuluj",IDCANCEL,87,26,40,12 END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "New" +CAPTION "Nowy" FONT 10, "MS Sans Serif" BEGIN - LTEXT "New document type",0,3,2,100,15 + LTEXT "Typ nowego dokumentu",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 + PUSHBUTTON "&Anuluj",IDCANCEL,97,26,40,12 END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Paragraph format" +Caption "Format akapitu" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + GROUPBOX "Wciêcia", 0, 10, 10, 120, 68 + LTEXT "Z lewej", 0, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Z prawej", 0, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "Pierwszy wiersz", 0, 15, 55, 40, 19 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Wyrównanie", 0, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabs" -FONT 8, "MS SHell DLg" -BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 +Caption "Tabulatory" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Pozycje tabulatorów", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 + DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Usuñ", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 57, 15 + PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 57, 15 + PUSHBUTTON "Usuñ &wszystkie", ID_TAB_EMPTY, 137, 51, 57, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -164,14 +164,14 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 + GROUPBOX "Zawijanie wierszy", 0, 10, 10, 130, 85 + RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "Paski narzêdzi", 0, 150, 10, 120, 85 + CHECKBOX "Pasek &narzêdzi", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "Pasek &formatu", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Linijka", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "Pasek &stanu", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -185,36 +185,36 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_ALIGN_LEFT, "Left" - STRING_ALIGN_RIGHT, "Right" - STRING_ALIGN_CENTER, "Center" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Text document" - STRING_NEWFILE_TXT_UNICODE, "Unicode text document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Options" - STRING_VIEWPROPS_TEXT, "Text" - STRING_VIEWPROPS_RICHTEXT, "Rich text" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Print" - STRING_PREVIEW_NEXTPAGE, "Next page" - STRING_PREVIEW_PREVPAGE, "Previous page" - STRING_PREVIEW_CLOSE, "Close" + STRING_ALIGN_LEFT, "Do lewej" + STRING_ALIGN_RIGHT, "Do prawej" + STRING_ALIGN_CENTER, "Wyrodkowane" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Document sformatowany (RTF)" + STRING_NEWFILE_TXT, "Document tekstowy" + STRING_NEWFILE_TXT_UNICODE, "Document tekstowy Unicode" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Pliki drukarki (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Opcje" + STRING_VIEWPROPS_TEXT, "Tekst" + STRING_VIEWPROPS_RICHTEXT, "Tekst sformatowany" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "Drukuj" + STRING_PREVIEW_NEXTPAGE, "Nast. strona" + STRING_PREVIEW_PREVPAGE, "Poprz. strona" + STRING_PREVIEW_CLOSE, "Zamknij" END STRINGTABLE DISCARDABLE @@ -224,13 +224,13 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Zapisaæ zmiany w pliku '%s'?" + STRING_SEARCH_FINISHED, "Zakoñczono przeszukowanie dokumentu." + STRING_LOAD_RICHED_FAILED, "Nie uda³o siê za³adowaæ biblioteki systemowej RichEdit." + STRING_SAVE_LOSEFORMATTING, "Wybrano zapisanie dokumentu jako zwyk³y tekst, " \ + "w wyniku czego formatowanie zostanie utracone. " \ + "Czy na pewno chcesz to zrobiæ?" + STRING_INVALID_NUMBER, "Z³y format liczby" + STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenty typu OLE storage nie s¹ obs³ugiwane" +END Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc Wed Feb 27 14:55:59 2008 @@ -22,7 +22,7 @@ BEGIN POPUP "&Ôàéë" BEGIN - MENUITEM "Ñîçä&àòü\tCtrl+N", ID_FILE_NEW + MENUITEM "Ñîçä&àòü...\tCtrl+N",ID_FILE_NEW MENUITEM "&Îòêðûòü...\tCtrl+O",ID_FILE_OPEN MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc Wed Feb 27 14:55:59 2008 @@ -24,7 +24,7 @@ BEGIN POPUP "&Dosya" BEGIN - MENUITEM "&Yeni\tCtrl+N", ID_FILE_NEW + MENUITEM "&Yeni...\tCtrl+N", ID_FILE_NEW MENUITEM "&Aç...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE MENUITEM "&Farklý Kaydet...", ID_FILE_SAVEAS Removed: trunk/reactos/base/applications/wordpad/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/resource.h (original) +++ trunk/reactos/base/applications/wordpad/resource.h (removed) @@ -1,182 +1,0 @@ -/* - * Copyright 2004 by Krzysztof Foltman - * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define ID_FILE_EXIT 1000 -#define ID_FILE_OPEN 1001 -#define ID_FILE_SAVE 1002 -#define ID_FILE_NEW 1003 -#define ID_FILE_SAVEAS 1004 - -#define ID_FILE_RECENT1 1005 -#define ID_FILE_RECENT2 1006 -#define ID_FILE_RECENT3 1007 -#define ID_FILE_RECENT4 1008 -#define ID_FILE_RECENT_SEPARATOR 1009 - -#define ID_PRINT 1010 -#define ID_PREVIEW 1011 -#define ID_PRINTSETUP 1012 -#define ID_PRINT_QUICK 1013 - -#define ID_FIND 1014 -#define ID_FIND_NEXT 1015 -#define ID_REPLACE 1016 - -#define ID_PREVIEW_NEXTPAGE 1017 -#define ID_PREVIEW_PREVPAGE 1018 - -#define ID_ALIGN_LEFT 1100 -#define ID_ALIGN_CENTER 1101 -#define ID_ALIGN_RIGHT 1102 - -#define ID_BACK_1 1200 -#define ID_BACK_2 1201 - -#define ID_EDIT_SELECTALL 1300 -#define ID_EDIT_SELECTIONINFO 1301 -#define ID_EDIT_READONLY 1302 -#define ID_EDIT_MODIFIED 1303 -#define ID_EDIT_CHARFORMAT 1304 -#define ID_EDIT_PARAFORMAT 1305 -#define ID_EDIT_DEFCHARFORMAT 1306 -#define ID_EDIT_UNDO 1307 -#define ID_EDIT_REDO 1308 -#define ID_EDIT_GETTEXT 1309 -#define ID_EDIT_COPY 1310 -#define ID_EDIT_CUT 1311 -#define ID_EDIT_PASTE 1312 -#define ID_EDIT_CLEAR 1313 -#define ID_BULLET 1314 - -#define ID_FONTSETTINGS 1315 - -#define ID_FORMAT_BOLD 1400 -#define ID_FORMAT_ITALIC 1401 -#define ID_FORMAT_UNDERLINE 1402 - -#define ID_TOGGLE_TOOLBAR 1500 -#define ID_TOGGLE_FORMATBAR 1501 -#define ID_TOGGLE_STATUSBAR 1502 - -#define PREVIEW_BUTTONS 4 - -#define FILELIST_ENTRIES 4 -#define FILELIST_ENTRY_LENGTH 33 - -#define BANDID_TOOLBAR 2 -#define BANDID_FORMATBAR 3 -#define BANDID_RULER 0 -#define BANDID_STATUSBAR 1 -#define BANDID_FONTLIST 4 -#define BANDID_SIZELIST 5 - -#define BANDID_PREVIEW_BTN1 6 -#define BANDID_PREVIEW_BTN2 7 -#define BANDID_PREVIEW_BTN3 8 -#define BANDID_PREVIEW_BTN4 9 -#define BANDID_PREVIEW_BUFFER 10 - -#define ID_WORDWRAP_NONE 0 -#define ID_WORDWRAP_WINDOW 1 -#define ID_WORDWRAP_MARGIN 2 - -#define ID_NEWFILE_ABORT 100 - -#define ID_TAB_ADD 100 -#define ID_TAB_DEL 101 -#define ID_TAB_EMPTY 102 - -#define IDC_PAGEFMT_TB 100 -#define IDC_PAGEFMT_FB 101 -#define IDC_PAGEFMT_SB 102 -#define IDC_PAGEFMT_WW 103 -#define IDC_PAGEFMT_WM 104 -#define IDC_PAGEFMT_ID 105 - -#define ID_DATETIME 1600 -#define ID_PARAFORMAT 1601 -#define ID_TABSTOPS 1602 - -#define ID_ABOUT 1603 -#define ID_VIEWPROPERTIES 1604 - -#define IDC_STATUSBAR 2000 -#define IDC_EDITOR 2001 -#define IDC_TOOLBAR 2002 -#define IDC_FORMATBAR 2003 -#define IDC_REBAR 2004 -#define IDC_COMBO 2005 -#define IDC_DATETIME 2006 -#define IDC_NEWFILE 2007 -#define IDC_PARA_LEFT 2008 -#define IDC_PARA_RIGHT 2009 -#define IDC_PARA_FIRST 2010 -#define IDC_PARA_ALIGN 2011 -#define IDC_TABSTOPS 2012 -#define IDC_FONTLIST 2013 -#define IDC_SIZELIST 2014 - -#define IDD_DATETIME 2100 -#define IDD_NEWFILE 2101 -#define IDD_PARAFORMAT 2102 -#define IDD_TABSTOPS 2103 -#define IDD_FORMATOPTS 2104 - -#define IDM_POPUP 2200 - -#define IDB_TOOLBAR 100 -#define IDB_FORMATBAR 101 - -#define IDI_WORDPAD 102 -#define IDI_RTF 103 -#define IDI_WRI 104 -#define IDI_TXT 105 - -#define STRING_ALL_FILES 1400 -#define STRING_TEXT_FILES_TXT 1401 -#define STRING_TEXT_FILES_UNICODE_TXT 1402 -#define STRING_RICHTEXT_FILES_RTF 1403 - -#define STRING_NEWFILE_RICHTEXT 1404 -#define STRING_NEWFILE_TXT 1405 -#define STRING_NEWFILE_TXT_UNICODE 1406 - -#define STRING_ALIGN_LEFT 1407 -#define STRING_ALIGN_RIGHT 1408 -#define STRING_ALIGN_CENTER 1409 - -#define STRING_PRINTER_FILES_PRN 1410 - -#define STRING_VIEWPROPS_TITLE 1411 -#define STRING_VIEWPROPS_TEXT 1412 -#define STRING_VIEWPROPS_RICHTEXT 1413 - -#define STRING_PREVIEW_PRINT 1414 -#define STRING_PREVIEW_NEXTPAGE 1415 -#define STRING_PREVIEW_PREVPAGE 1416 -#define STRING_PREVIEW_CLOSE 1417 - -#define STRING_UNITS_CM 1418 - -#define STRING_DEFAULT_FILENAME 1700 -#define STRING_PROMPT_SAVE_CHANGES 1701 -#define STRING_SEARCH_FINISHED 1702 -#define STRING_LOAD_RICHED_FAILED 1703 -#define STRING_SAVE_LOSEFORMATTING 1704 -#define STRING_INVALID_NUMBER 1705

16 years, 10 months

[dreimer] 32503: Bug 3105: Italian resources update by Paolo Devoti - devotip@tiscali.it Bug 3106: Ukrainian translation update by Artem Reznikov - temarez@yandex.ru

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 27 14:29:17 2008 New Revision: 32503 URL: http://svn.reactos.org/svn/reactos?rev=32503&view=rev Log: Bug 3105: Italian resources update by Paolo Devoti - devotip(a)tiscali.it Bug 3106: Ukrainian translation update by Artem Reznikov - temarez(a)yandex.ru Added: trunk/reactos/dll/cpl/appwiz-new/lang/it-IT.rc (with props) Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Feb 27 14:29:17 2008 @@ -1669,11 +1669,11 @@ {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "Nuova (Non formattata)"}, {STRING_FORMATUNUSED, - "Unused"}, + "Non usata"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "Sconsciuta"}, {STRING_KB, "KB"}, {STRING_MB, Added: trunk/reactos/dll/cpl/appwiz-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/it… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/it-IT.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/it-IT.rc Wed Feb 27 14:29:17 2008 @@ -1,0 +1,199 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Rimozione", ID_APP_REMOVE + MENUITEM "&Modifica", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Installazione da rete" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Installazione...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&Il software seguente può essere installato automaticamente da ReactOS. Per installare un programma, selezionarlo nella lista e cliccare Installazione.", IDC_NETTEXT, 40, 6, 195, 32 + LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP + ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 +END + +IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Crea Collegamento" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Questo wizard aiuta a creare collegamenti a programmi, file, cartelle, o indirizzi internet.", -1, 97, 7, 195, 28 + LTEXT "&Digitare la posizione dell'elemento:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Sfoglia...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Premere avanti per continuare.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Selezione della cartella" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Selezionare una cartella dove collocare il collegamento:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "&Nuova cartella...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Selezione del titolo del programma" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Digitare il nome di questo collegamento:", -1, 100, 10, 194, 10 + EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Cliccare Fine per creare il collegamento.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Selezione dell'icona" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Selezionare un icona per i collegamento:", -1, 100, 8, 195, 10 + LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Installazione di un programma da floppy o CD-ROM" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 + ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 + LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 +END + +IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Esecuzione del programma di installazione" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 + LTEXT "&Apri:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Sfoglia...", IDC_LOCBROWSE, 234, 64, 60, 14 +END + +IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Modifica delle opzioni utente" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Potete rendere disponibile questo programm a tutti gli utenti.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Installazione", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Esecuzione", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Conclusione della installazione come amministratore" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Cliccando fine verranno ripristinate le mappature di \"ini\".", IDC_HEADTEXT, 98, 7, 196, 40 +END + +IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dopo l'installazione" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Premere avanti.", IDC_HEADTEXT, 98, 7, 197, 40 +END + +IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Esecuzione del programma di installazione" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Indicare la posizione del programma di disinstallazione.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Comando per il programma di disinstallazione:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Sfoglia...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Annulla", IDCANCEL, 184, 100, 60, 14 +END + +IDD_WARNING DIALOG 20, 20, 255, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Attenzione" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Ci sono altri utenti attivi su questo computer.", -1, 37, 8, 214, 10 + LTEXT "Se questo programma viene disinstallato mentre un altro utente lo sta usando il programma potrebbe non essere rimosso in modo completo.", -1, 37, 23, 212, 22 + LTEXT "Per rimuovere correttamente questo programma chiudere le sessioni degli altri utenti prima di continuare.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Cambia utente", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Continua", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Annulla", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Rimozione di collegamenti e cartelle" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Per rimuovere un elemento dal menu di avvio selezionarlo e premere Rimuovi.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Rimuovi", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Chiudi", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Aggiungere dopo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Potete scegliere data e ora in cui aggiungere il programma al computer. Per esempio potete schedulare che accada mentre siete lontano dal computer.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Aggiungere il programma dopo", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Non aggiungere il programma", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Annulla", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Installazione applicazioni" + IDS_CPLSYSTEMDESCRIPTION "Installazione di componenti di ReactOS o di applicazioni." + IDS_UNABLEOPEN_UNINSTKEY "Impossibile aprire la chiave di disinstallazione" + IDS_LIST_TITLE "Lista" + IDS_SIZE_TITLE "Dimensione (MB)" + IDS_LAST_USED "Ultimo usato" + IDS_PROGANDUPDATES "Programmi e aggiornamenti" + IDS_PROGRAMS_ONLY "Solo programmi" + IDS_UPDATES_ONLY "Solo aggiornamenti" + IDS_WELCOME_TITLE "Benvenuto all'assistente per la installazione o rimozione dei programmi" + IDS_WELCOME_MSG "Scegliere una categoria a sinistra o scegliere una applicazione nella lista per la rimozione o visualizzazione delle informazioni." + IDS_SEARCH_TEXT "Cerca nella lista..." + IDS_REMOVE_BTN "&Rimuovi" + IDS_MODIFY_BTN "&Modifica" + IDS_UNABLEREAD_UNINSTSTR "Impossibile leggere UninstallString. L'elemento non è valido o è stato creato da un installatore MSI." + IDS_INF_REG_OWNER "Proprietario registrato: " + IDS_INF_PRODUCT_ID "ID del prodotto: " + IDS_INF_PUBLISHER "Pubblicato da: " + IDS_INF_VERSION "Versione: " + IDS_INF_CONTACT "Contatti: " + IDS_INF_SUP_INFO "Informazioni per il supporto: " + IDS_INF_SUP_PHONE "Telefono per il supporto: " + IDS_INF_PRODUCT_UPD "Aggiornamenti del prodotto: " + IDS_INF_README "Leggimi: " + IDS_INF_COMMENTS "Commenti: " + IDS_NO_INFORMATION "Nessuna informazione su questo programma." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/uk… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc Wed Feb 27 14:29:17 2008 @@ -103,8 +103,8 @@ BEGIN CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT LTEXT "Öþ íîâó ïðîãðàìó ìîæíà çðîáèòè çàãàëüíîäîñòóïíîþ.", 1012, 101, 5, 194, 40 - AUTORADIOBUTTON "Install", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Execute", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP + AUTORADIOBUTTON "Óñòàíîâèòè", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Âèêîíàòè", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP END IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/rsrc.rc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Wed Feb 27 14:29:17 2008 @@ -6,6 +6,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

16 years, 10 months

[dreimer] 32502: Bug 3105: Italian resources update by Paolo Devoti - devotip@tiscali.it Bug 3106: Ukrainian translation update by Artem Reznikov - temarez@yandex.ru

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Feb 27 14:28:34 2008 New Revision: 32502 URL: http://svn.reactos.org/svn/reactos?rev=32502&view=rev Log: Bug 3105: Italian resources update by Paolo Devoti - devotip(a)tiscali.it Bug 3106: Ukrainian translation update by Artem Reznikov - temarez(a)yandex.ru Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Wed Feb 27 14:28:34 2008 @@ -47,12 +47,12 @@ MENUITEM "Â&èõ³ä\tAlt+F4", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "&Ïðàâêà" BEGIN - MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY - MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Êîï³þâàòè\tCtrl+C", ID_EDIT_COPY + MENUITEM "Âñòàâèòè\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + MENUITEM "Ðåäàãóâàòè ñèìâîë...", ID_EDIT_GLYPH END POPUP "&Â³êíî" @@ -89,6 +89,6 @@ IDS_TOOLTIP_OPEN, "Â³äêðèòè" IDS_TOOLTIP_SAVE, "Çáåðåãòè" IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàãóâàòè ñèìâîë" - IDS_TOOLTIP_COPY, "Copy" - IDS_TOOLTIP_PASTE, "Paste" + IDS_TOOLTIP_COPY, "Êîï³þâàòè" + IDS_TOOLTIP_PASTE, "Âñòàâèòè" END

16 years, 10 months

[cwittich] 32501: remove duplicated code

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 27 13:54:25 2008 New Revision: 32501 URL: http://svn.reactos.org/svn/reactos?rev=32501&view=rev Log: remove duplicated code Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.c (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c Wed Feb 27 13:54:25 2008 @@ -35,10 +35,7 @@ LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM); LRESULT CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM); LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM); -VOID EnableConnectMenuItem(BOOL Enable); -VOID EnableDisconnectMenuItem(BOOL Enable); -VOID EnableStartCaptureMenuItem(BOOL Enable); -VOID EnableStopCaptureMenuItem(BOOL Enable); +VOID EnableFileMenuItemByID(UINT Id, BOOL Enable); VOID CheckLocalEchoMenuItem(BOOL Checked); VOID Rs232Thread(VOID* Parameter); @@ -231,8 +228,8 @@ if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, (DLGPROC)ConnectionDialogProc) == IDOK) { bConnected = TRUE; - EnableDisconnectMenuItem(TRUE); - EnableConnectMenuItem(FALSE); + EnableFileMenuItemByID(IDM_FILE_DISCONNECT, TRUE); + EnableFileMenuItemByID(IDM_FILE_CONNECT, FALSE); _beginthread(Rs232Thread, 0, NULL); } } @@ -241,8 +238,8 @@ if (bConnected) { bConnected = FALSE; - EnableDisconnectMenuItem(FALSE); - EnableConnectMenuItem(TRUE); + EnableFileMenuItemByID(IDM_FILE_DISCONNECT, FALSE); + EnableFileMenuItemByID(IDM_FILE_CONNECT, TRUE); } else { @@ -253,8 +250,8 @@ if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK) { bCapturing = TRUE; - EnableStopCaptureMenuItem(TRUE); - EnableStartCaptureMenuItem(FALSE); + EnableFileMenuItemByID(IDM_FILE_STOPCAPTURE, TRUE); + EnableFileMenuItemByID(IDM_FILE_STARTCAPTURE, FALSE); hCaptureFile = CreateFile(strCaptureFileName, FILE_APPEND_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); } break; @@ -262,8 +259,8 @@ if (bCapturing) { bCapturing = FALSE; - EnableStopCaptureMenuItem(FALSE); - EnableStartCaptureMenuItem(TRUE); + EnableFileMenuItemByID(IDM_FILE_STOPCAPTURE, FALSE); + EnableFileMenuItemByID(IDM_FILE_STARTCAPTURE, TRUE); CloseHandle(hCaptureFile); hCaptureFile = NULL; } @@ -419,94 +416,24 @@ return FALSE; } -VOID EnableConnectMenuItem(BOOL Enable) +VOID EnableFileMenuItemByID(UINT Id, BOOL Enable) { HMENU hMenuBar; HMENU hFileMenu; hMenuBar = GetMenu(hMainWnd); hFileMenu = GetSubMenu(hMenuBar, 0); - - if (Enable) - { - EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED); - } -} - -VOID EnableDisconnectMenuItem(BOOL Enable) + EnableMenuItem(hFileMenu, Id, MF_BYCOMMAND|(Enable ? MF_ENABLED : MF_GRAYED)); +} + +VOID CheckLocalEchoMenuItem(BOOL Checked) { HMENU hMenuBar; HMENU hFileMenu; hMenuBar = GetMenu(hMainWnd); hFileMenu = GetSubMenu(hMenuBar, 0); - - if (Enable) - { - EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED); - } -} - -VOID EnableStartCaptureMenuItem(BOOL Enable) -{ - HMENU hMenuBar; - HMENU hFileMenu; - - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); - - if (Enable) - { - EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED); - } -} - -VOID EnableStopCaptureMenuItem(BOOL Enable) -{ - HMENU hMenuBar; - HMENU hFileMenu; - - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); - - if (Enable) - { - EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED); - } -} - -VOID CheckLocalEchoMenuItem(BOOL Checked) -{ - HMENU hMenuBar; - HMENU hFileMenu; - - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); - - if (Checked) - { - CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED); - } - else - { - CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED); - } + CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|(Checked ? MF_CHECKED : MF_UNCHECKED)); } VOID Rs232Thread(VOID* Parameter)

16 years, 10 months

[cwittich] 32500: move variable declarations to top reduce flickering

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Feb 27 13:53:59 2008 New Revision: 32500 URL: http://svn.reactos.org/svn/reactos?rev=32500&view=rev Log: move variable declarations to top reduce flickering Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.c Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.c Wed Feb 27 13:53:59 2008 @@ -20,6 +20,10 @@ HIMAGELIST hImageAppList; // Image list for programs list BOOL bAscending = TRUE; // Sorting programs list +HDC BackbufferHdc = NULL; +HBITMAP BackbufferBmp = NULL; + + VOID ShowMessage(WCHAR* title, WCHAR* message) { @@ -119,6 +123,7 @@ HIMAGELIST hImageList; WCHAR szBuf[1024]; int Index[2]; + TV_INSERTSTRUCTW Insert; hImageList = ImageList_Create(16, 16, ILC_COLORDDB, 1, 1); SendMessageW(hActList, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hImageList); @@ -127,8 +132,6 @@ Index[1] = ImageList_Add(hImageList, LoadBitmap(hApplet, MAKEINTRESOURCE(IDB_ICON)), NULL); // Insert items to Actions List - TV_INSERTSTRUCTW Insert; - ZeroMemory(&Insert, sizeof(TV_INSERTSTRUCT)); Insert.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; Insert.hInsertAfter = TVI_LAST; @@ -273,6 +276,7 @@ HICON hIcon = NULL; LV_ITEM listItem; WCHAR IconPath[MAX_PATH], AppSize[256], LastUsed[256]; + int iIndex; GetARPInfo(AppName, IconPath, AppSize, LastUsed); @@ -295,7 +299,6 @@ listItem.lParam = (LPARAM)hSubKey; listItem.iItem = (int)ItemIndex; listItem.iImage = index; - int iIndex; iIndex = ListView_InsertItem(hAppList, &listItem); ListView_SetItemText(hAppList, iIndex, 1, LastUsed); ListView_SetItemText(hAppList, iIndex, 2, AppSize); @@ -322,13 +325,12 @@ BOOL bIsUpdate = FALSE; BOOL bIsSystemComponent = FALSE; INT ItemIndex = 0; + DEVMODE pDevMode; + int ColorDepth; (VOID) ImageList_Destroy(hImageAppList); (VOID) ListView_DeleteAllItems(hAppList); - - DEVMODE pDevMode; - int ColorDepth; - + pDevMode.dmSize = sizeof(DEVMODE); pDevMode.dmDriverExtra = 0; EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &pDevMode); @@ -421,6 +423,8 @@ { HKEY hKey; INT nIndex; + DWORD dwSize; + DWORD dwType = REG_SZ; nIndex = (INT)SendMessage(hAppList,LVM_GETNEXTITEM,-1,LVNI_FOCUSED); if (nIndex != -1) @@ -433,7 +437,6 @@ (VOID) ListView_GetItem(hAppList,&item); hKey = (HKEY)item.lParam; - DWORD dwSize, dwType = REG_SZ; if (RegQueryValueEx(hKey, lpKeyName, NULL, &dwType, (LPBYTE)lpString, &dwSize) == ERROR_SUCCESS) { @@ -689,10 +692,7 @@ Size2 = _wtoi(szItem2); if (Size1 < Size2) { - if(bAscending == TRUE) - return -1; - else - return 1; + return (bAscending ? -1 : 1); } else if (Size1 == Size2) { @@ -700,10 +700,7 @@ } else if (Size1 > Size2) { - if(bAscending == TRUE) - return 1; - else - return -1; + return (bAscending ? 1 : -1); } } } @@ -723,10 +720,7 @@ dwSize = sizeof(APPWIZSETTINGS); if (RegQueryValueEx(hKey, L"Settings", NULL, NULL, (LPBYTE)&AppWizSettings, &dwSize) == ERROR_SUCCESS) { - if (AppWizSettings.Size == sizeof(APPWIZSETTINGS)) - Ret = TRUE; - else - Ret = FALSE; + Ret = (AppWizSettings.Size == sizeof(APPWIZSETTINGS)); } else Ret = FALSE; } @@ -746,10 +740,7 @@ REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { AppWizSettings.Size = sizeof(APPWIZSETTINGS); - if (RegSetValueEx(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&AppWizSettings, sizeof(APPWIZSETTINGS)) == ERROR_SUCCESS) - Ret = TRUE; - else - Ret = FALSE; + Ret = (RegSetValueEx(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&AppWizSettings, sizeof(APPWIZSETTINGS)) == ERROR_SUCCESS); } else Ret = FALSE; @@ -757,10 +748,31 @@ return Ret; } +static void UpdateBitmap(HWND hWnd, RECT WndRect, RECT DescriptionRect) +{ + HDC hdc = GetDC(hWnd); + + if (!BackbufferHdc) + BackbufferHdc = CreateCompatibleDC(hdc); + + if (BackbufferBmp) + DeleteObject(BackbufferBmp); + + BackbufferBmp = CreateCompatibleBitmap(hdc, WndRect.right, WndRect.bottom); + + SelectObject(BackbufferHdc, BackbufferBmp); + FillRect(BackbufferHdc, &WndRect, (HBRUSH)COLOR_APPWORKSPACE); + DrawIconEx(BackbufferHdc, 153, 1, hSearchIcon, 24, 24, 0, NULL, DI_NORMAL|DI_COMPAT); + DrawDescription(BackbufferHdc, DescriptionRect); + + ReleaseDC(hWnd, hdc); +} + static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static RECT DescriptionRect; + static RECT AppRect; WCHAR szBuf[1024]; switch (Message) @@ -824,16 +836,7 @@ { PAINTSTRUCT ps; HDC hdc = BeginPaint(hwnd, &ps); - HDC BackbufferHdc = CreateCompatibleDC(hdc); - HBITMAP BackbufferBmp = CreateCompatibleBitmap(hdc, ps.rcPaint.right, ps.rcPaint.bottom); - - SelectObject(BackbufferHdc, BackbufferBmp); - FillRect(BackbufferHdc, &ps.rcPaint, (HBRUSH)COLOR_APPWORKSPACE); - DrawIconEx(BackbufferHdc, 153, 1, hSearchIcon, 24, 24, 0, NULL, DI_NORMAL|DI_COMPAT); - DrawDescription(BackbufferHdc, DescriptionRect); BitBlt(hdc, 0, 0, ps.rcPaint.right, ps.rcPaint.bottom, BackbufferHdc, 0, 0, SRCCOPY); - DeleteObject(BackbufferBmp); - DeleteDC(BackbufferHdc); EndPaint(hwnd, &ps); } break; @@ -865,6 +868,8 @@ EnableWindow(hModifyBtn, TRUE); } ShowAppInfo(); + UpdateBitmap(hwnd, AppRect, DescriptionRect); + InvalidateRect(hwnd, &DescriptionRect, FALSE); } break; case NM_DBLCLK: @@ -879,16 +884,8 @@ case LVN_COLUMNCLICK: { LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - (VOID) ListView_SortItems(hAppList, CompareFunc, pnmv->iSubItem); - if (bAscending == TRUE) - { - bAscending = FALSE; - } - else - { - bAscending = TRUE; - } + bAscending = !bAscending; } break; } @@ -906,6 +903,10 @@ break; case WM_SIZE: { + RECT Rect = {1, HIWORD(lParam)-178, LOWORD(lParam)-1, HIWORD(lParam)-1}; + SetRect(&AppRect, 0, 0, LOWORD(lParam)-1, HIWORD(lParam)-1); + DescriptionRect = Rect; + // Actions list ResizeControl(hActList, 0, 1, 150, HIWORD(lParam)-180); @@ -914,9 +915,6 @@ // Search Edit ResizeControl(hSearch, 180, 1, LOWORD(lParam), 25); - - RECT Rect = {1, HIWORD(lParam)-178, LOWORD(lParam)-1, HIWORD(lParam)-1}; - DescriptionRect = Rect; // Buttons MoveWindow(hRemoveBtn, LOWORD(lParam)-105, HIWORD(lParam)-30, 100, 25, TRUE); // Remove button @@ -926,6 +924,8 @@ // Update title and info ShowAppInfo(); + UpdateBitmap(hwnd, AppRect, DescriptionRect); + InvalidateRect(hwnd, &DescriptionRect, FALSE); } break; case WM_ACTIVATEAPP: @@ -949,12 +949,13 @@ AppWizSettings.Top = wp.rcNormalPosition.top; AppWizSettings.Right = wp.rcNormalPosition.right; AppWizSettings.Bottom = wp.rcNormalPosition.bottom; - if (IsZoomed(hMainWnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)) - AppWizSettings.Maximized = TRUE; - else - AppWizSettings.Maximized = FALSE; + AppWizSettings.Maximized = (IsZoomed(hMainWnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)); SaveSettings(); // Destroy all and quit + if (BackbufferHdc) + DeleteDC(BackbufferHdc); + if (BackbufferBmp) + DeleteObject(BackbufferBmp); DeleteObject(hMainFont); DeleteObject(hSearchIcon); PostQuitMessage(0);

16 years, 10 months

[greatlrd] 32499: implmented follow callbacks in gdi32 DvpGetVideoPortBandwidth, DvpColorControl, DvpGetVideoSignalStatus, DvpGetVideoPortFlipStatus, DvpCanCreateVideoPort, DvpWaitForVideoPortSync, DvpUpdateVideoPort

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Feb 27 04:36:56 2008 New Revision: 32499 URL: http://svn.reactos.org/svn/reactos?rev=32499&view=rev Log: implmented follow callbacks in gdi32 DvpGetVideoPortBandwidth, DvpColorControl, DvpGetVideoSignalStatus, DvpGetVideoPortFlipStatus, DvpCanCreateVideoPort, DvpWaitForVideoPortSync, DvpUpdateVideoPort Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Wed Feb 27 04:36:56 2008 @@ -29,7 +29,9 @@ /* CALLBACKS *****************************************************************/ /* - * Dd Surface Callbacks + * @implemented + * + * DdAddAttachedSurface */ DWORD WINAPI @@ -53,7 +55,10 @@ HANDLE Surface = 0; /* Use the right surface */ - if (Blt->lpDDSrcSurface) Surface = (HANDLE)Blt->lpDDSrcSurface->hDDSurface; + if (Blt->lpDDSrcSurface) + { + Surface = (HANDLE)Blt->lpDDSrcSurface->hDDSurface; + } /* Call win32k */ return NtGdiDdBlt((HANDLE)Blt->lpDDDestSurface->hDDSurface, Surface, (PDD_BLTDATA)Blt); @@ -269,6 +274,7 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurface); } +/* TODO : finish all fixme */ DWORD WINAPI DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) @@ -528,6 +534,143 @@ (PDD_FLIPVPORTDATA) pDvdPortFlip); } +/* + * @implemented + * + * DvpGetVideoPortBandwidth + */ +DWORD +WINAPI +DvpGetVideoPortBandwidth(LPDDHAL_GETVPORTBANDWIDTHDATA pDvdPortBandWidth) +{ + return NtGdiDvpGetVideoPortBandwidth(pDvdPortBandWidth->lpVideoPort->hDDVideoPort, (PDD_GETVPORTBANDWIDTHDATA)pDvdPortBandWidth); +} + +/* + * @implemented + * + * DvpColorControl + */ +DWORD +WINAPI +DvpColorControl(LPDDHAL_VPORTCOLORDATA pDvdPortColorControl) +{ + return NtGdiDvpColorControl(pDvdPortColorControl->lpVideoPort->hDDVideoPort, (PDD_VPORTCOLORDATA) pDvdPortColorControl); +} + +/* + * @implemented + * + * DvpGetVideoSignalStatus + */ +DWORD +WINAPI +DvpGetVideoSignalStatus(LPDDHAL_GETVPORTSIGNALDATA pDvdPortVideoSignalStatus) +{ + return NtGdiDvpGetVideoSignalStatus(pDvdPortVideoSignalStatus->lpVideoPort->hDDVideoPort, (PDD_GETVPORTSIGNALDATA) pDvdPortVideoSignalStatus); +} + +/* + * @implemented + * + * DvpGetVideoPortFlipStatus + */ +DWORD +WINAPI +DvpGetVideoPortFlipStatus(LPDDHAL_GETVPORTFLIPSTATUSDATA pDvdPortVideoPortFlipStatus) +{ + return NtGdiDvpGetVideoPortFlipStatus(GetDdHandle(pDvdPortVideoPortFlipStatus->lpDD->lpGbl->hDD), (PDD_GETVPORTFLIPSTATUSDATA) pDvdPortVideoPortFlipStatus); + +} + +/* + * @implemented + * + * DvpCanCreateVideoPort + */ +DWORD +WINAPI +DvpCanCreateVideoPort(LPDDHAL_CANCREATEVPORTDATA pDvdCanCreateVideoPort) +{ + return NtGdiDvpCanCreateVideoPort(GetDdHandle(pDvdCanCreateVideoPort->lpDD->lpGbl->hDD), (PDD_CANCREATEVPORTDATA) pDvdCanCreateVideoPort); +} +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpWaitForVideoPortSync(LPDDHAL_WAITFORVPORTSYNCDATA pDvdWaitForVideoPortSync) +{ + return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoPort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); +} + +/* + * @implemented + * + * DvpUpdateVideoPort + */ +DWORD +WINAPI +DvpUpdateVideoPort(LPDDHAL_UPDATEVPORTDATA pDvdUpdateVideoPort) +{ + /* + * Windows XP limit to max 10 handles of videoport surface and Vbi + * ReactOS doing same to keep compatible, if it is more that 10 + * videoport surface or vbi the stack will be curpted in windows xp + * ReactOS safe guard againts that + * + */ + + HANDLE phSurfaceVideo[10]; + HANDLE phSurfaceVbi[10]; + + if (pDvdUpdateVideoPort->dwFlags != DDRAWI_VPORTSTOP) + { + DWORD dwNumAutoflip; + DWORD dwNumVBIAutoflip; + + /* Take copy of lplpDDSurface for the handle value will be modify in dxg */ + dwNumAutoflip = pDvdUpdateVideoPort->dwNumAutoflip; + if ((dwNumAutoflip == 0) && + (pDvdUpdateVideoPort->lplpDDSurface == 0)) + { + dwNumAutoflip++; + } + + if (dwNumAutoflip != 0) + { + if (dwNumAutoflip>10) + { + dwNumAutoflip = 10; + } + memcpy(phSurfaceVideo,pDvdUpdateVideoPort->lplpDDSurface,dwNumAutoflip*sizeof(HANDLE)); + } + + /* Take copy of lplpDDVBISurface for the handle value will be modify in dxg */ + dwNumVBIAutoflip = pDvdUpdateVideoPort->dwNumVBIAutoflip; + if ( (dwNumVBIAutoflip == 0) && + (pDvdUpdateVideoPort->lplpDDVBISurface == 0) ) + { + dwNumVBIAutoflip++; + } + + if (dwNumVBIAutoflip != 0) + { + if (dwNumVBIAutoflip>10) + { + dwNumVBIAutoflip = 10; + } + memcpy(phSurfaceVbi,pDvdUpdateVideoPort->lplpDDVBISurface,dwNumVBIAutoflip*sizeof(HANDLE)); + } + } + + /* Call Win32k */ + return NtGdiDvpUpdateVideoPort(pDvdUpdateVideoPort->lpVideoPort->hDDVideoPort,phSurfaceVideo,phSurfaceVbi, (PDD_UPDATEVPORTDATA)pDvdUpdateVideoPort); +} + +/* TODO */ DWORD WINAPI @@ -566,7 +709,7 @@ pUserDvdPort->dwSize = DDVIDEOPORTCALLBACKSSIZE; pUserDvdPort->dwFlags = (pDvdPortInfo.dwFlags & ~(DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | - DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) | + DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE )) | (DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE); @@ -574,16 +717,16 @@ pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) DvpCreateVideoPort; pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) DvpFlipVideoPort; pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) DvpDestroyVideoPort; - pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) NULL; // FIXME : DvpUpdateVideoPort + pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) DvpUpdateVideoPort; if (pDvdPort.CanCreateVideoPort) { - pUserDvdPort->CanCreateVideoPort = (LPDDHALVPORTCB_CANCREATEVIDEOPORT) NULL; // FIXME : DvpCanCreateVideoPort + pUserDvdPort->CanCreateVideoPort = (LPDDHALVPORTCB_CANCREATEVIDEOPORT) DvpCanCreateVideoPort; } if (pDvdPort.GetVideoPortBandwidth) { - pUserDvdPort->GetVideoPortBandwidth = (LPDDHALVPORTCB_GETBANDWIDTH) NULL; // FIXME : DvpGetVideoPortBandwidth + pUserDvdPort->GetVideoPortBandwidth = (LPDDHALVPORTCB_GETBANDWIDTH) DvpGetVideoPortBandwidth; } if (pDvdPort.GetVideoPortInputFormats) @@ -613,23 +756,22 @@ if (pDvdPort.GetVideoPortFlipStatus) { - pUserDvdPort->GetVideoPortFlipStatus = (LPDDHALVPORTCB_GETFLIPSTATUS) NULL; // FIXME : DvpGetVideoPortFlipStatus + pUserDvdPort->GetVideoPortFlipStatus = (LPDDHALVPORTCB_GETFLIPSTATUS) DvpGetVideoPortFlipStatus; } if (pDvdPort.WaitForVideoPortSync) { - /* Note Windows XP does not have a user mode version of WaitForVideoPortSync */ - pUserDvdPort->WaitForVideoPortSync = (LPDDHALVPORTCB_WAITFORSYNC) NULL; + pUserDvdPort->WaitForVideoPortSync = (LPDDHALVPORTCB_WAITFORSYNC) DvpWaitForVideoPortSync; } if (pDvdPort.GetVideoSignalStatus) { - pUserDvdPort->GetVideoSignalStatus = (LPDDHALVPORTCB_GETSIGNALSTATUS) NULL; // FIXME : DvpGetVideoSignalStatus + pUserDvdPort->GetVideoSignalStatus = (LPDDHALVPORTCB_GETSIGNALSTATUS) DvpGetVideoSignalStatus; } if (pDvdPort.ColorControl) { - pUserDvdPort->ColorControl = (LPDDHALVPORTCB_COLORCONTROL) NULL; // FIXME : DvpColorControl + pUserDvdPort->ColorControl = (LPDDHALVPORTCB_COLORCONTROL) DvpColorControl; } /* Windows XP never repot back the true return value, @@ -641,8 +783,6 @@ return retValue; } - /* FIXME adding rest of the GUID */ - /* FIXME not supported yet */ return 0; } @@ -693,6 +833,7 @@ } +/* TODO : finish all fixme */ DWORD WINAPI DdCreateD3DBuffer(LPDDHAL_CREATESURFACEDATA pCreateSurface) @@ -1453,4 +1594,3 @@ -

16 years, 10 months

← Newer
1
2
3
4
5
6
7
...
46
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 February 2008