Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32421: - Fix dxg's includes.
by fireball＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: fireball Date: Tue Feb 19 20:18:18 2008 New Revision: 32421 URL: http://svn.reactos.org/svn/reactos?rev=32421&view=rev Log: - Fix dxg's includes. Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild trunk/reactos/drivers/directx/dxg/dxg_int.h Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg.rb… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg.rbuild (original) +++ trunk/reactos/drivers/directx/dxg/dxg.rbuild Tue Feb 19 20:18:18 2008 @@ -1,10 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="dxg" type="kernelmodedriver" -installbase="system32/drivers" installname="dxg.sys"> +<module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys"> <importlibrary definition="dxg.def" /> <include base="dxg">.</include> - <define name="__USE_W32API" /> + <include base="dxg">include</include> + <include base="ReactOS">subsystems/win32/win32k/include</include> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x600</define> <library>dxgthk</library> <library>ntoskrnl</library> <file>main.c</file> Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h Tue Feb 19 20:18:18 2008 @@ -6,6 +6,7 @@ #include <ddk/tvout.h> #include <ndk/ntndk.h> +/* Win32 Headers */ #define WINBASEAPI #define STARTF_USESIZE 2 #define STARTF_USEPOSITION 4 @@ -21,13 +22,19 @@ #include <dde.h> #include <wincon.h> -#include <reactos/drivers/directx/directxint.h> +/* Public Win32K Headers */ +#include <win32k/ntusrtyp.h> +#include <win32k/ntuser.h> +#include <win32k/ntgdityp.h> +#include <win32k/ntgdihdl.h> +#include <win32.h> +#include <gdiobj.h> +#include <dc.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <drivers/directx/directxint.h> -#include <reactos/drivers/directx/dxg.h> -#include <reactos/drivers/directx/dxeng.h> +#include <drivers/directx/dxg.h> +#include <drivers/directx/dxeng.h> #include "tags.h"

1 0

[dreimer] 32420: Bug 3089: Ukrainian translation update by Artem Reznikov - temarez@yandex.ru
by dreimer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dreimer Date: Tue Feb 19 18:43:41 2008 New Revision: 32420 URL: http://svn.reactos.org/svn/reactos?rev=32420&view=rev Log: Bug 3089: Ukrainian translation update by Artem Reznikov - temarez(a)yandex.ru Added: trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Added: 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 (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc Tue Feb 19 18:43:41 2008 @@ -1,0 +1,207 @@ +/* + * PROJECT: ReactOS Software Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/appwiz-new/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for appwiz + * PROGRAMMERS: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Âèäàëèòè", ID_APP_REMOVE + MENUITEM "&Çì³íèòè", 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 "Ìåðåæíà óñòàíîâêà" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Óñ&òàíîâèòè...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "Íèæ÷åíàâåäåí³ &ïðîãðàìè ìîæóòü áóòè óñòàíîâëåí³ àâòîìàòè÷íî. Ùîá óñòàíîâèòè ïðîãðàìó, âèáåð³òü ¿¿ ç³ ñïèñêó é íàòèñí³òü êíîïêó ""Óñòàíîâèòè"".", 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 "Ñòâîðåííÿ ÿðëèêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Öåé ìàéñòåð äîïîìàãàº ñòâîðèòè ÿðëèê, ÿêèé óêàçóº íà ëîêàëüí³ àáî ìåðåæí³ ïðîãðàìè, ôàéëè, ïàïêè, êîìï'þòåðè àáî àäðåñè â ²íòåðíåò³.", -1, 97, 7, 195, 28 + LTEXT "&Óêàæ³òü ðîçòàøóâàííÿ îá'ºêòà:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "Î&ãëÿä...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Ùîá ïðîäîâæèòè óñòàíîâêó, íàòèñí³òü êíîïêó ""Äàë³"".", -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 "Âèá³ð ïàïêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Âèáåð³òü ïàïêó, äå áóäå çíàõîäèòèñÿ ÿðëèê:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "&Ñòâîðèòè ïàïêó...", 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 "Âèá³ð íàçâè ïðîãðàìè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ââåä³òü ³ì'ÿ ÿðëèêà:", -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 "Ùîá ñòâîðèòè ÿðëèê, íàòèñí³òü êíîïêó ""Ãîòîâî"".", -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 "Âèá³ð çíà÷êà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Âèáåð³òü çíà÷îê äëÿ ïðîãðàìè:", -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 "Óñòàíîâêà ïðîãðàìè ç äèñêåò àáî êîìïàêò-äèñêà" +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 "Çàïóñê ïðîãðàìè óñòàíîâêè" +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 "&Â³äêðèòè:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "Î&ãëÿä...", 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 "Êîðèñòóâàöüêà íàñòðîéêà" +FONT 8, "MS Shell Dlg" +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 +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàâåðøåííÿ àäì³í³ñòðàòèâíî¿ óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ïðè íàòèñíåíí³ êíîïêè ""Ãîòîâî"" â³äíîâëþºòüñÿ â³äîáðàæåííÿ 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 "Ï³ñëÿ óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Íàòèñí³òü êíîïêó ""Äàë³"".", 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 "Çàïóñê ïðîãðàìè óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Óêàæ³òü ðîçòàøóâàííÿ ïðîãðàìè ñêàñóâàííÿ óñòàíîâêè.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Êîìàíäíèé ðÿäîê ïðîãðàìè ñêàñóâàííÿ óñòàíîâêè:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "Î&ãëÿä...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Ñêàñóâàòè", 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 "Ïîïåðåäæåííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Äî öüîãî êîìï'þòåðà ââ³éøëè ³íø³ êîðèñòóâà÷³.", -1, 37, 8, 214, 10 + LTEXT "ßêùî âè âèäàëÿºòå ïðîãðàìó â òîé ÷àñ, êîëè ç íåþ ïðàöþº ³íøèé êîðèñòóâà÷, öÿ ïðîãðàìà ìîæå áóòè âèäàëåíà íå ïîâí³ñòþ.", -1, 37, 23, 212, 22 + LTEXT "Ùîá íàëåæíèì ÷èíîì çì³íèòè àáî âèäàëèòè òàêó ïðîãðàìó, ñë³ä ïåðåêëþ÷èòèñÿ é çàê³í÷èòè ðîáîòó âñ³õ ³íøèõ êîðèñòóâà÷³â.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Çì³íèòè êîðèñòóâà÷à", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Ïðîäîâæèòè", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Ñêàñóâàòè", 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 "Âèäàëåííÿ ÿðëèê³â ³ ïàïîê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ùî&á âèäàëèòè åëåìåíò ³ç ìåíþ ""Ïóñê"", âèáåð³òü éîãî é íàòèñí³òü êíîïêó ""Âèäàëèòè"".", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "Â&èäàëèòè", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Çàêðèòè", 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 "Â³äêëàäåíå äîäàâàííÿ ïðîãðàìè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìîæíà âèáðàòè äàòó é ÷àñ äîäàâàííÿ ö³º¿ ïðîãðàìè äî êîìï'þòåðà. Íàïðèêëàä, ìîæíà çàïëàíóâàòè, ùîá öå â³äáóëîñÿ â òîé ÷àñ, êîëè âè íå áóäåòå ïðàöþâàòè ç êîìï'þòåðîì.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "Äîäàòè &ïðîãðàìó ï³çí³øå", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Íå äîäàâàòè ïðîãðàìó", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Óñòàíîâêà é âèäàëåííÿ ïðîãðàì" + IDS_CPLSYSTEMDESCRIPTION "Óñòàíîâêà é âèäàëåííÿ ïðîãðàì ³ êîìïîíåíò³â ReactOS." + IDS_UNABLEOPEN_UNINSTKEY "Íå âäàëîñÿ â³äêðèòè êëþ÷ Uninstall" + IDS_LIST_TITLE "Ñïèñîê" + IDS_SIZE_TITLE "Ðîçì³ð (ÌÁ)" + IDS_LAST_USED "Îñòàííº âèêîðèñòàííÿ" + IDS_PROGANDUPDATES "Ïðîãðàìè ³ îíîâëåííÿ" + IDS_PROGRAMS_ONLY "Ò³ëüêè ïðîãðàìè" + IDS_UPDATES_ONLY "Ò³ëüêè îíîâëåííÿ" + IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî äî Àñèñòåíòà óñòàíîâêè ³ âèäàëåííÿ ïðîãðàì" + IDS_WELCOME_MSG "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà àáî âèáèðàþòü äîäàòîê â ñïèñêó äëÿ âèäàëåííÿ àáî ïðîãëÿäàííÿ ³íôîðìàö³¿." + IDS_SEARCH_TEXT "Ïîøóê â ñïèñêó..." + IDS_REMOVE_BTN "&Âèäàëèòè" + IDS_MODIFY_BTN "&Çì³íèòè" + IDS_UNABLEREAD_UNINSTSTR "Íå âäàëîñÿ ïðî÷èòàòè UninstallString. Öå çíà÷åííÿ íåâ³ðíå àáî ñòâîðåíî MSI-³íñòàëÿòîðîì." + IDS_INF_REG_OWNER "Çàðåºñòðîâàíî íà: " + IDS_INF_PRODUCT_ID "Êîä ïðîäóêòó: " + IDS_INF_PUBLISHER "Âèäàâåöü: " + IDS_INF_VERSION "Âåðñ³ÿ: " + IDS_INF_CONTACT "Êîíòàêò: " + IDS_INF_SUP_INFO "Â³äîìîñò³ ïðî ï³äòðèìêó: " + IDS_INF_SUP_PHONE "Òåëåôîí ï³äòðèìêè: " + IDS_INF_PRODUCT_UPD "Îíîâëåííÿ ïðîäóêòó: " + IDS_INF_README "Ôàéë ""Readme"": " + IDS_INF_COMMENTS "Ïðèì³òêè: " + IDS_NO_INFORMATION "Íåìàº ³íôîðìàö³¿ ïðî öþ ïðîãðàìó." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native 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 Tue Feb 19 18:43:41 2008 @@ -6,3 +6,4 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

1 0

[tkreuzer] 32419: some cleanup - move NtGdiFlushUserBatch prototype to ntgdi.h - move pool tags from ntgdihdl.h to win32k/tags.h - move DC struct from ntgdihdl.h to win32k/dc.h - replace GDIEMPTYHDR with BASEOBJECT - use BASEOBJECT in DC and GDIDEVICE structures - rename some NtGdiXxx functions that don't deserve that name and remove some that were defined by a macro, but don't exist on windows (#if 0'ed atm) - remove RetrieveDisplayHDC() prototype (doesn't exist)
by tkreuzer＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: tkreuzer Date: Tue Feb 19 02:05:41 2008 New Revision: 32419 URL: http://svn.reactos.org/svn/reactos?rev=32419&view=rev Log: some cleanup - move NtGdiFlushUserBatch prototype to ntgdi.h - move pool tags from ntgdihdl.h to win32k/tags.h - move DC struct from ntgdihdl.h to win32k/dc.h - replace GDIEMPTYHDR with BASEOBJECT - use BASEOBJECT in DC and GDIDEVICE structures - rename some NtGdiXxx functions that don't deserve that name and remove some that were defined by a macro, but don't exist on windows (#if 0'ed atm) - remove RetrieveDisplayHDC() prototype (doesn't exist) Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Tue Feb 19 02:05:41 2008 @@ -1696,6 +1696,11 @@ ); W32KAPI +NTSTATUS +APIENTRY +NtGdiFlushUserBatch(VOID); + +W32KAPI HRGN APIENTRY NtGdiPathToRegion( Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Feb 19 02:05:41 2008 @@ -40,21 +40,6 @@ #define GDI_ENTRY_FLAGS_MASK 0xff000000 #define GDI_ENTRY_REUSECNT_SHIFT 8 #define GDI_ENTRY_UPPER_SHIFT 16 - -#define GDI_OBJECT_TAG_DC TAG('G', 'l', 'a', '1') -#define GDI_OBJECT_TAG_REGION TAG('G', 'l', 'a', '4') -#define GDI_OBJECT_TAG_BITMAP TAG('G', 'l', 'a', '5') -#define GDI_OBJECT_TAG_CLIOBJ TAG('G', 'h', '0', '6') -#define GDI_OBJECT_TAG_PATH TAG('G', 'h', '0', '7') -#define GDI_OBJECT_TAG_PALETTE TAG('G', 'l', 'a', '8') -#define GDI_OBJECT_TAG_COLSPC TAG('G', 'h', '0', '9') -#define GDI_OBJECT_TAG_FONT TAG('G', 'l', 'a', ':') -#define GDI_OBJECT_TAG_PFE TAG('G', 'h', '0', '<') -#define GDI_OBJECT_TAG_BRUSH TAG('G', 'l', 'a', '@') -#define GDI_OBJECT_TAG_ENUMFONT TAG('G', 'h', '0', 'F') - -#define GDI_OBJECT_TAG_DDRAW TAG('D', 'h', ' ', '1') -#define GDI_OBJECT_TAG_DDSURF TAG('D', 'h', ' ', '2') /*! \defgroup GDI object types * @@ -369,41 +354,4 @@ BOOL vport2WorldValid; /* Is xformVport2World valid? */ } WIN_DC_INFO; -typedef struct _DC -{ - HGDIOBJ hHmgr; // Handle for this DC object. - ULONG Count; - ULONG lucExcLock; - PVOID Tid; - - DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. - INT DC_Type; - INT DC_Flags; - PVOID pPDev; // PGDIDEVICE - PVOID hSem; // PERESOURCE - FLONG flGraphics; - FLONG flGraphics2; - PDC_ATTR pDc_Attr; - WIN_DC_INFO w; - DC_ATTR Dc_Attr; - HDC hNext; - HDC hPrev; - RECTL erclClip; - RECTL erclWindow; - RECTL erclBounds; - HRGN hprgnAPI; - HRGN hprgnVis; - - CLIPOBJ *CombinedClip; - XLATEOBJ *XlateBrush; - XLATEOBJ *XlatePen; - - INT saveLevel; // DCLEVEL lSaveDepth - HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. - - HPALETTE PalIndexed; - - UNICODE_STRING DriverName; -} DC, *PDC; - #endif Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Feb 19 02:05:41 2008 @@ -1,8 +1,9 @@ - #ifndef __WIN32K_DC_H #define __WIN32K_DC_H #include "driver.h" + +/* Constants ******************************************************************/ // Get/SetBounds/Rect support. #define DCB_WINDOWMGR 0x8000 // Queries the Windows bounding rectangle instead of the application's @@ -29,7 +30,43 @@ #define PDEV_DRIVER_PUNTED_CALL 0x00040000 // Driver calls back to GDI engine #define PDEV_CLONE_DEVICE 0x00080000 -// Graphics Device structure. +/* Type definitions ***********************************************************/ + +/* The DC object structure */ +typedef struct _DC +{ + BASEOBJECT BaseObject; + + DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. + INT DC_Type; + INT DC_Flags; + PVOID pPDev; // PGDIDEVICE + PVOID hSem; // PERESOURCE + FLONG flGraphics; + FLONG flGraphics2; + PDC_ATTR pDc_Attr; + WIN_DC_INFO w; + DC_ATTR Dc_Attr; + HDC hNext; + HDC hPrev; + RECTL erclClip; + RECTL erclWindow; + RECTL erclBounds; + HRGN hprgnAPI; + HRGN hprgnVis; + + CLIPOBJ *CombinedClip; + XLATEOBJ *XlateBrush; + XLATEOBJ *XlatePen; + + INT saveLevel; // DCLEVEL lSaveDepth + HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. + + HPALETTE PalIndexed; + + UNICODE_STRING DriverName; +} DC, *PDC; + typedef struct _GRAPHICS_DEVICE { CHAR szNtDeviceName[CCHDEVICENAME]; // Yes char AscII @@ -59,10 +96,7 @@ typedef struct _GDIDEVICE { - HANDLE hHmgr; - ULONG csCount; - ULONG lucExcLock; - PVOID Tid; + BASEOBJECT BaseObject; struct _GDIDEVICE *ppdevNext; INT cPdevRefs; @@ -103,7 +137,15 @@ struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; } GDIDEVICE, *PGDIDEVICE; -/* Internal functions */ +/* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ +typedef struct +{ + LPENHMETAHEADER emh; + BOOL on_disk; /* true if metafile is on disk */ +} DD_ENHMETAFILEOBJ, *PDD_ENHMETAFILEOBJ; + + +/* Internal functions *********************************************************/ #define DC_LockDc(hDC) \ ((PDC) GDIOBJ_LockObj (GdiHandleTable, (HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) @@ -111,7 +153,6 @@ GDIOBJ_UnlockObjByPtr (GdiHandleTable, pDC) NTSTATUS FASTCALL InitDcImpl(VOID); -HDC FASTCALL RetrieveDisplayHDC(VOID); PGDIDEVICE FASTCALL IntEnumHDev(VOID); HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); VOID FASTCALL DC_InitDC(HDC DCToInit); @@ -141,23 +182,14 @@ VOID FASTCALL IntGetWindowExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetWindowOrgEx(PDC dc, LPPOINT pt); -NTSTATUS STDCALL NtGdiFlushUserBatch(VOID); +COLORREF FASTCALL IntGdiSetBkColor (HDC hDC, COLORREF Color); +INT FASTCALL IntGdiSetBkMode(HDC hDC, INT backgroundMode); +COLORREF STDCALL IntGdiGetBkColor(HDC hDC); +INT STDCALL IntGdiGetBkMode(HDC hDC); +COLORREF FASTCALL IntGdiSetTextColor(HDC hDC, COLORREF color); +UINT FASTCALL IntGdiSetTextAlign(HDC hDC, UINT Mode); +UINT STDCALL IntGdiGetTextAlign(HDC hDC); +COLORREF STDCALL IntGdiGetTextColor(HDC hDC); +INT STDCALL IntGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); -COLORREF FASTCALL NtGdiSetBkColor (HDC hDC, COLORREF Color); -INT FASTCALL NtGdiSetBkMode(HDC hDC, INT backgroundMode); -COLORREF STDCALL NtGdiGetBkColor(HDC hDC); -INT STDCALL NtGdiGetBkMode(HDC hDC); -COLORREF FASTCALL NtGdiSetTextColor(HDC hDC, COLORREF color); -UINT FASTCALL NtGdiSetTextAlign(HDC hDC, UINT Mode); -UINT STDCALL NtGdiGetTextAlign(HDC hDC); -COLORREF STDCALL NtGdiGetTextColor(HDC hDC); -INT STDCALL NtGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); - -/* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ -typedef struct -{ - LPENHMETAHEADER emh; - BOOL on_disk; /* true if metafile is on disk */ -} DD_ENHMETAFILEOBJ, *PDD_ENHMETAFILEOBJ; - -#endif /* __WIN32K_DC_H */ +#endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Tue Feb 19 02:05:41 2008 @@ -36,7 +36,7 @@ typedef BOOL (INTERNAL_CALL *GDICLEANUPPROC)(PVOID ObjectBody); /*! - * GDI object header. This is a part of any GDI object + * GDI object header. This is a part of any GDI object. ROS specific header! */ typedef struct _GDIOBJHDR { @@ -55,13 +55,14 @@ // It's for thread locking. // This header is standalone, used only in gdiobj.c. // -typedef struct _GDIOBJEMPTYHDR +typedef struct _BASEOBJECT { HGDIOBJ hHmgr; - ULONG Count; - ULONG lucExcLock; + ULONG ulShareCount; + USHORT cExclusiveLock; + USHORT BaseFlags; PW32THREAD Tid; -} GDIOBJEMPTYHDR, *PGDIOBJEMPTYHDR; +} BASEOBJECT, *POBJ; BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle); void INTERNAL_CALL GDIOBJ_SetOwnership(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle, PEPROCESS Owner); Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h Tue Feb 19 02:05:41 2008 @@ -1,72 +1,97 @@ #ifndef _WIN32K_TAGS_H #define _WIN32K_TAGS_H -#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ +#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ /* ntuser */ -#define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ -#define TAG_KEYBOARD TAG('K', 'B', 'D', ' ') /* keyboard */ -#define TAG_ACCEL TAG('A', 'C', 'C', 'L') /* accelerator */ -#define TAG_HOOK TAG('W', 'N', 'H', 'K') /* hook */ -#define TAG_HOTKEY TAG('H', 'O', 'T', 'K') /* hotkey */ -#define TAG_MENUITEM TAG('M', 'E', 'N', 'I') /* menu item */ -#define TAG_MSG TAG('M', 'E', 'S', 'G') /* message */ -#define TAG_MSGQ TAG('M', 'S', 'G', 'Q') /* message queue */ -#define TAG_USRMSG TAG('U', 'M', 'S', 'G') /* user message */ -#define TAG_WNDPROP TAG('W', 'P', 'R', 'P') /* window property */ -#define TAG_WNAM TAG('W', 'N', 'A', 'M') /* window name */ -#define TAG_WINLIST TAG('W', 'N', 'L', 'S') /* window handle list */ -#define TAG_WININTLIST TAG('W', 'N', 'I', 'P') /* window internal pos */ -#define TAG_WINPROCLST TAG('W', 'N', 'P', 'L') /* window proc list */ -#define TAG_SBARINFO TAG('S', 'B', 'I', 'N') /* scrollbar info */ -#define TAG_TIMER TAG('T', 'I', 'M', 'R') /* timer entry */ -#define TAG_TIMERTD TAG('T', 'I', 'M', 'T') /* timer thread dereference list */ -#define TAG_TIMERBMP TAG('T', 'I', 'M', 'B') /* timers bitmap */ -#define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ -#define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ -#define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ +#define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ +#define TAG_KEYBOARD TAG('K', 'B', 'D', ' ') /* keyboard */ +#define TAG_ACCEL TAG('A', 'C', 'C', 'L') /* accelerator */ +#define TAG_HOOK TAG('W', 'N', 'H', 'K') /* hook */ +#define TAG_HOTKEY TAG('H', 'O', 'T', 'K') /* hotkey */ +#define TAG_MENUITEM TAG('M', 'E', 'N', 'I') /* menu item */ +#define TAG_MSG TAG('M', 'E', 'S', 'G') /* message */ +#define TAG_MSGQ TAG('M', 'S', 'G', 'Q') /* message queue */ +#define TAG_USRMSG TAG('U', 'M', 'S', 'G') /* user message */ +#define TAG_WNDPROP TAG('W', 'P', 'R', 'P') /* window property */ +#define TAG_WNAM TAG('W', 'N', 'A', 'M') /* window name */ +#define TAG_WINLIST TAG('W', 'N', 'L', 'S') /* window handle list */ +#define TAG_WININTLIST TAG('W', 'N', 'I', 'P') /* window internal pos */ +#define TAG_WINPROCLST TAG('W', 'N', 'P', 'L') /* window proc list */ +#define TAG_SBARINFO TAG('S', 'B', 'I', 'N') /* scrollbar info */ +#define TAG_TIMER TAG('T', 'I', 'M', 'R') /* timer entry */ +#define TAG_TIMERTD TAG('T', 'I', 'M', 'T') /* timer thread dereference list */ +#define TAG_TIMERBMP TAG('T', 'I', 'M', 'B') /* timers bitmap */ +#define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ +#define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ +#define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ -/* objects */ -#define TAG_BEZIER TAG('B', 'E', 'Z', 'R') /* bezier */ -#define TAG_BITMAP TAG('B', 'T', 'M', 'P') /* bitmap */ -#define TAG_PATBLT TAG('P', 'B', 'L', 'T') /* patblt */ -#define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ -#define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ -#define TAG_DC TAG('D', 'C', 'D', 'C') /* dc */ -#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ -#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ -#define TAG_GDIOBJ TAG('G', 'D', 'I', 'O') /* gdi obj */ -#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ -#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ -#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ -#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ -#define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ -#define TAG_PALETTE TAG('P', 'A', 'L', 'E') /* palette */ -#define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ -#define TAG_PATH TAG('P', 'A', 'T', 'H') /* path */ -#define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ -#define TAG_REGION TAG('R', 'G', 'N', 'O') /* region */ -#define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ -#define TAG_EXTPEN TAG('X', 'P', 'E', 'N') /* extpen */ +/* gdi objects from the handle table */ +#define TAG_DC TAG('G', 'l', 'a', '1') /* dc */ +#define TAG_REGION TAG('G', 'l', 'a', '4') /* region */ +#define TAG_SURFACE TAG('G', 'l', 'a', '5') /* bitmap */ +#define TAG_CLIENTOBJ TAG('G', 'h', '0', '6') +#define TAG_PATH TAG('G', 'h', '0', '7') +#define TAG_PALETTE TAG('G', 'l', 'a', '8') +#define TAG_ICMLCS TAG('G', 'h', '0', '9') +#define TAG_LFONT TAG('G', 'l', 'a', ':') +#define TAG_RFONT TAG('G', 'h', '0', ';') /* correct? */ +#define TAG_PFE TAG('G', 'h', '0', '<') +#define TAG_PFT TAG('G', 'h', '0', '=') /* correct? */ +#define TAG_ICMCXF TAG('G', 'h', '0', '>') /* correct? */ +#define TAG_SPRITE TAG('G', 'h', '0', '?') /* correct? */ +#define TAG_BRUSH TAG('G', 'l', 'a', '@') +#define TAG_UMPD TAG('G', 'h', '0', 'A') /* correct? */ +#define TAG_SPACE TAG('G', 'h', '0', 'C') /* correct? */ +#define TAG_META TAG('G', 'h', '0', 'E') /* correct? */ +#define TAG_EFSTATE TAG('G', 'h', '0', 'F') /* correct? */ +#define TAG_BMFD TAG('G', 'h', '0', 'G') /* correct? */ +#define TAG_VTFD TAG('G', 'h', '0', 'H') /* correct? */ +#define TAG_TTFD TAG('G', 'h', '0', 'I') /* correct? */ +#define TAG_RC TAG('G', 'h', '0', 'J') /* correct? */ +#define TAG_TEMP TAG('G', 'h', '0', 'K') /* correct? */ +#define TAG_DRVOBJ TAG('G', 'h', '0', 'L') /* correct? */ +#define TAG_DCIOBJ TAG('G', 'h', '0', 'M') /* correct? */ +#define TAG_SPOOL TAG('G', 'h', '0', 'N') /* correct? */ + +/* other gdi objects */ +#define TAG_BEZIER TAG('B', 'E', 'Z', 'R') /* bezier */ +#define TAG_BITMAP TAG('B', 'T', 'M', 'P') /* bitmap */ +#define TAG_PATBLT TAG('P', 'B', 'L', 'T') /* patblt */ +#define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ +#define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ +#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ +#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ +#define TAG_GDIOBJ TAG('G', 'D', 'I', 'O') /* gdi obj */ +#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ +#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ +#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ +#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ +#define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ +#define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ +#define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ +#define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ +#define TAG_EXTPEN TAG('X', 'P', 'E', 'N') /* extpen */ /* Eng objects */ -#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ -#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ -#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ -#define TAG_FONTOBJ TAG('F', 'N', 'T', 'O') /* font object */ -#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ -#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ -#define TAG_BITMAPOBJ TAG('B', 'M', 'P', 'O') /* bitmap object */ +#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ +#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ +#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ +#define TAG_FONTOBJ TAG('F', 'N', 'T', 'O') /* font object */ +#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ +#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ +#define TAG_BITMAPOBJ TAG('B', 'M', 'P', 'O') /* bitmap object */ /* misc */ -#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ -#define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ +#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ +#define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ #define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ - /* Dx internal tags rember I do not known if it right namees */ -#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ -#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ +#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ +#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ +#define TAG_DDRAW TAG('D', 'h', ' ', '1') +#define TAG_DDSURF TAG('D', 'h', ' ', '2') #endif /* _WIN32K_TAGS_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Feb 19 02:05:41 2008 @@ -1622,10 +1622,10 @@ goto cleanup; } - nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); - - oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); - oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); + nStretchMode = IntGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); + + oldFg = IntGdiSetTextColor(hdcOff, RGB(0, 0, 0)); + oldBg = IntGdiSetBkColor(hdcOff, RGB(255, 255, 255)); if (diFlags & DI_MASK) { @@ -1737,9 +1737,9 @@ cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); } - NtGdiSetTextColor(hdcOff, oldFg); - NtGdiSetBkColor(hdcOff, oldBg); - NtGdiSetStretchBltMode(hdcOff, nStretchMode); + IntGdiSetTextColor(hdcOff, oldFg); + IntGdiSetBkColor(hdcOff, oldBg); + IntGdiSetStretchBltMode(hdcOff, nStretchMode); Ret = TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Tue Feb 19 02:05:41 2008 @@ -1505,15 +1505,15 @@ rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); } - color_old = NtGdiSetTextColor(hDC, RGB(255,255,255)); - align_old = NtGdiSetTextAlign(hDC, TA_RIGHT); - mode_old = NtGdiSetBkMode(hDC, TRANSPARENT); + color_old = IntGdiSetTextColor(hDC, RGB(255,255,255)); + align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); + mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); NtGdiExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0); - NtGdiSetBkMode(hDC, mode_old); - NtGdiSetTextAlign(hDC, align_old); - NtGdiSetTextColor(hDC, color_old); + IntGdiSetBkMode(hDC, mode_old); + IntGdiSetTextAlign(hDC, align_old); + IntGdiSetTextColor(hDC, color_old); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Tue Feb 19 02:05:41 2008 @@ -1581,7 +1581,7 @@ return FALSE; } - NtGdiSetBkMode(hDc, TRANSPARENT); + IntGdiSetBkMode(hDc, TRANSPARENT); if(uFlags & DC_SMALLCAP) Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); @@ -1603,8 +1603,8 @@ } if(uFlags & DC_INBUTTON) - OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); - else OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE + OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); + else OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. @@ -1613,7 +1613,7 @@ lpRc->top, 0, NULL, Text->Buffer, Text->Length/sizeof(WCHAR), NULL, 0); - NtGdiSetTextColor(hDc, OldTextColor); + IntGdiSetTextColor(hDc, OldTextColor); NtGdiSelectFont(hDc, hOldFont); NtGdiDeleteObject(hFont); Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c Tue Feb 19 02:05:41 2008 @@ -43,7 +43,7 @@ HWND hWnd; PWINDOW_OBJECT Window; - hWnd = IntWindowFromDC((HDC) dc->hHmgr); + hWnd = IntWindowFromDC((HDC) dc->BaseObject.hHmgr); Window = UserGetWindowObject(hWnd); if(!Window) return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Feb 19 02:05:41 2008 @@ -838,10 +838,10 @@ /* Initialize the DC state */ DC_InitDC(hNewDC); - NtGdiSetTextColor(hNewDC, RGB(0, 0, 0)); - NtGdiSetTextAlign(hNewDC, TA_TOP); - NtGdiSetBkColor(hNewDC, RGB(255, 255, 255)); - NtGdiSetBkMode(hNewDC, OPAQUE); + IntGdiSetTextColor(hNewDC, RGB(0, 0, 0)); + IntGdiSetTextAlign(hNewDC, TA_TOP); + IntGdiSetBkColor(hNewDC, RGB(255, 255, 255)); + IntGdiSetBkMode(hNewDC, OPAQUE); } else { @@ -1356,8 +1356,8 @@ NtGdiSelectFont( hDC, sDc_Attr->hlfntNew ); NtGdiSelectPen( hDC, sDc_Attr->hpen ); - NtGdiSetBkColor( hDC, sDc_Attr->crBackgroundClr); - NtGdiSetTextColor( hDC, sDc_Attr->crForegroundClr); + IntGdiSetBkColor( hDC, sDc_Attr->crBackgroundClr); + IntGdiSetTextColor( hDC, sDc_Attr->crForegroundClr); NtUserSelectPalette( hDC, dcs->w.hPalette, FALSE ); @@ -2385,7 +2385,7 @@ Dc_Attr = NewDC->pDc_Attr; if(!Dc_Attr) Dc_Attr = &NewDC->Dc_Attr; - NewDC->hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. + NewDC->BaseObject.hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. NewDC->w.xformWorld2Wnd.eM11 = 1.0f; NewDC->w.xformWorld2Wnd.eM12 = 0.0f; NewDC->w.xformWorld2Wnd.eM21 = 0.0f; Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Tue Feb 19 02:05:41 2008 @@ -41,7 +41,9 @@ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; \ pt->ax = Dc_Attr->ret_x; \ pt->ay = Dc_Attr->ret_y; \ -} \ +} + +#if 0 BOOL STDCALL NtGdi##FuncName ( HDC hdc, LP##type pt ) \ { \ NTSTATUS Status = STATUS_SUCCESS; \ @@ -78,6 +80,7 @@ } \ return TRUE; \ } +#endif #define DC_SET_MODE( func_name, dc_field, min_val, max_val ) \ INT STDCALL func_name( HDC hdc, INT mode ) \ @@ -123,7 +126,7 @@ PDC_ATTR Dc_Attr = dc->pDc_Attr; if (Dc_Attr == ((PDC_ATTR)&dc->Dc_Attr)) return TRUE; // No need to copy self. - + if (!Dc_Attr) return FALSE; else CopytoUserDcAttr( dc, Dc_Attr); @@ -143,28 +146,28 @@ } -DC_GET_VAL( INT, NtGdiGetMapMode, iMapMode ) -DC_GET_VAL( INT, NtGdiGetPolyFillMode, jFillMode ) -DC_GET_VAL( COLORREF, NtGdiGetBkColor, crBackgroundClr ) -DC_GET_VAL( INT, NtGdiGetBkMode, jBkMode ) -DC_GET_VAL( INT, NtGdiGetROP2, jROP2 ) -DC_GET_VAL( INT, NtGdiGetStretchBltMode, jStretchBltMode ) -DC_GET_VAL( UINT, NtGdiGetTextAlign, lTextAlign ) -DC_GET_VAL( COLORREF, NtGdiGetTextColor, crForegroundClr ) +DC_GET_VAL( INT, IntGdiGetMapMode, iMapMode ) +DC_GET_VAL( INT, IntGdiGetPolyFillMode, jFillMode ) +DC_GET_VAL( COLORREF, IntGdiGetBkColor, crBackgroundClr ) +DC_GET_VAL( INT, IntGdiGetBkMode, jBkMode ) +DC_GET_VAL( INT, IntGdiGetROP2, jROP2 ) +DC_GET_VAL( INT, IntGdiGetStretchBltMode, jStretchBltMode ) +DC_GET_VAL( UINT, IntGdiGetTextAlign, lTextAlign ) +DC_GET_VAL( COLORREF, IntGdiGetTextColor, crForegroundClr ) DC_GET_VAL_EX( GetViewportExtEx, szlViewportExt.cx, szlViewportExt.cy, SIZE, cx, cy ) DC_GET_VAL_EX( GetViewportOrgEx, ptlViewportOrg.x, ptlViewportOrg.y, POINT, x, y ) DC_GET_VAL_EX( GetWindowExtEx, szlWindowExt.cx, szlWindowExt.cy, SIZE, cx, cy ) DC_GET_VAL_EX( GetWindowOrgEx, ptlWindowOrg.x, ptlWindowOrg.y, POINT, x, y ) -DC_SET_MODE( NtGdiSetPolyFillMode, jFillMode, ALTERNATE, WINDING ) -DC_SET_MODE( NtGdiSetROP2, jROP2, R2_BLACK, R2_WHITE ) -DC_SET_MODE( NtGdiSetStretchBltMode, jStretchBltMode, BLACKONWHITE, HALFTONE ) +DC_SET_MODE( IntGdiSetPolyFillMode, jFillMode, ALTERNATE, WINDING ) +DC_SET_MODE( IntGdiSetROP2, jROP2, R2_BLACK, R2_WHITE ) +DC_SET_MODE( IntGdiSetStretchBltMode, jStretchBltMode, BLACKONWHITE, HALFTONE ) COLORREF FASTCALL -NtGdiSetBkColor(HDC hDC, COLORREF color) +IntGdiSetBkColor(HDC hDC, COLORREF color) { COLORREF oldColor; PDC dc; @@ -189,7 +192,7 @@ } INT FASTCALL -NtGdiSetBkMode(HDC hDC, INT Mode) +IntGdiSetBkMode(HDC hDC, INT Mode) { COLORREF oldMode; PDC dc; @@ -211,7 +214,7 @@ UINT FASTCALL -NtGdiSetTextAlign(HDC hDC, +IntGdiSetTextAlign(HDC hDC, UINT Mode) { UINT prevAlign; @@ -234,7 +237,7 @@ COLORREF FASTCALL -NtGdiSetTextColor(HDC hDC, +IntGdiSetTextColor(HDC hDC, COLORREF color) { COLORREF oldColor; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Feb 19 02:05:41 2008 @@ -68,37 +68,37 @@ static const OBJ_TYPE_INFO ObjTypeInfo[] = { - {0, 0, 0, NULL}, /* 00 reserved entry */ - {1, sizeof(DC), GDI_OBJECT_TAG_DC, DC_Cleanup}, /* 01 DC */ - {1, 0, 0, 0}, /* 02 DD_DDRAW, should be moved away from gdi objects */ - {1, 0, 0, 0}, /* 03 DD_SURFACE, should be moved away from gdi objects */ - {1, sizeof(ROSRGNDATA), GDI_OBJECT_TAG_REGION, RGNDATA_Cleanup}, /* 04 REGION */ - {1, sizeof(BITMAPOBJ), GDI_OBJECT_TAG_BITMAP, BITMAP_Cleanup}, /* 05 BITMAP */ - {0, sizeof(DC), GDI_OBJECT_TAG_CLIOBJ, GDI_CleanupDummy}, /* 06 CLIOBJ: METADC,... FIXME: don't use DC struct */ - {0, 0, GDI_OBJECT_TAG_PATH, NULL}, /* 07 PATH, unused */ - {1, sizeof(PALGDI), GDI_OBJECT_TAG_PALETTE, PALETTE_Cleanup}, /* 08 PALETTE */ - {0, 0, GDI_OBJECT_TAG_COLSPC, NULL}, /* 09 COLORSPACE, unused */ - {1, sizeof(TEXTOBJ), GDI_OBJECT_TAG_FONT, GDI_CleanupDummy}, /* 0a FONT */ - {0, 0, 0, NULL}, /* 0b RFONT, unused */ - {0, 0, 0, NULL}, /* 0c PFE, unused */ - {0, 0, 0, NULL}, /* 0d PFT, unused */ - {0, 0, 0, NULL}, /* 0e ICMCXF, unused */ - {0, 0, 0, NULL}, /* 0f ICMDLL, unused */ - {1, sizeof(GDIBRUSHOBJ), GDI_OBJECT_TAG_BRUSH, BRUSH_Cleanup}, /* 10 BRUSH, PEN, EXTPEN */ - {0, 0, 0, NULL}, /* 11 D3D_HANDLE, unused */ - {0, 0, 0, NULL}, /* 12 DD_VPORT, unused */ - {0, 0, 0, NULL}, /* 13 SPACE, unused */ - {0, 0, 0, NULL}, /* 14 DD_MOTION, unused */ - {0, 0, 0, NULL}, /* 15 META, unused */ - {0, 0, 0, NULL}, /* 16 ENUMFONT, unused */ - {0, 0, 0, NULL}, /* 17 BMFD, unused */ - {0, 0, 0, NULL}, /* 18 VTFD, unused */ - {0, 0, 0, NULL}, /* 19 TTFD, unused */ - {0, 0, 0, NULL}, /* 1a RC, unused */ - {0, 0, 0, NULL}, /* 1b TEMP, unused */ - {0, 0, 0, NULL}, /* 1c DRVOBJ, unused */ - {0, 0, 0, NULL}, /* 1d DCIOBJ, unused */ - {0, 0, 0, NULL}, /* 1e SPOOL, unused */ + {0, 0, 0, NULL}, /* 00 reserved entry */ + {1, sizeof(DC), TAG_DC, DC_Cleanup}, /* 01 DC */ + {1, 0, 0, NULL}, /* 02 UNUSED1 */ + {1, 0, 0, NULL}, /* 03 UNUSED2 */ + {1, sizeof(ROSRGNDATA), TAG_REGION, RGNDATA_Cleanup}, /* 04 RGN */ + {1, sizeof(BITMAPOBJ), TAG_SURFACE, BITMAP_Cleanup}, /* 05 SURFACE */ + {0, sizeof(DC), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CLIENTOBJ: METADC,... FIXME: don't use DC struct */ + {0, 0, TAG_PATH, NULL}, /* 07 PATH, unused */ + {1, sizeof(PALGDI), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */ + {0, 0, TAG_ICMLCS, NULL}, /* 09 ICMLCS, unused */ + {1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT */ + {0, 0, TAG_RFONT, NULL}, /* 0b RFONT, unused */ + {0, 0, TAG_PFE, NULL}, /* 0c PFE, unused */ + {0, 0, TAG_PFT, NULL}, /* 0d PFT, unused */ + {0, 0, TAG_ICMCXF, NULL}, /* 0e ICMCXF, unused */ + {0, 0, TAG_SPRITE, NULL}, /* 0f SPRITE, unused */ + {1, sizeof(GDIBRUSHOBJ), TAG_BRUSH, BRUSH_Cleanup}, /* 10 BRUSH, PEN, EXTPEN */ + {0, 0, TAG_UMPD, NULL}, /* 11 UMPD, unused */ + {0, 0, 0, NULL}, /* 12 UNUSED4 */ + {0, 0, TAG_SPACE, NULL}, /* 13 SPACE, unused */ + {0, 0, 0, NULL}, /* 14 UNUSED5 */ + {0, 0, TAG_META, NULL}, /* 15 META, unused */ + {0, 0, TAG_EFSTATE, NULL}, /* 16 EFSTATE, unused */ + {0, 0, TAG_BMFD, NULL}, /* 17 BMFD, unused */ + {0, 0, TAG_TTFD, NULL}, /* 18 VTFD, unused */ + {0, 0, TAG_TTFD, NULL}, /* 19 TTFD, unused */ + {0, 0, TAG_RC, NULL}, /* 1a RC, unused */ + {0, 0, TAG_TEMP, NULL}, /* 1b TEMP, unused */ + {0, 0, TAG_DRVOBJ, NULL}, /* 1c DRVOBJ, unused */ + {0, 0, TAG_DCIOBJ, NULL}, /* 1d DCIOBJ, unused */ + {0, 0, TAG_SPOOL, NULL}, /* 1e SPOOL, unused */ }; #define BASE_OBJTYPE_COUNT (sizeof(ObjTypeInfo) / sizeof(ObjTypeInfo[0]))

1 0

[dreimer] 32418: Bug 3088: Polish locale update: usetup + appwiz-new by Olaf Siejka - olaf_siejka@o2.pl
by dreimer＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: dreimer Date: Tue Feb 19 01:19:07 2008 New Revision: 32418 URL: http://svn.reactos.org/svn/reactos?rev=32418&view=rev Log: Bug 3088: Polish locale update: usetup + appwiz-new by Olaf Siejka - olaf_siejka(a)o2.pl Added: trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Tue Feb 19 01:19:07 2008 @@ -1607,7 +1607,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by w stanie odnale« sekji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik¢w: %S"}, + " \xB3 Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM, @@ -1649,31 +1649,31 @@ {STRING_KEEPFORMAT, " Zachowaj obecny system plik¢w (bez zmian) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s Dysk 02 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, - " %c%c Type %lu %I64u %s"}, + " %c%c 03Typ %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "na %I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "na %I64u %s Dysku 05 Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "Dysk Twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, - "%c%c Type %lu %I64u %s"}, + "%c%c 07Typ %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, - "%c%c Type %-3u %6lu %s"}, + "%c%c 09Typ %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s Dysk Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s Dysk11 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "Instalator utworzy now¥ partycj©"}, {STRING_UNPSPACE, - " Unpartitioned space %6lu %s"}, + " Miejsce poza partycjami %6lu %s"}, {0, 0} }; Modified: trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/de… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc Tue Feb 19 01:19:07 2008 @@ -1,3 +1,8 @@ +/* + * translated by EmuandCo - Daniel Reimer (Feb, 2008) + * reimer.daniel(a)freenet.de + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_POPUP_APP MENU Added: trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/pl… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc Tue Feb 19 01:19:07 2008 @@ -1,0 +1,207 @@ +/* + * translated by Caemyr - Olaf Siejka (Feb, 2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Usuñ", ID_APP_REMOVE + MENUITEM "&Zmieñ", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Instalacja sieciowa" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Instaluj...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&ReactOS mo¿e zainstalowaæ nastêpuj¹ce oprogramowanie automagicznie. Aby zainstalowaæ dany program, wybierz go na licie i nacinij Instaluj.", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Utwórz skrót" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ta aplikacja pomo¿e ci utworzyæ skrót do programów, plików, katalogów - zarówno lokalnych jak i sieciowych, a tak¿e komputerów czy adresów internetowych.", -1, 97, 7, 195, 28 + LTEXT "&Podaj lokalizacjê:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&rzegl¹daj...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Nacinij Dalej aby kontynuowaæ.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Wybierz katalog" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wybierz katalog, w którym ma byæ umieszczony skrót:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "Nowy &Katalog...", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Wybierz nazwê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wpisz nazwê dla skrótu:", -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 "Nacinij Zakoñcz by utworzyæ skrót.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Wybierz ikonê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wybierz ikonê dla skrótu:", -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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Instaluj Program Z Dyskietki lub CD-ROMu" +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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Uruchom Program Instalacyjny" +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 "&Otwórz:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&rzegl¹daj...", 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 "Zmieñ opcje u¿ytkownika" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Mo¿esz udostêpniæ ten nowy program dla wszystkich u¿ytkowników.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Instaluj", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Wykonaj", 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 "Zakoñczenie Instalacji W Trybie Administratora" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Zmieñ mapowani ini klikaj¹c w Zakoñcz.", 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 "Po Instalacji" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Proszê nacisn¹æ Dalej.", 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 "Uruchom Program Instalacyjny" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Proszê wskazaæ lokalizacjê programu dezinstalacyjnego.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Linia polecenia dla programu dezinstalacyjnego:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&rzegl¹daj...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Anuluj", 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 "Ostrze¿enie" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "W tej chwili s¹ zalogowani inni u¿ytkownicy na tym komputerze.", -1, 37, 8, 214, 10 + LTEXT "Jeli odinstalujesz ten program, podczas gdy inni u¿ytkownicy bêd¹ z niego korzystaæ, dezinstalacja mo¿e nie byæ kompletna.", -1, 37, 23, 212, 22 + LTEXT "Aby poprawnie zmieniæ b¹d usun¹æ program, upewnij siê, ¿e wszyscy u¿ytkownicy s¹ wylogowani.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Zmieñ u¿ytkownika", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Kontynuuj", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Usuñ Skróty/Katalogi" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Aby usun¹æ element z menu Start, wybierz go na licie i nacinij usuñ.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Usuñ", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Zamknij", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Dodaj póniej" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Mo¿esz wybraæ datê i czas, kiedy dok³adnie chcesz zainstalowaæ dany program. Mo¿esz, na przyk³ad ustawiæ by sta³o siê to gdy nie bêdziesz na nim pracowaæ.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Dodaj program póniej ", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Nie dodawaj pogramu", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Dodaj lub Usuñ Programy" + IDS_CPLSYSTEMDESCRIPTION "Zainstaluj lub Usuñ programy i komponenty ReactOSa." + IDS_UNABLEOPEN_UNINSTKEY "Otwarcie klucza dezinstalacji nieudane" + IDS_LIST_TITLE "Lista" + IDS_SIZE_TITLE "Rozmiar (MB)" + IDS_LAST_USED "Ostatnio u¿yty" + IDS_PROGANDUPDATES "Programy i uaktualnienia" + IDS_PROGRAMS_ONLY "Tylko programy" + IDS_UPDATES_ONLY "Tylko uaktualnienia" + IDS_WELCOME_TITLE "Witamy w Dodaj lub Usuñ Programy" + IDS_WELCOME_MSG "Proszê wybraæ kategoriê po lewej albo program z listy by go usun¹æ lub obejrzeæ informacje o nim." + IDS_SEARCH_TEXT "Wyszukaj na licie..." + IDS_REMOVE_BTN "&Usuñ" + IDS_MODIFY_BTN "&Zmieñ" + IDS_UNABLEREAD_UNINSTSTR "Nie mo¿na odczytaæ UninstallString. Ta pozycja jest nieprawid³owa albo zosta³a utworzona za pomoc¹ instalatora MSI." + IDS_INF_REG_OWNER "Zarejestrowany W³aciciel: " + IDS_INF_PRODUCT_ID "ID Produktu: " + IDS_INF_PUBLISHER "Wydawca: " + IDS_INF_VERSION "Wersja: " + IDS_INF_CONTACT "Kontakt: " + IDS_INF_SUP_INFO "Informacje o wsparciu: " + IDS_INF_SUP_PHONE "Telefon do wsparcia: " + IDS_INF_PRODUCT_UPD "Uaktualnienia: " + IDS_INF_README "CzytajTo: " + IDS_INF_COMMENTS "Komentarze: " + IDS_NO_INFORMATION "Brak informacji o programie." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native 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 Tue Feb 19 01:19:07 2008 @@ -4,4 +4,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

[navaraf] 32417: Fix counting of MmStats.NrFreePages.
by navaraf＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: navaraf Date: Tue Feb 19 00:43:45 2008 New Revision: 32417 URL: http://svn.reactos.org/svn/reactos?rev=32417&view=rev Log: Fix counting of MmStats.NrFreePages. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Tue Feb 19 00:43:45 2008 @@ -380,6 +380,7 @@ { RemoveEntryList(&MmPageArray[i].ListEntry); UnzeroedPageCount--; + MmStats.NrFreePages--; } /* Mark it as used kernel memory */

1 0

[dreimer] 32416: Add German Translation to appwiz-new. remove DS_FIXEDSYS, it is already set by DS_SHELLFONT. Fix some Strings in en-EN.rc.
by dreimer＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: dreimer Date: Tue Feb 19 00:41:13 2008 New Revision: 32416 URL: http://svn.reactos.org/svn/reactos?rev=32416&view=rev Log: Add German Translation to appwiz-new. remove DS_FIXEDSYS, it is already set by DS_SHELLFONT. Fix some Strings in en-EN.rc. Added: trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Added: trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/de… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc Tue Feb 19 00:41:13 2008 @@ -1,0 +1,199 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Entfernen", ID_APP_REMOVE + MENUITEM "&Ändern", 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 "Netzwerkinstallation" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Installieren...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&Die folgende Software kann von ReactOS automatisch installiert werden. Um ein Programm zu installieren, wählen Sie es aus der Liste und klicken Sie auf Installieren.", 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 "Verknüpfung erstellen" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Dieser Assistent wird Ihnen helfen, Verknüpfungen zu lokalen oder Netzwerkprogrammen, Dateien, Ordnern, Computern, oder Internet Adressen zu erstellen.", -1, 97, 7, 195, 28 + LTEXT "&Geben Sie den Pfad zum Element ein:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Durchsuchen...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Klicken Sie auf Weiter, um fortzusetzen.", -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 "Programmordner wählen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wählen Sie einen Zielordner für die Verknüpfung:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "Neuer &Ordner...", 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 "Wählen Sie einen Titel für das Programm" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Geben Sie einen Namen für die Verknüpfung ein:", -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 "Klicken Sie auf Fertig, um die Verknüpfung zu erstellen.", -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 "Wählen Sie ein Icon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wählen Sie ein Icon für die Verknüpfung:", -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 "Installieren eines Programmes von Floppy Disk oder 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 "Installationsprogramm starten" +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 "&Öffnen:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Durchsuchen...", 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 "Benutzeroptionen ändern" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Sie haben die Möglichkeit dieses Programm für alle Benutzer zugänglich zu machen.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Installieren", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Ausführen", 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 "Administrative Installation fertigstellen" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "INI Mapping wird durch klicken auf Fertig zurückgesetzt.", 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 "Nach der Installation" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Bitte drücken Sie auf Weiter.", 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 "Installationsprogramm starten" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bitte legen Sie den Pfad zum Deinstallationsprogramm fest.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Kommandozeile für das Deinstallationsprogramm:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Durchsuchen...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Abbrechen", 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 "Warnung" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Es sind weitere Benutzer auf diesem Computer angemeldet.", -1, 37, 8, 214, 10 + LTEXT "Wenn Sie das Programm deinstallieren, während andere Benutzer es verwenden, wird es wahrscheinlich nicht vollständig deinstalliert.", -1, 37, 23, 212, 22 + LTEXT "Um dieses Programm ordnungsgemäß zu entfernen, wechseln Sie zu jedem Benutzer und melden Sie jeden einzeln ab, bevor Sie fortsetzen.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Benutzer wechseln", IDC_SWITCHUSER, 56, 81, 65, 14 + PUSHBUTTON "&Fortsetzen", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Abbrechen", 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 "Verknüpfungen/Ordner löschen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Um einen Eintrag aus dem Startmenü zu entfernen, wählen Sie des Eintrag aus und klicken Sie auf löschen.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Entfernen", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Schließen", 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 "Später hinzufügen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sie können ein Datum und eine Uhrzeit wählen, zu der Sie das Programm auf ihren Computer hinzufügen wollen. Zum Beispiel können Sie dies so planen, dass es startet, wenn Sie nicht an Ihrem Computer arbeiten.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Programm später hinzufügen", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Programm nicht hinzufügen", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Abbrechen", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Programme hinzufügen oder entfernen" + IDS_CPLSYSTEMDESCRIPTION "Installieren oder entfernen Sie Programme und ReactOS Komponenten." + IDS_UNABLEOPEN_UNINSTKEY "Konnte Deinstallationsschlüssel nicht öffnen" + IDS_LIST_TITLE "Liste" + IDS_SIZE_TITLE "Größe (MB)" + IDS_LAST_USED "Zuletzt genutzt" + IDS_PROGANDUPDATES "Programme & Updates" + IDS_PROGRAMS_ONLY "Nur Programme" + IDS_UPDATES_ONLY "Nur Updates" + IDS_WELCOME_TITLE "Willkommen im Assistent zum Programme hinzufügen oder entfernen" + IDS_WELCOME_MSG "Bitte wählen Sie links eine Kategorie oder rechts eine Anwendung aus der Liste, um sie zu entfernen oder Informationen einzusehen." + IDS_SEARCH_TEXT "Liste durchsuchen..." + IDS_REMOVE_BTN "&Entfernen" + IDS_MODIFY_BTN "&Ändern" + IDS_UNABLEREAD_UNINSTSTR "Konnte den UninstallString nicht lesen. Dieser Eintrag ist ungültig oder wurde von einem MSI Installer erstellt." + IDS_INF_REG_OWNER "Registrierter Eigentümer: " + IDS_INF_PRODUCT_ID "Produkt ID: " + IDS_INF_PUBLISHER "Herausgeber: " + IDS_INF_VERSION "Version: " + IDS_INF_CONTACT "Kontakt: " + IDS_INF_SUP_INFO "Support Informationen: " + IDS_INF_SUP_PHONE "Support Telefon: " + IDS_INF_PRODUCT_UPD "Produkt Updates: " + IDS_INF_README "Liesmich: " + IDS_INF_COMMENTS "Kommentare: " + IDS_NO_INFORMATION "Keine Informationen über dieses Programm." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc Tue Feb 19 00:41:13 2008 @@ -10,7 +10,7 @@ END IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Network Install" FONT 8, "MS Shell Dlg" BEGIN @@ -21,7 +21,7 @@ END IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Create Shortcut" FONT 8, "MS Shell Dlg" BEGIN @@ -34,7 +34,7 @@ END IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Select Program Folder" FONT 8, "MS Shell Dlg" BEGIN @@ -45,7 +45,7 @@ END IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg" BEGIN @@ -56,7 +56,7 @@ END IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Select an Icon" FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +66,7 @@ END IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Install Program From Floppy Disk or CD-ROM" FONT 8, "MS Shell Dlg" BEGIN @@ -77,7 +77,7 @@ END IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Run Installation Program" FONT 8, "MS Shell Dlg" BEGIN @@ -94,7 +94,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "You have the option to make this new program available to everyone.", 1012, 101, 5, 194, 40 + LTEXT "You have the option to make this new program available to every User.", 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 END @@ -122,7 +122,7 @@ CAPTION "Run Installation Program" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Please specify the uninstall program location", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "Please specify the uninstall program location.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 LTEXT "&Command line for the uninstall program:", IDC_LOCATIONITEM, 9, 57, 237, 8 EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL PUSHBUTTON "B&rowse...", IDC_LOCBROWSE, 178, 69, 66, 14 @@ -145,7 +145,7 @@ END IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Remove Shortcuts/Folders" FONT 8, "MS Shell Dlg" BEGIN @@ -156,12 +156,12 @@ END IDD_ADDLATER DIALOGEX 0, 0, 220, 160 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION CAPTION "Add Later" FONT 8, "MS Shell Dlg" BEGIN LTEXT "You may choose a date and time when you would like to add this program to your computer. For example, you can schedule this to happen when you are away from your computer.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 - AUTORADIOBUTTON "&Add program later ", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + AUTORADIOBUTTON "&Add program later", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 AUTORADIOBUTTON "&Do not add program", IDC_NOTADDPROG, 7, 87, 208, 10 DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP @@ -176,10 +176,10 @@ IDS_LIST_TITLE "List" IDS_SIZE_TITLE "Size (MB)" IDS_LAST_USED "Last Used" - IDS_PROGANDUPDATES "Programs & updates" + IDS_PROGANDUPDATES "Programs & Updates" IDS_PROGRAMS_ONLY "Programs only" IDS_UPDATES_ONLY "Updates only" - IDS_WELCOME_TITLE "Welcome to the Add or Remove Programs" + IDS_WELCOME_TITLE "Welcome to the Assistant to Add or Remove Programs" IDS_WELCOME_MSG "Please choose a category on the left or select application on the list for removing or viewing information." IDS_SEARCH_TEXT "Search in the list..." IDS_REMOVE_BTN "&Remove" Modified: trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/fr… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc Tue Feb 19 00:41:13 2008 @@ -10,7 +10,7 @@ END IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Installation réseau" FONT 8, "MS Shell Dlg" BEGIN @@ -21,7 +21,7 @@ END IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Créer un raccourci" FONT 8, "MS Shell Dlg" BEGIN @@ -34,7 +34,7 @@ END IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Sélectionnez le répertoire du Programme" FONT 8, "MS Shell Dlg" BEGIN @@ -45,7 +45,7 @@ END IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Sélectionnez le titre du Programme" FONT 8, "MS Shell Dlg" BEGIN @@ -56,7 +56,7 @@ END IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Sélectionnez une Icône" FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +66,7 @@ END IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Installer le Programme depuis une Disquette ou un CD-ROM" FONT 8, "MS Shell Dlg" BEGIN @@ -77,7 +77,7 @@ END IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Lancer le Programme d'Installation" FONT 8, "MS Shell Dlg" BEGIN @@ -145,7 +145,7 @@ END IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Supprimer des Raccourci/Répertoires" FONT 8, "MS Shell Dlg" BEGIN @@ -156,7 +156,7 @@ END IDD_ADDLATER DIALOGEX 0, 0, 220, 160 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION CAPTION "Ajouter plus tard" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/ru… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc Tue Feb 19 00:41:13 2008 @@ -10,7 +10,7 @@ END IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ñåòåâàÿ óñòàíîâêà" FONT 8, "MS Shell Dlg" BEGIN @@ -21,7 +21,7 @@ END IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ñîçäàíèå ÿðëûêà" FONT 8, "MS Shell Dlg" BEGIN @@ -34,7 +34,7 @@ END IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Âûáîð ïàïêè" FONT 8, "MS Shell Dlg" BEGIN @@ -45,7 +45,7 @@ END IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Âûáîð íàçâàíèÿ ïðîãðàììû" FONT 8, "MS Shell Dlg" BEGIN @@ -56,7 +56,7 @@ END IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Âûáîð çíà÷êà" FONT 8, "MS Shell Dlg" BEGIN @@ -66,7 +66,7 @@ END IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Óñòàíîâêà ïðîãðàììû ñ äèñêåò èëè êîìïàêò-äèñêà" FONT 8, "MS Shell Dlg" BEGIN @@ -77,7 +77,7 @@ END IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çàïóñê ïðîãðàììû óñòàíîâêè" FONT 8, "MS Shell Dlg" BEGIN @@ -145,7 +145,7 @@ END IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Óäàëåíèå ÿðëûêîâ è ïàïîê" FONT 8, "MS Shell Dlg" BEGIN @@ -156,7 +156,7 @@ END IDD_ADDLATER DIALOGEX 0, 0, 220, 160 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION CAPTION "Îòëîæåííîå äîáàâëåíèå ïðîãðàììû" FONT 8, "MS Shell Dlg" BEGIN 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 Tue Feb 19 00:41:13 2008 @@ -1,6 +1,7 @@ #include "resource.h" #include <windows.h> +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc"

1 0

[dchapyshev] 32415: - Fix formating - Add Russian translation
by dchapyshev＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: dchapyshev Date: Tue Feb 19 00:14:53 2008 New Revision: 32415 URL: http://svn.reactos.org/svn/reactos?rev=32415&view=rev Log: - Fix formating - Add Russian translation Added: trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.c trunk/reactos/dll/cpl/appwiz-new/appwiz.h trunk/reactos/dll/cpl/appwiz-new/appwiz.rc trunk/reactos/dll/cpl/appwiz-new/createlink.c trunk/reactos/dll/cpl/appwiz-new/rsrc.rc 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 Tue Feb 19 00:14:53 2008 @@ -419,12 +419,12 @@ static BOOL GetAppString(LPCWSTR lpKeyName, LPWSTR lpString) { - HKEY hKey; - INT nIndex; - - nIndex = (INT)SendMessage(hAppList,LVM_GETNEXTITEM,-1,LVNI_FOCUSED); - if (nIndex != -1) - { + HKEY hKey; + INT nIndex; + + nIndex = (INT)SendMessage(hAppList,LVM_GETNEXTITEM,-1,LVNI_FOCUSED); + if (nIndex != -1) + { LVITEM item; ZeroMemory(&item, sizeof(LVITEM)); @@ -433,14 +433,14 @@ (VOID) ListView_GetItem(hAppList,&item); hKey = (HKEY)item.lParam; - DWORD dwSize, dwType = REG_SZ; - if (RegQueryValueEx(hKey, lpKeyName, NULL, &dwType, + DWORD dwSize, dwType = REG_SZ; + if (RegQueryValueEx(hKey, lpKeyName, NULL, &dwType, (LPBYTE)lpString, &dwSize) == ERROR_SUCCESS) - { - return TRUE; - } - } - return FALSE; + { + return TRUE; + } + } + return FALSE; } static VOID @@ -860,9 +860,9 @@ { if (-1 != (INT) SendMessage(hAppList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED)) { - EnableWindow(hRemoveBtn, TRUE); - if (GetAppString(L"ModifyPath", NULL)) - EnableWindow(hModifyBtn, TRUE); + EnableWindow(hRemoveBtn, TRUE); + if (GetAppString(L"ModifyPath", NULL)) + EnableWindow(hModifyBtn, TRUE); } ShowAppInfo(); } Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.h (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.h Tue Feb 19 00:14:53 2008 @@ -52,12 +52,12 @@ typedef struct { - DWORD Size; - BOOL Maximized; - INT Left; - INT Top; - INT Right; - INT Bottom; + DWORD Size; + BOOL Maximized; + INT Left; + INT Top; + INT Right; + INT Bottom; } APPWIZSETTINGS; /* appwiz.c */ @@ -65,8 +65,8 @@ HWND hMainWnd, // Main window hActList, // Actions list hAppList, // Programs list - hSearch, //Search line - hRemoveBtn, // Remove button + hSearch, //Search line + hRemoveBtn, // Remove button hModifyBtn; // Modify button APPWIZSETTINGS AppWizSettings; Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.rc Tue Feb 19 00:14:53 2008 @@ -4,9 +4,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" -#define REACTOS_STR_INTERNAL_NAME "appwiz\0" -#define REACTOS_STR_ORIGINAL_FILENAME "appwiz.cpl\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "appwiz\0" +#define REACTOS_STR_ORIGINAL_FILENAME "appwiz.cpl\0" #ifdef _MSC_VER #include <../../../reactos/version.rc> #else Modified: trunk/reactos/dll/cpl/appwiz-new/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/createl… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/createlink.c (original) +++ trunk/reactos/dll/cpl/appwiz-new/createlink.c Tue Feb 19 00:14:53 2008 @@ -4,8 +4,8 @@ * FILE: dll/cpl/appwiz/createlink.c * PURPOSE: ReactOS Software Control Panel * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) - * Dmitry Chapyshev (lentind(a)yandex.ru) - * Johannes Anderwald + * Dmitry Chapyshev (lentind(a)yandex.ru) + * Johannes Anderwald * UPDATE HISTORY: * 06-17-2004 Created */ Added: trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/ru… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc Tue Feb 19 00:14:53 2008 @@ -1,0 +1,199 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Óäàëèòü", ID_APP_REMOVE + MENUITEM "&Èçìåíèòü", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñåòåâàÿ óñòàíîâêà" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Óñ&òàíîâèòü...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&Ïåðå÷èñëåííûå ïðîãðàììû ìîæíî óñòàíîâèòü àâòîìàòè÷åñêè. Âûáåðèòå íóæíóþ ïðîãðàììó èç ñïèñêà è íàæìèòå êíîïêó ""Óñòàíîâèòü"".", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñîçäàíèå ÿðëûêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ýòîò ìàñòåð ïîìîãàåò ñîçäàòü ÿðëûê, óêàçûâàþùèé íà ëîêàëüíûå èëè ñåòåâûå ïðîãðàììû, ôàéëû, ïàïêè, êîìïüþòåðû èëè àäðåñà â Èíòåðíåòå.", -1, 97, 7, 195, 28 + LTEXT "&Óêàæèòå ðàçìåùåíèå îáúåêòà:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Îáçîð...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Äëÿ ïðîäîëæåíèÿ íàæìèòå êíîïêó ""Äàëåå"".", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âûáîð ïàïêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Âûáåðèòå ïàïêó, ãäå áóäåò íàõîäèòüñÿ ÿðëûê:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "Ñîçä&àòü ïàïêó...", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âûáîð íàçâàíèÿ ïðîãðàììû" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ââåäèòå èìÿ ÿðëûêà:", -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 "×òîáû ñîçäàòü ÿðëûê, íàæìèòå êíîïêó ""Ãîòîâî"".", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âûáîð çíà÷êà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Âûáåðèòå ñîîòâåòñòâóþùèé ïðîãðàììå çíà÷îê:", -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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Óñòàíîâêà ïðîãðàììû ñ äèñêåò èëè êîìïàêò-äèñêà" +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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàïóñê ïðîãðàììû óñòàíîâêè" +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 "&Îòêðûòü:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "Îá&çîð...", 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 "Ïîëüçîâàòåëüñêàÿ íàñòðîéêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ìîæíî ýòó íîâóþ ïðîãðàììó ñäåëàòü îáùåäîñòóïíîé.", 1012, 101, 5, 194, 40 + 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 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàâåðøåíèå àäìèíèñòðàòèâíîé óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ïðè íàæàòèè íà êíîïêó ""Ãîòîâî"" âîññòàíàâëèâàåòñÿ ñîïîñòàâëåíèå 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 "Ïîñëå óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Íàæìèòå êíîïêó ""Äàëåå"".", 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 "Çàïóñê ïðîãðàììû óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Óêàæèòå ðàçìåùåíèå ïðîãðàììû îòìåíû óñòàíîâêè", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Êîìàíäíàÿ ñòðîêà ïðîãðàììû îòìåíû óñòàíîâêè:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "Îá&çîð...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Îòìåíà", 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 "Ïðåäóïðåæäåíèå" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Åñòü äðóãèå ïîëüçîâàòåëè, âûïîëíèâøèå âõîä íà ýòîò êîìïüþòåð.", -1, 37, 8, 214, 10 + LTEXT "Åñëè óäàëèòü ýòó ïðîãðàììó â òî âðåìÿ, êîãäà äðóãèå ïîëüçîâàòåëè ðàáîòàþò ñ íåé, ýòà ïðîãðàììà ìîæåò áûòü óäàëåíà íå ïîëíîñòüþ.", -1, 37, 23, 212, 22 + LTEXT "×òîáû íàäëåæàùèì îáðàçîì óäàëèòü ýòó ïðîãðàììó, íàäî ïåðåêëþ÷èòüñÿ è çàâåðøèòü ðàáîòó âñåõ äðóãèõ ïîëüçîâàòåëåé.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Ñìåíèòü ïîëüçîâàòåëÿ", IDC_SWITCHUSER, 29, 81, 92, 14 + PUSHBUTTON "&Ïðîäîëæèòü", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Óäàëåíèå ÿðëûêîâ è ïàïîê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Âûáåðèòå óäàëÿåìûé èç ãëàâíîãî ìåíþ ïóíêò è íàæìèòå êíîïêó ""Óäàëèòü"".", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Óäàëèòü", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Çàêðûòü", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Îòëîæåííîå äîáàâëåíèå ïðîãðàììû" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìîæíî âûáðàòü äàòó è âðåìÿ äîáàâëåíèÿ ýòîé ïðîãðàììû íà êîìïüþòåð. Íàïðèìåð, ìîæíî çàäàòü òî âðåìÿ, êîãäà âû íå áóäåòå ðàáîòàòü çà êîìïüþòåðîì.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Äîáàâèòü ïðîãðàììó ïîçäíåå ", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Íå äîáàâëÿòü ïðîãðàììó", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Îòìåíà", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Óñòàíîâêà è óäàëåíèå ïðîãðàìì" + IDS_CPLSYSTEMDESCRIPTION "Óñòàíîâêà èëè óäàëåíèå ïðîãðàìì è êîìïîíåíòîâ ReactOS." + IDS_UNABLEOPEN_UNINSTKEY "Íå óäàëîñü îòêðûòü êëþ÷ Uninstall" + IDS_LIST_TITLE "Ñïèñîê" + IDS_SIZE_TITLE "Ðàçìåð (Ìá)" + IDS_LAST_USED "Ïîñëåäíèé âûçîâ" + IDS_PROGANDUPDATES "Ïðîãðàììû è îáíîâëåíèÿ" + IDS_PROGRAMS_ONLY "Òîëüêî ïðîãðàììû" + IDS_UPDATES_ONLY "Òîëüêî îáíîâëåíèÿ" + IDS_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â óñòàíîâêó è óäàëåíèå ïðîãðàìì!" + IDS_WELCOME_MSG "Ïîæàëóéñòà, âûáåðèòå êàòåãîðèþ ñëåâà èëè âûáåðèòå ïðèëîæåíèå â ñïèñêå äëÿ óäàëåíèÿ èëè ïðîñìîòðà èíôîðìàöèè." + IDS_SEARCH_TEXT "Ïîèñê â ñïèñêå..." + IDS_REMOVE_BTN "&Óäàëèòü" + IDS_MODIFY_BTN "&Èçìåíèòü" + IDS_UNABLEREAD_UNINSTSTR "Íå óäàëîñü ïðî÷èòàòü UninstallString. Ýòî çíà÷åíèå íåâåðíîå èëè ñîçäàíî MSI-óñòàíîâùèêîì." + IDS_INF_REG_OWNER "Çàðåãèñòðèðîâàíî íà: " + IDS_INF_PRODUCT_ID "Êîä ïðîäóêòà: " + IDS_INF_PUBLISHER "Èçäàòåëü: " + IDS_INF_VERSION "Âåðñèÿ: " + IDS_INF_CONTACT "Êîíòàêòíîå ëèöî: " + IDS_INF_SUP_INFO "Ñâåäåíèÿ î ïîääåðæêå: " + IDS_INF_SUP_PHONE "Òåëåôîí ïîääåðæêè: " + IDS_INF_PRODUCT_UPD "Îáíîâëåíèÿ ïðîäóêòà: " + IDS_INF_README "Ôàéë ""Readme"": " + IDS_INF_COMMENTS "Êîìåíòàðèé: " + IDS_NO_INFORMATION "Íåò èíôîðìàöèè îá ýòîé ïðîãðàììå." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native 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 Tue Feb 19 00:14:53 2008 @@ -3,3 +3,4 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ru-RU.rc"

1 0

[spetreolle] 32414: french translation for appwiz-new little fixes
by spetreolle＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: spetreolle Date: Mon Feb 18 23:39:49 2008 New Revision: 32414 URL: http://svn.reactos.org/svn/reactos?rev=32414&view=rev Log: french translation for appwiz-new little fixes Added: trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild Mon Feb 18 23:39:49 2008 @@ -3,7 +3,7 @@ <module name="appwiz-new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz-new.cpl" unicode="yes" allowwarnings="true"> <importlibrary definition="appwiz.def" /> <include base="appwiz-new">.</include> - <define name="__USE_W32API" /> + <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x0501</define> Modified: trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc Mon Feb 18 23:39:49 2008 @@ -195,5 +195,5 @@ IDS_INF_PRODUCT_UPD "Product Updates: " IDS_INF_README "Readme: " IDS_INF_COMMENTS "Comments: " - IDS_NO_INFORMATION "No information about this program." + IDS_NO_INFORMATION "No information about this program." END Added: trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/fr… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc Mon Feb 18 23:39:49 2008 @@ -1,0 +1,199 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Supprimer", ID_APP_REMOVE + MENUITEM "&Modifier", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Installation réseau" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Installer...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&Le logiciel suivant peut être installé automatiquement par ReactOS. Pour installer un programme, sélectionnez le dans la liste et cliquez sur Installer.", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Créer un raccourci" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Cet assistant vous aide à créer des raccourcis vers des programmes locaux ou en réseau, fichiers, répertoires, ordinateurs, ou des adresses Internet.", -1, 97, 7, 195, 28 + LTEXT "&Indiquez l'emplacement de l'objet :", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&arcourir...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Cliquez sur Suivant pour continuer.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Sélectionnez le répertoire du Programme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Sélectionnez le répertoire où placer le raccourci :", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "Nouveau &répertoire...", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Sélectionnez le titre du Programme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Entrez un nom pour le raccourci :", -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 "Cliquez sur Terminer pour créer le raccourci.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Sélectionnez une Icône" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Sélectionnez une Icône pour le raccourci :", -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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Installer le Programme depuis une Disquette ou un 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Lancer le Programme d'Installation" +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 "&Ouvrir :", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&arcourir...", 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 "Changer l'option utilisateur" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Vous avez l'option de rendre ce nouveau programme accessible à tous.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Installer", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Exécuter", 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 "Terminer l'Installation Admin" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Change ini mapping back by clicking Finish.", 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 "Après l'Installation" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Veuillez appuyer sur suivant.", 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 "Lancer le Programme d'Installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Please specify the uninstall program location", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Command line for the uninstall program:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&arcourir...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Annuler", 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 "Attention" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Il y a d'autres utilisateurs loggués sur cet ordinateur.", -1, 37, 8, 214, 10 + LTEXT "Si vous désinstallez ce programme alors qu'un autre utilisateur le fait tourner, le programme pourrait ne pas se désinstaller complètement.", -1, 37, 23, 212, 22 + LTEXT "Pour modidier ou syupprimer correctement ce programme, changez d'utilisateur et délogguez chaque utilisateur avant de continuer.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Changer d'utilisateur", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Continuer", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Supprimer des Raccourci/Répertoires" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Pour supprimer un objet du menu Démarrer, sélectionnez l'objet et cliquez sur Supprimer.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Supprimer", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Fermer", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ajouter plus tard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Vous pouvez choisir une date et une heure à laquelle vous voudriez ajouter ce programme à votre ordinateur. Par exemple, vous pouvez le programmer quand vous absent de votre ordinateur.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Ajouter le programme plus tard ", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Ne pas ajouter le programme", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Annuler", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ajouter ou Supprimer des Programmes" + IDS_CPLSYSTEMDESCRIPTION "Installer ou supprimer des programmes et des composants de ReactOS." + IDS_UNABLEOPEN_UNINSTKEY "Impossible d'ouvrir la clé de Désinstallation" + IDS_LIST_TITLE "Liste" + IDS_SIZE_TITLE "Taille (MO)" + IDS_LAST_USED "Utilisé en dernier" + IDS_PROGANDUPDATES "Programmes & mises à jour" + IDS_PROGRAMS_ONLY "Programmes seulement" + IDS_UPDATES_ONLY "Mises à jour seulement" + IDS_WELCOME_TITLE "Bienvenue à Ajouter ou Supprimer des Programmes" + IDS_WELCOME_MSG "Veuillez choisir une catégorie à gauche ou sélectionnez une application dans la liste pour la supprimer ou pour voir ses informations." + IDS_SEARCH_TEXT "Chercher dans la liste..." + IDS_REMOVE_BTN "&Supprimer" + IDS_MODIFY_BTN "&Modifier" + IDS_UNABLEREAD_UNINSTSTR "Impossibler de lire UninstallString. Cette entrée est invalide ou a été créée par un installateur MSI." + IDS_INF_REG_OWNER "Utilisateur Enregistré : " + IDS_INF_PRODUCT_ID "ID du Produit : " + IDS_INF_PUBLISHER "Editeur : " + IDS_INF_VERSION "Version: " + IDS_INF_CONTACT "Contact: " + IDS_INF_SUP_INFO "Informations de support : " + IDS_INF_SUP_PHONE "Téléphone du support : " + IDS_INF_PRODUCT_UPD "Mises à jour du Produit : " + IDS_INF_README "Lisez-moi : " + IDS_INF_COMMENTS "Commentaires : " + IDS_NO_INFORMATION "Pas d'informations à propos de ce programme." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain 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 Mon Feb 18 23:39:49 2008 @@ -2,3 +2,4 @@ #include <windows.h> #include "lang/en-US.rc" +#include "lang/fr-FR.rc"

1 0

[dchapyshev] 32413: - Small fix
by dchapyshev＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: dchapyshev Date: Mon Feb 18 23:20:02 2008 New Revision: 32413 URL: http://svn.reactos.org/svn/reactos?rev=32413&view=rev Log: - Small fix Modified: trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc trunk/reactos/dll/cpl/appwiz-new/resource.h Modified: trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc Mon Feb 18 23:20:02 2008 @@ -6,7 +6,6 @@ BEGIN MENUITEM "&Remove", ID_APP_REMOVE MENUITEM "&Modify", ID_APP_MODIFY, GRAYED - MENUITEM "R&epair", ID_APP_REPAIR, GRAYED END END Modified: trunk/reactos/dll/cpl/appwiz-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/resource.h (original) +++ trunk/reactos/dll/cpl/appwiz-new/resource.h Mon Feb 18 23:20:02 2008 @@ -12,7 +12,6 @@ /* menu items */ #define ID_APP_REMOVE 14100 #define ID_APP_MODIFY 14101 -#define ID_APP_REPAIR 14102 /* icons */ #define IDI_CPLSYSTEM 1500

1 0

[dchapyshev] 32412: - Implement new appwiz
by dchapyshev＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: dchapyshev Date: Mon Feb 18 20:25:40 2008 New Revision: 32412 URL: http://svn.reactos.org/svn/reactos?rev=32412&view=rev Log: - Implement new appwiz Added: trunk/reactos/dll/cpl/appwiz-new/ trunk/reactos/dll/cpl/appwiz-new/appwiz.c (with props) trunk/reactos/dll/cpl/appwiz-new/appwiz.def (with props) trunk/reactos/dll/cpl/appwiz-new/appwiz.h (with props) trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild (with props) trunk/reactos/dll/cpl/appwiz-new/appwiz.rc (with props) trunk/reactos/dll/cpl/appwiz-new/createlink.c (with props) trunk/reactos/dll/cpl/appwiz-new/lang/ trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc (with props) trunk/reactos/dll/cpl/appwiz-new/resource.h (with props) trunk/reactos/dll/cpl/appwiz-new/resources/ trunk/reactos/dll/cpl/appwiz-new/resources/1501.ico (with props) trunk/reactos/dll/cpl/appwiz-new/resources/1502.ico (with props) trunk/reactos/dll/cpl/appwiz-new/resources/1503.ico (with props) trunk/reactos/dll/cpl/appwiz-new/resources/applet.ico (with props) trunk/reactos/dll/cpl/appwiz-new/resources/icon.bmp (with props) trunk/reactos/dll/cpl/appwiz-new/resources/search.ico (with props) trunk/reactos/dll/cpl/appwiz-new/resources/select.bmp (with props) trunk/reactos/dll/cpl/appwiz-new/resources/underline.bmp (with props) trunk/reactos/dll/cpl/appwiz-new/resources/watermark.bmp (with props) trunk/reactos/dll/cpl/appwiz-new/rsrc.rc (with props) Modified: trunk/reactos/dll/cpl/cpl.rbuild Added: 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 (added) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.c Mon Feb 18 20:25:40 2008 @@ -1,0 +1,1074 @@ +/* + * + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/appwiz/appwiz.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * UPDATE HISTORY: + * 02-09-2008 Created + */ + +#include "appwiz.h" + +WCHAR* DescriptionHeadline = L""; +WCHAR* DescriptionText = L""; +HBITMAP hUnderline; +WCHAR Strings[2][256]; +HICON hSearchIcon; +HTREEITEM hRootItem; // First item in actions list +HFONT hMainFont; +HIMAGELIST hImageAppList; // Image list for programs list +BOOL bAscending = TRUE; // Sorting programs list + +VOID +ShowMessage(WCHAR* title, WCHAR* message) +{ + DescriptionHeadline = title; + DescriptionText = message; + InvalidateRect(hMainWnd,NULL,TRUE); + UpdateWindow(hMainWnd); +} + +static VOID +DrawBitmap(HDC hdc, int x, int y, HBITMAP hBmp) +{ + BITMAP bm; + HDC hdcMem = CreateCompatibleDC(hdc); + + SelectObject(hdcMem, hBmp); + GetObject(hBmp, sizeof(bm), &bm); + TransparentBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, bm.bmWidth, bm.bmHeight, 0xFFFFFF); + + DeleteDC(hdcMem); +} + +static VOID +DrawDescription(HDC hdc, RECT DescriptionRect) +{ + int i; + HFONT Font; + RECT Rect = {DescriptionRect.left+5, DescriptionRect.top+5, DescriptionRect.right-2, DescriptionRect.top+22}; + + // Backgroud + Rectangle(hdc, DescriptionRect.left, DescriptionRect.top, DescriptionRect.right, DescriptionRect.bottom); + + // Underline + for (i=DescriptionRect.left+1;i<DescriptionRect.right-1;i++) + DrawBitmap(hdc, i, DescriptionRect.top+22, hUnderline); // less code then stretching ;) + + // Headline + Font = CreateFont(-14, 0, 0, 0, FW_EXTRABOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); + SelectObject(hdc, Font); + DrawText(hdc, DescriptionHeadline, lstrlen(DescriptionHeadline), &Rect, DT_SINGLELINE|DT_NOPREFIX); + DeleteObject(Font); + + // Description + Font = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); + SelectObject(hdc, Font); + Rect.top += 35; + Rect.bottom = DescriptionRect.bottom-2; + DrawText(hdc, DescriptionText, lstrlen(DescriptionText), &Rect, DT_WORDBREAK|DT_NOPREFIX); // ToDo: Call TabbedTextOut to draw a nice table + DeleteObject(Font); +} + +static VOID +ResizeControl(HWND hwnd, int x1, int y1, int x2, int y2) +{ + MoveWindow(hwnd, x1, y1, x2-x1, y2-y1, TRUE); +} + +/* + AddListColumn - adding column items to Application list +*/ +static VOID +AddListColumn(VOID) +{ + LV_COLUMN column; + RECT rect; + WCHAR szBuf[MAX_PATH]; + + GetClientRect(hMainWnd, &rect); + ZeroMemory(&column, sizeof(LV_COLUMN)); + column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + column.fmt = LVCFMT_LEFT; + column.iSubItem = 0; + LoadString(hApplet, IDS_LIST_TITLE, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + column.pszText = szBuf; + column.cx = 320; + (void)ListView_InsertColumn(hAppList, 0, &column); + + column.cx = 75; + column.iSubItem = 1; + LoadString(hApplet, IDS_LAST_USED, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + column.pszText = szBuf; + (void)ListView_InsertColumn(hAppList,1,&column); + + column.cx = 70; + column.iSubItem = 2; + column.fmt = LVCFMT_RIGHT; + LoadString(hApplet, IDS_SIZE_TITLE, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + column.pszText = szBuf; + (void)ListView_InsertColumn(hAppList,2,&column); +} + +static VOID +AddTreeViewItems(VOID) +{ + HIMAGELIST hImageList; + WCHAR szBuf[1024]; + int Index[2]; + + hImageList = ImageList_Create(16, 16, ILC_COLORDDB, 1, 1); + SendMessageW(hActList, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hImageList); + + Index[0] = ImageList_Add(hImageList, LoadBitmap(hApplet, MAKEINTRESOURCE(IDB_SELECT)), NULL); + 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; + Insert.hParent = TVI_ROOT; + Insert.item.iSelectedImage = Index[0]; + + Insert.item.lParam = 0; + LoadString(hApplet, IDS_PROGANDUPDATES, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + Insert.item.pszText = szBuf; + Insert.item.iImage = Index[1]; + hRootItem = TreeView_InsertItem(hActList, &Insert); + + Insert.item.lParam = 1; + LoadString(hApplet, IDS_PROGRAMS_ONLY, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + Insert.item.pszText = szBuf; + Insert.item.iImage = Index[1]; + (VOID) TreeView_InsertItem(hActList, &Insert); + + Insert.item.lParam = 2; + LoadString(hApplet, IDS_UPDATES_ONLY, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + Insert.item.pszText = szBuf; + Insert.item.iImage = Index[1]; + (VOID) TreeView_InsertItem(hActList, &Insert); + // Select first item + (VOID) TreeView_SelectItem(hActList, hRootItem); +} + +/* + InitControls - function for init all controls on main window +*/ +static VOID +InitControls(VOID) +{ + WCHAR szBuf[1024]; + + hMainFont = CreateFont(-11 , 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); + + hActList = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEWW, L"", + WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, + 0, 0, 0, 0, hMainWnd, NULL, hApplet, NULL); + + hAppList = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEWW, L"", + WS_CHILD|WS_VISIBLE|WS_BORDER|LVS_SORTASCENDING|LVS_REPORT, + 0, 0, 0, 0, hMainWnd, NULL, hApplet, NULL); + + (VOID) ListView_SetExtendedListViewStyle(hAppList, LVS_EX_FULLROWSELECT); + + LoadString(hApplet, IDS_SEARCH_TEXT, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + hSearch = CreateWindowEx(WS_EX_CLIENTEDGE, L"EDIT", szBuf, WS_CHILD|WS_VISIBLE|WS_BORDER|ES_LEFT, + 0, 0, 0, 0, hMainWnd, NULL, hApplet, NULL); + SendMessage(hSearch, WM_SETFONT, (WPARAM)hMainFont, 0); + // Remove button + LoadString(hApplet, IDS_REMOVE_BTN, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + hRemoveBtn = CreateWindowEx(0, L"BUTTON", szBuf, WS_CHILD|WS_VISIBLE|WS_DISABLED|BS_TEXT, + 0, 0, 0, 0, hMainWnd, NULL, hApplet, NULL); + SendMessage(hRemoveBtn, WM_SETFONT, (WPARAM)hMainFont, 0); + // Modify button + LoadString(hApplet, IDS_MODIFY_BTN, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + hModifyBtn = CreateWindowEx(0, L"BUTTON", szBuf, WS_CHILD|WS_VISIBLE|WS_DISABLED|BS_TEXT, + 0, 0, 0, 0, hMainWnd, NULL, hApplet, NULL); + SendMessage(hModifyBtn, WM_SETFONT, (WPARAM)hMainFont, 0); + + hUnderline = LoadBitmap(hApplet, MAKEINTRESOURCE(IDB_UNDERLINE)); + hSearchIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_SEARCH)); + + AddListColumn(); + AddTreeViewItems(); +} + +/* + GetARPInfo - Getting information from ARP cache + Input: szName - Application Name + Output: szPath - Path to image file + szSize - Application size + szLastUsed - Last used time +*/ +static VOID +GetARPInfo(LPCWSTR szName, LPWSTR szPath, LPWSTR szSize, LPWSTR szLastUsed) +{ + APPARPINFO aai = {0}; + DWORD dwSize = sizeof(aai), dwType = REG_BINARY; + SYSTEMTIME systime, localtime; + WCHAR szBuf[MAX_PATH]; + HKEY hKey; + + swprintf(szBuf, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Management\\ARPCache\\%s", szName); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + ZeroMemory(&aai, sizeof(APPARPINFO)); + if ((RegQueryValueEx(hKey, L"SlowInfoCache", NULL, &dwType, (LPBYTE)&aai, &dwSize) == ERROR_SUCCESS) && + (aai.Size == sizeof(APPARPINFO))) + { + // Getting path to image + wcscpy(szPath, aai.ImagePath); + + // Getting application size + if (aai.AppSize < (ULONGLONG) 2000000000) + { + swprintf(szSize, L"%.2f", (float)aai.AppSize/(1024*1024)); + } + else wcscpy(szSize,L"---"); + + // Getting last used + if (FileTimeToSystemTime(&aai.LastUsed, &systime)) + { + if (SystemTimeToTzSpecificLocalTime(NULL, &systime, &localtime)) + { + if (((int)localtime.wYear > 1900) && ((int)localtime.wYear < 3000)) + { + swprintf(szLastUsed, L"%02d.%02d.%02d", localtime.wMonth, localtime.wDay, localtime.wYear); + } + else wcscpy(szLastUsed,L"---"); + } + else wcscpy(szLastUsed,L"---"); + } + else wcscpy(szLastUsed,L"---"); + } + else + { + wcscpy(szPath,L"---"); + wcscpy(szSize,L"---"); + wcscpy(szLastUsed,L"---"); + } + } + RegCloseKey(hKey); +} + +/* + AddItemToList - create application list + + hSubKey - handle to the sub key for adding to LPARAM + szDisplayName - display name + ItemIndex - item index + AppName - application name (for getting ARPCache info) +*/ +static VOID +AddItemToList(LPARAM hSubKey, LPWSTR szDisplayName, INT ItemIndex, LPWSTR AppName) +{ + int index; + HICON hIcon = NULL; + LV_ITEM listItem; + WCHAR IconPath[MAX_PATH], AppSize[256], LastUsed[256]; + + GetARPInfo(AppName, IconPath, AppSize, LastUsed); + + if (GetFileAttributes(IconPath) != 0xFFFFFFFF) + { + // FIXME: This function not getting 32-bits icon + ExtractIconEx(IconPath, 0, NULL, &hIcon, 1); + } + + if (hIcon == NULL) + { + hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION); + } + index = ImageList_AddIcon(hImageAppList, hIcon); + DestroyIcon(hIcon); + + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + listItem.pszText = (LPTSTR)szDisplayName; + 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); +} + +/* + ShowMode: + if ShowMode = 0 - programs and updates + if ShowMode = 1 - show programs only + if ShowMode = 2 - show updates only +*/ +static VOID +FillSoftwareList(INT ShowMode) +{ + WCHAR pszName[MAX_PATH]; + WCHAR pszDisplayName[MAX_PATH]; + WCHAR pszParentKeyName[MAX_PATH]; + FILETIME FileTime; + HKEY hKey; + HKEY hSubKey; + DWORD dwType; + DWORD dwSize = MAX_PATH; + DWORD dwValue = 0; + BOOL bIsUpdate = FALSE; + BOOL bIsSystemComponent = FALSE; + INT ItemIndex = 0; + + (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); + switch (pDevMode.dmBitsPerPel) + { + case 32: ColorDepth = ILC_COLOR32; break; + case 24: ColorDepth = ILC_COLOR24; break; + case 16: ColorDepth = ILC_COLOR16; break; + case 8: ColorDepth = ILC_COLOR8; break; + case 4: ColorDepth = ILC_COLOR4; break; + default: ColorDepth = ILC_COLOR; break; + } + + hImageAppList = ImageList_Create(16, 16, ColorDepth | ILC_MASK, 0, 1); + SendMessage(hAppList, WM_SETREDRAW, FALSE, 0); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", + &hKey) != ERROR_SUCCESS) + { + WCHAR Buf[256]; + + LoadString(hApplet, IDS_UNABLEOPEN_UNINSTKEY, Buf, sizeof(Buf) / sizeof(WCHAR)); + MessageBox(hMainWnd, Buf, NULL, MB_ICONWARNING); + return; + } + + ItemIndex = 0; + dwSize = MAX_PATH; + while (RegEnumKeyEx(hKey, ItemIndex, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) + { + if (RegOpenKey(hKey,pszName,&hSubKey) == ERROR_SUCCESS) + { + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + if (RegQueryValueEx(hSubKey, L"SystemComponent", + NULL, &dwType, + (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + { + bIsSystemComponent = (dwValue == 0x1); + } + else + { + bIsSystemComponent = FALSE; + } + + dwType = REG_SZ; + dwSize = MAX_PATH; + bIsUpdate = (RegQueryValueEx(hSubKey, L"ParentKeyName", + NULL, &dwType, + (LPBYTE)pszParentKeyName, + &dwSize) == ERROR_SUCCESS); + dwSize = MAX_PATH; + if (RegQueryValueEx(hSubKey, L"DisplayName", + NULL, &dwType, + (LPBYTE)pszDisplayName, + &dwSize) == ERROR_SUCCESS) + { + if ((ShowMode < 0)||(ShowMode > 2)) ShowMode = 0; + if (!bIsSystemComponent) + { + if (ShowMode == 0) + { + AddItemToList((LPARAM)hSubKey, (LPWSTR)pszDisplayName, ItemIndex, pszName); + } + if ((ShowMode == 1)&&(!bIsUpdate)) + { + AddItemToList((LPARAM)hSubKey, (LPWSTR)pszDisplayName, ItemIndex, pszName); + } + if ((ShowMode == 2)&&(bIsUpdate)) + { + AddItemToList((LPARAM)hSubKey, (LPWSTR)pszDisplayName, ItemIndex, pszName); + } + } + } + } + + dwSize = MAX_PATH; + ItemIndex++; + } + + (VOID) ListView_SetImageList(hAppList, hImageAppList, LVSIL_SMALL); + SendMessage(hAppList, WM_SETREDRAW, TRUE, 0); + RegCloseKey(hSubKey); + RegCloseKey(hKey); +} + +static BOOL +GetAppString(LPCWSTR lpKeyName, LPWSTR lpString) +{ + HKEY hKey; + INT nIndex; + + nIndex = (INT)SendMessage(hAppList,LVM_GETNEXTITEM,-1,LVNI_FOCUSED); + if (nIndex != -1) + { + LVITEM item; + + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = nIndex; + (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) + { + return TRUE; + } + } + return FALSE; +} + +static VOID +CallUninstall(VOID) +{ + INT nIndex; + HKEY hKey; + DWORD dwType, dwRet; + WCHAR pszUninstallString[MAX_PATH]; + DWORD dwSize; + MSG msg; + + nIndex = (INT)SendMessage(hAppList,LVM_GETNEXTITEM,-1,LVNI_FOCUSED); + if (nIndex != -1) + { + LVITEM item; + + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = nIndex; + (VOID) ListView_GetItem(hAppList,&item); + hKey = (HKEY)item.lParam; + + dwType = REG_SZ; + dwSize = MAX_PATH; + if (RegQueryValueEx(hKey, L"UninstallString", NULL, &dwType, + (LPBYTE)pszUninstallString, &dwSize) == ERROR_SUCCESS) + { + STARTUPINFO si; + PROCESS_INFORMATION pi; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = SW_SHOW; + if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) + { + CloseHandle(pi.hThread); + EnableWindow(hMainWnd, FALSE); + + for (;;) + { + dwRet = MsgWaitForMultipleObjects(1, &pi.hProcess, FALSE, INFINITE, QS_ALLEVENTS); + if (dwRet == WAIT_OBJECT_0 + 1) + { + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + else if (dwRet == WAIT_OBJECT_0 || dwRet == WAIT_FAILED) + break; + } + CloseHandle(pi.hProcess); + + EnableWindow(hMainWnd, TRUE); + // Disable all buttons + EnableWindow(hRemoveBtn,FALSE); + EnableWindow(hModifyBtn,FALSE); + // Update software list + FillSoftwareList(0); + SetActiveWindow(hMainWnd); + } + } + else + { + WCHAR szBuf[256]; + + LoadString(hApplet, IDS_UNABLEREAD_UNINSTSTR, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + MessageBox(hMainWnd, szBuf, NULL, MB_ICONWARNING); + } + } +} + +static VOID +ShowPopupMenu(HWND hwndDlg, INT xPos, INT yPos) +{ + INT nIndex; + nIndex = (INT)SendMessage(hAppList,LVM_GETNEXTITEM,-1,LVNI_FOCUSED); + if ( nIndex != -1) + { + POINT pt; + RECT lvRect; + HMENU hMenu; + + GetCursorPos(&pt); + + GetWindowRect(hAppList, &lvRect); + if (PtInRect(&lvRect, pt)) + { + hMenu = GetSubMenu(LoadMenu(hApplet, MAKEINTRESOURCE(IDR_POPUP_APP)),0); + TrackPopupMenuEx(hMenu, TPM_RIGHTBUTTON, xPos, yPos, hwndDlg, NULL); + DestroyMenu(hMenu); + } + } +} + +static VOID +GetAppInfo(LPWSTR lpInfo) +{ + WCHAR szBuf[1024], szDesc[1024]; + INT iIndex; + HKEY hKey; + + iIndex = SendMessage(hAppList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + if (iIndex != -1) + { + LVITEM item; + DWORD dwSize = 2048; + + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = iIndex; + (VOID) ListView_GetItem(hAppList,&item); + hKey = (HKEY)item.lParam; + + wcscpy(lpInfo,L"\0"); + if (RegQueryValueEx(hKey, L"Publisher", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_PUBLISHER, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + //wcscat(lpInfo, szDesc); + swprintf(lpInfo, L"%s%s\n", szDesc, szBuf); + } + if (RegQueryValueEx(hKey, L"RegOwner", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_REG_OWNER, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"ProductID", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_PRODUCT_ID, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"DisplayVersion", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_VERSION, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"Contact", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_CONTACT, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"HelpLink", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_SUP_INFO, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"HelpTelephone", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_SUP_PHONE, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"URLUpdateInfo", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_PRODUCT_UPD, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"Readme", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_README, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (RegQueryValueEx(hKey, L"Comments", NULL, NULL, (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_INF_COMMENTS, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscat(lpInfo, szDesc); + swprintf(lpInfo,L"%s%s\n", lpInfo, szBuf); + } + if (wcslen(lpInfo) < 10) + { + LoadString(hApplet, IDS_NO_INFORMATION, szDesc, sizeof(szDesc) / sizeof(WCHAR)); + wcscpy(lpInfo, szDesc); + } + } +} + +static VOID +ShowAppInfo(VOID) +{ + WCHAR Info[2048], szBuf[1024]; + + if (-1 != (INT) SendMessage(hAppList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED)) + { + GetAppInfo(Info); + ListView_GetItemText(hAppList, SendMessage(hAppList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED), 0, szBuf, sizeof(szBuf)); + ShowMessage(szBuf, Info); + } +} + +static VOID +GetListItemText(LPARAM lParam1, LPARAM lParam2, INT iSubItem, LPWSTR Item1, LPWSTR Item2) +{ + LVFINDINFO find; + INT iIndex; + + find.flags = LVFI_PARAM; + + find.lParam = lParam1; + iIndex = ListView_FindItem(hAppList, -1, &find); + ListView_GetItemText(hAppList, iIndex, iSubItem, Item1, sizeof(Item1)); + + find.lParam = lParam2; + iIndex = ListView_FindItem(hAppList, -1, &find); + ListView_GetItemText(hAppList, iIndex, iSubItem, Item2, sizeof(Item2)); +} + +static INT CALLBACK +CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) +{ + WCHAR szItem1[MAX_PATH], szItem2[MAX_PATH]; + + switch ((INT)lParamSort) + { + case 0: // Name + { + GetListItemText(lParam1, lParam2, 0, szItem1, szItem2); + if (bAscending == TRUE) + return wcscmp(szItem2, szItem1); + else + return wcscmp(szItem1, szItem2); + } + case 1: // Date + GetListItemText(lParam1, lParam2, 1, szItem1, szItem2); + if (bAscending == TRUE) + return wcscmp(szItem2, szItem1); + else + return wcscmp(szItem1, szItem2); + case 2: // Size + { + // FIXME: No correct sorting by application size + INT Size1, Size2; + + GetListItemText(lParam1, lParam2, 2, szItem1, szItem2); + if (wcscmp(szItem1, L"---") == 0) wcscpy(szItem1, L"0"); + if (wcscmp(szItem2, L"---") == 0) wcscpy(szItem2, L"0"); + Size1 = _wtoi(szItem1); + Size2 = _wtoi(szItem2); + if (Size1 < Size2) + { + if(bAscending == TRUE) + return -1; + else + return 1; + } + else if (Size1 == Size2) + { + return 0; + } + else if (Size1 > Size2) + { + if(bAscending == TRUE) + return 1; + else + return -1; + } + } + } + + return 0; +} + +static BOOL +LoadSettings(VOID) +{ + HKEY hKey; + DWORD dwSize; + BOOL Ret; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\ReactOS\\AppWiz", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + 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; + } + else Ret = FALSE; + } + else Ret = FALSE; + + RegCloseKey(hKey); + return Ret; +} + +static BOOL +SaveSettings(VOID) +{ + HKEY hKey; + BOOL Ret; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, L"Software\\ReactOS\\AppWiz", 0, NULL, + 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; + } + else Ret = FALSE; + + RegCloseKey(hKey); + return Ret; +} + +static LRESULT CALLBACK +WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + static RECT DescriptionRect; + WCHAR szBuf[1024]; + + switch (Message) + { + case WM_CREATE: + { + hMainWnd = hwnd; + MoveWindow(hMainWnd, AppWizSettings.Left, AppWizSettings.Top, + AppWizSettings.Right - AppWizSettings.Left, + AppWizSettings.Bottom - AppWizSettings.Top, TRUE); + if (AppWizSettings.Maximized) ShowWindow(hMainWnd, SW_MAXIMIZE); + ShowMessage(Strings[0],Strings[1]); // Welcome message + InitControls(); + } + break; + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case ID_APP_REMOVE: + CallUninstall(); + break; + } + if(HIWORD(wParam) == BN_CLICKED) + { + if (lParam == (LPARAM)hRemoveBtn) + { + CallUninstall(); + } + } + if (lParam == (LPARAM)hSearch) + { + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + { + WCHAR Tmp[1024]; + + LoadString(hApplet, IDS_SEARCH_TEXT, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + GetWindowText(hSearch, Tmp, 1024); + if (wcscmp(szBuf, Tmp) == 0) SetWindowText(hSearch, L""); + } + break; + case EN_KILLFOCUS: + { + GetWindowText(hSearch, szBuf, 1024); + if (wcslen(szBuf) < 1) + { + LoadString(hApplet, IDS_SEARCH_TEXT, szBuf, sizeof(szBuf) / sizeof(WCHAR)); + SetWindowText(hSearch, szBuf); + } + } + break; + case EN_CHANGE: + break; + } + } + } + break; + case WM_PAINT: + { + 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; + case WM_NOTIFY: + { + LPNMHDR data = (LPNMHDR)lParam; + + switch (data->code) + { + case TVN_SELCHANGED: + if(data->hwndFrom == hActList) + { + // Add items to programs list + FillSoftwareList(((LPNMTREEVIEW)lParam)->itemNew.lParam); + // Set default titile and message + ShowMessage(Strings[0], Strings[1]); + // Disable all buttons + EnableWindow(hRemoveBtn, FALSE); + EnableWindow(hModifyBtn, FALSE); + } + break; + case NM_CLICK: + if(data->hwndFrom == hAppList) + { + if (-1 != (INT) SendMessage(hAppList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED)) + { + EnableWindow(hRemoveBtn, TRUE); + if (GetAppString(L"ModifyPath", NULL)) + EnableWindow(hModifyBtn, TRUE); + } + ShowAppInfo(); + } + break; + case NM_DBLCLK: + if(data->hwndFrom == hAppList) + { + if (-1 != (INT) SendMessage(hAppList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED)) + { + CallUninstall(); + } + } + break; + case LVN_COLUMNCLICK: + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; + + (VOID) ListView_SortItems(hAppList, CompareFunc, pnmv->iSubItem); + if (bAscending == TRUE) + { + bAscending = FALSE; + } + else + { + bAscending = TRUE; + } + } + break; + } + } + break; + case WM_SIZING: + { + LPRECT pRect = (LPRECT)lParam; + if (pRect->right-pRect->left < 520) + pRect->right = pRect->left + 520; + + if (pRect->bottom-pRect->top < 400) + pRect->bottom = pRect->top + 400; + } + break; + case WM_SIZE: + { + // Actions list + ResizeControl(hActList, 0, 1, 150, HIWORD(lParam)-180); + + // Applications list + ResizeControl(hAppList, 152, 25, LOWORD(lParam), HIWORD(lParam)-180); + + // 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 + MoveWindow(hModifyBtn, LOWORD(lParam)-208, HIWORD(lParam)-30, 100, 25, TRUE); // Modify button + + (VOID) ListView_SetColumnWidth(hAppList, 0, LOWORD(lParam)-330); + + // Update title and info + ShowAppInfo(); + } + break; + case WM_ACTIVATEAPP: + ShowAppInfo(); + break; + case WM_CONTEXTMENU: + { + // Show popup menu for programs list + ShowPopupMenu(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + } + break; + case WM_DESTROY: + { + WINDOWPLACEMENT wp; + + // Save settings + ShowWindow(hMainWnd, SW_HIDE); + wp.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(hMainWnd, &wp); + AppWizSettings.Left = wp.rcNormalPosition.left; + 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; + SaveSettings(); + // Destroy all and quit + DeleteObject(hMainFont); + DeleteObject(hSearchIcon); + PostQuitMessage(0); + } + break; + } + return DefWindowProc(hwnd, Message, wParam, lParam); +} + +static VOID +InitSettings(VOID) +{ + if (!LoadSettings()) + { + AppWizSettings.Maximized = FALSE; + AppWizSettings.Left = 0; + AppWizSettings.Top = 0; + AppWizSettings.Right = 520; + AppWizSettings.Bottom = 400; + } +} + +static INT +MainWindowCreate(VOID) +{ + WNDCLASS WndClass = {0}; + MSG msg; + WCHAR szBuf[256]; + + // Load welcome strings + LoadString(hApplet, IDS_WELCOME_TITLE, Strings[0], sizeof(szBuf) / sizeof(WCHAR)); + LoadString(hApplet, IDS_WELCOME_MSG, Strings[1], sizeof(szBuf) / sizeof(WCHAR)); + + InitSettings(); + + // Create the window + WndClass.lpszClassName = L"rosappwiz"; + WndClass.lpfnWndProc = (WNDPROC)WndProc; + WndClass.hInstance = hApplet; + WndClass.style = CS_HREDRAW | CS_VREDRAW; + WndClass.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + WndClass.hCursor = LoadCursor(hApplet, IDC_ARROW); + WndClass.hbrBackground = (HBRUSH)COLOR_BTNFACE + 1; + + if (!RegisterClass(&WndClass)) return 0; + + LoadString(hApplet, IDS_CPLSYSTEMNAME, szBuf, 256); + hMainWnd = CreateWindow(L"rosappwiz", szBuf, + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_VISIBLE | WS_CAPTION, + CW_USEDEFAULT, CW_USEDEFAULT, + 0, 0, NULL, NULL, hApplet, NULL); + + // Show it + ShowWindow(hMainWnd, SW_SHOW); + UpdateWindow(hMainWnd); + + // Message Loop + while(GetMessage(&msg,NULL,0,0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return 0; +} + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + CPLINFO *CPlInfo; + DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl); + + i = (DWORD)lParam1; + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 1; + + case CPL_INQUIRE: + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = IDI_CPLSYSTEM; + CPlInfo->idName = IDS_CPLSYSTEMNAME; + CPlInfo->idInfo = IDS_CPLSYSTEMDESCRIPTION; + break; + + case CPL_DBLCLK: + MainWindowCreate(); + break; + } + + return FALSE; +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + CoInitialize(NULL); + hApplet = hinstDLL; + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/cpl/appwiz-new/appwiz.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.def (added) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.def Mon Feb 18 20:25:40 2008 @@ -1,0 +1,9 @@ +LIBRARY appwiz.cpl + +EXPORTS +CPlApplet@16 +;NewLinkHere@16 +;NewLinkHereA@16 +;NewLinkHereW@16 + +; EOF Propchange: trunk/reactos/dll/cpl/appwiz-new/appwiz.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/appwiz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.h (added) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.h Mon Feb 18 20:25:40 2008 @@ -1,0 +1,78 @@ +#ifndef __CPL_APPWIZ_H +#define __CPL_APPWIZ_H + +#define COBJMACROS +#include <windows.h> +#include <windowsx.h> /* GET_X/Y_LPARAM */ +#include <commctrl.h> +#include <cpl.h> +#include <prsht.h> +#include <stdlib.h> +#include <stdio.h> +#include <wchar.h> +#include <stdlib.h> +#include <stdarg.h> +#include <process.h> +#include <prsht.h> +#include <shlobj.h> +#include <objbase.h> +#include <shobjidl.h> +#include <shlguid.h> +#include <richedit.h> + +#include "resource.h" + +typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID); + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + CPLAPPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +typedef struct +{ + WCHAR szTarget[MAX_PATH]; + WCHAR szWorkingDirectory[MAX_PATH]; + WCHAR szDescription[MAX_PATH]; + WCHAR szLinkName[MAX_PATH]; +} CREATE_LINK_CONTEXT, *PCREATE_LINK_CONTEXT; + +typedef struct +{ + DWORD Size; + DWORD Masks; + ULONGLONG AppSize; + FILETIME LastUsed; + int TimesUsed; + WCHAR ImagePath[MAX_PATH]; +} APPARPINFO; + +typedef struct +{ + DWORD Size; + BOOL Maximized; + INT Left; + INT Top; + INT Right; + INT Bottom; +} APPWIZSETTINGS; + +/* appwiz.c */ +HINSTANCE hApplet; // Main applet instance +HWND hMainWnd, // Main window + hActList, // Actions list + hAppList, // Programs list + hSearch, //Search line + hRemoveBtn, // Remove button + hModifyBtn; // Modify button + +APPWIZSETTINGS AppWizSettings; + +void ShowLastWin32Error(HWND hWndOwner); + +#endif /* __CPL_APPWIZ_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/appwiz-new/appwiz.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild (added) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild Mon Feb 18 20:25:40 2008 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="appwiz-new" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz-new.cpl" unicode="yes" allowwarnings="true"> + <importlibrary definition="appwiz.def" /> + <include base="appwiz-new">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x0501</define> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>comctl32</library> + <library>msvcrt</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> + <library>msimg32</library> + <library>gdi32</library> + <file>appwiz.c</file> + <file>createlink.c</file> + <file>appwiz.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/appwiz-new/appwiz.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.rc Mon Feb 18 20:25:40 2008 @@ -1,0 +1,27 @@ +#include "resource.h" +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "appwiz\0" +#define REACTOS_STR_ORIGINAL_FILENAME "appwiz.cpl\0" +#ifdef _MSC_VER +#include <../../../reactos/version.rc> +#else +#include <reactos/version.rc> +#endif + +IDI_CPLSYSTEM ICON "resources/applet.ico" +IDI_APPICO ICON "resources/1501.ico" +IDI_INSTICO ICON "resources/1502.ico" +IDI_RECBINICO ICON "resources/1503.ico" +IDI_SEARCH ICON "resources/search.ico" + +IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_UNDERLINE BITMAP "resources/underline.bmp" +IDB_SELECT BITMAP "resources/select.bmp" +IDB_ICON BITMAP "resources/icon.bmp" + +#include "rsrc.rc" Propchange: trunk/reactos/dll/cpl/appwiz-new/appwiz.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/createl… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/createlink.c (added) +++ trunk/reactos/dll/cpl/appwiz-new/createlink.c Mon Feb 18 20:25:40 2008 @@ -1,0 +1,13 @@ +/* + * + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/appwiz/createlink.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) + * Dmitry Chapyshev (lentind(a)yandex.ru) + * Johannes Anderwald + * UPDATE HISTORY: + * 06-17-2004 Created + */ + +#include "appwiz.h" Propchange: trunk/reactos/dll/cpl/appwiz-new/createlink.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc Mon Feb 18 20:25:40 2008 @@ -1,0 +1,200 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Remove", ID_APP_REMOVE + MENUITEM "&Modify", ID_APP_MODIFY, GRAYED + MENUITEM "R&epair", ID_APP_REPAIR, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Network Install" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Install...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&The following software can be automatically installed by ReactOS. To install a program, select it from the list and click Install.", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "This wizard helps you to create shortcuts to local or network programs, files, folders, computers, or Internet addresses.", -1, 97, 7, 195, 28 + LTEXT "&Type the location of the item:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Click Next to continue.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Select Program Folder" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Select a folder to place this shortcut in:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "New &Folder...", 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Type a name for this shortcut:", -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 "Click Finish to create the shortcut.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Select an Icon" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Select an icon for the shortcut:", -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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Install Program From Floppy Disk or 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 | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Run Installation Program" +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 "&Open:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", 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 "Change User Option" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "You have the option to make this new program available to everyone.", 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 +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Finish Admin Install" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Change ini mapping back by clicking Finish.", 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 "After Installation" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Please press Next.", 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 "Run Installation Program" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Please specify the uninstall program location", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Command line for the uninstall program:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Cancel", 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 "Warning" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "There are other users logged on to this computer.", -1, 37, 8, 214, 10 + LTEXT "If you uninstall this program while another user is running it, the program might not uninstall completely.", -1, 37, 23, 212, 22 + LTEXT "To properly change or remove this program, switch to and log off each user before you continue.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Switch User", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Continue", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Remove Shortcuts/Folders" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&To remove an item from the Start menu, select the item and click Remove.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Remove", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Close", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Add Later" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "You may choose a date and time when you would like to add this program to your computer. For example, you can schedule this to happen when you are away from your computer.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Add program later ", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Do not add program", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Add or Remove Programs" + IDS_CPLSYSTEMDESCRIPTION "Install or remove programs and ReactOS components." + IDS_UNABLEOPEN_UNINSTKEY "Unable to open Uninstall Key" + IDS_LIST_TITLE "List" + IDS_SIZE_TITLE "Size (MB)" + IDS_LAST_USED "Last Used" + IDS_PROGANDUPDATES "Programs & updates" + IDS_PROGRAMS_ONLY "Programs only" + IDS_UPDATES_ONLY "Updates only" + IDS_WELCOME_TITLE "Welcome to the Add or Remove Programs" + IDS_WELCOME_MSG "Please choose a category on the left or select application on the list for removing or viewing information." + IDS_SEARCH_TEXT "Search in the list..." + IDS_REMOVE_BTN "&Remove" + IDS_MODIFY_BTN "&Modify" + IDS_UNABLEREAD_UNINSTSTR "Unable to read UninstallString. This entry is invalid or has been created by an MSI installer." + IDS_INF_REG_OWNER "Registered Owner: " + IDS_INF_PRODUCT_ID "Product ID: " + IDS_INF_PUBLISHER "Publisher: " + IDS_INF_VERSION "Version: " + IDS_INF_CONTACT "Contact: " + IDS_INF_SUP_INFO "Support Information: " + IDS_INF_SUP_PHONE "Support Telephone: " + IDS_INF_PRODUCT_UPD "Product Updates: " + IDS_INF_README "Readme: " + IDS_INF_COMMENTS "Comments: " + IDS_NO_INFORMATION "No information about this program." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/resource.h (added) +++ trunk/reactos/dll/cpl/appwiz-new/resource.h Mon Feb 18 20:25:40 2008 @@ -1,0 +1,100 @@ +#ifndef __CPL_RESOURCE_H +#define __CPL_RESOURCE_H + +/* dialog sizes */ +#define SHORTCUTDLG_WIDTH 300 +#define SHORTCUTDLG_HEIGHT 160 +#define WATERMARK_WIDTH 90 + +/* menus */ +#define IDR_POPUP_APP 14000 + +/* menu items */ +#define ID_APP_REMOVE 14100 +#define ID_APP_MODIFY 14101 +#define ID_APP_REPAIR 14102 + +/* icons */ +#define IDI_CPLSYSTEM 1500 +#define IDI_APPICO 1501 +#define IDI_INSTICO 1502 +#define IDI_RECBINICO 1503 +#define IDI_SEARCH 1504 + +/* dialogs */ +#define IDD_NETINSTALL 100 +#define IDD_CREATESHORTCUT 200 +#define IDD_SELPROGFOLDER 201 +#define IDD_SELPROGTITLE 202 +#define IDD_SELPROGICON 203 +#define IDD_INSTFROMCD 300 +#define IDD_RUNINSTPROG 301 +#define IDD_CHANGEUSEROPT 302 +#define IDD_FINISHADMINST 304 +#define IDD_AFTERINST 305 +#define IDD_RUNINSTPROG2 306 +#define IDD_WARNING 307 +#define IDD_REMSHORTCUTS 400 +#define IDD_ADDLATER 12544 + +/* bitmaps */ +#define IDB_WATERMARK 1019 +#define IDB_UNDERLINE 10000 +#define IDB_ICON 10001 +#define IDB_SELECT 10002 + +/* strings */ +#define IDS_CPLSYSTEMNAME 2001 +#define IDS_CPLSYSTEMDESCRIPTION 2002 +#define IDS_UNABLEOPEN_UNINSTKEY 15000 +#define IDS_LIST_TITLE 15001 +#define IDS_SIZE_TITLE 15002 +#define IDS_LAST_USED 15003 +#define IDS_PROGANDUPDATES 15004 +#define IDS_PROGRAMS_ONLY 15005 +#define IDS_UPDATES_ONLY 15006 +#define IDS_WELCOME_TITLE 15007 +#define IDS_WELCOME_MSG 15008 +#define IDS_SEARCH_TEXT 15009 +#define IDS_REMOVE_BTN 15010 +#define IDS_MODIFY_BTN 15011 +#define IDS_UNABLEREAD_UNINSTSTR 15012 +#define IDS_INF_REG_OWNER 15013 +#define IDS_INF_PRODUCT_ID 15014 +#define IDS_INF_PUBLISHER 15015 +#define IDS_INF_VERSION 15016 +#define IDS_INF_CONTACT 15017 +#define IDS_INF_SUP_INFO 15018 +#define IDS_INF_SUP_PHONE 15019 +#define IDS_INF_PRODUCT_UPD 15020 +#define IDS_INF_README 15021 +#define IDS_INF_COMMENTS 15022 +#define IDS_NO_INFORMATION 15023 + +/* controls */ +#define IDC_INSTALL 1000 +#define IDC_INSTALLRB 1001 +#define IDC_LOCATIONITEM 1002 +#define IDC_LOCITEMEDIT 1003 +#define IDC_LOCBROWSE 1004 +#define IDC_INSTFROMCDTEXT 1005 +#define IDC_INSTFROMCDICON 1006 +#define IDC_NETPROGLIST 1011 +#define IDC_HEADTEXT 1012 +#define IDC_WARNINGICON 1013 +#define IDC_SWITCHUSER 1014 +#define IDC_WARNINGTEXT 1017 +#define IDC_NAMESCEDIT 1020 +#define IDC_SELICONLIST 1021 +#define IDC_SELFOLDER 1022 +#define IDC_NEWFOLDERBTN 1027 +#define IDC_REMOVEBTN 1030 +#define IDC_UNINSTLOCTEXT 1031 +#define IDC_NETTEXT 1050 +#define IDC_NETICON 1051 +#define IDC_ADDPROGLATER 12369 +#define IDC_NOTADDPROG 12370 + +#endif /* __CPL_RESOURCE_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/appwiz-new/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/appwiz-new/resources/1501.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/1501.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/1502.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/1502.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/1503.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/1503.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/applet.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/icon.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/icon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/search.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/search.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/select.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/select.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/underline.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/underline.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/appwiz-new/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz-new/resources/watermark.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: 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 (added) +++ trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Mon Feb 18 20:25:40 2008 @@ -1,0 +1,4 @@ +#include "resource.h" +#include <windows.h> + +#include "lang/en-US.rc" Propchange: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=324… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Mon Feb 18 20:25:40 2008 @@ -6,6 +6,9 @@ </directory> <directory name="appwiz"> <xi:include href="appwiz/appwiz.rbuild" /> +</directory> +<directory name="appwiz-new"> + <xi:include href="appwiz-new/appwiz.rbuild" /> </directory> <directory name="desk"> <xi:include href="desk/desk.rbuild" />

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs