Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 27595: Set a working directory for the start menu items
by weiden＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: weiden Date: Wed Jul 11 22:49:01 2007 New Revision: 27595 URL: http://svn.reactos.org/svn/reactos?rev=27595&view=rev Log: Set a working directory for the start menu items Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Jul 11 22:49:01 2007 @@ -148,6 +148,10 @@ LPTSTR p = path; TCHAR szSystemPath[MAX_PATH]; TCHAR szProgramPath[MAX_PATH]; + TCHAR szWorkingDir[MAX_PATH]; + LPTSTR lpWorkingDir = NULL; + LPTSTR lpFilePart; + DWORD dwLen; if (bCheckExistence) { @@ -178,7 +182,31 @@ if (!LoadString(hDllInstance, nIdTitle, title, sizeof(title)/sizeof(title[0]))) return FALSE; - return SUCCEEDED(CreateShellLink(path, command, _T(""), NULL, NULL, 0, title)); + dwLen = GetFullPathName(path, + sizeof(szWorkingDir) / sizeof(szWorkingDir[0]), + szWorkingDir, + &lpFilePart); + if (dwLen != 0 && dwLen <= sizeof(szWorkingDir) / sizeof(szWorkingDir[0])) + { + /* Successfully determined the file path */ + + if (lpFilePart != NULL) + { + /* We're only interested in the path. Cut the file name off. + Also remove the trailing backslash unless the working directory + is only going to be a drive, ie. C:\ */ + *(lpFilePart--) = _T('\0'); + if (!(lpFilePart - szWorkingDir == 2 && szWorkingDir[1] == _T(':') && + szWorkingDir[2] == _T('\\'))) + { + *lpFilePart = _T('\0'); + } + } + + lpWorkingDir = szWorkingDir; + } + + return SUCCEEDED(CreateShellLink(path, command, _T(""), lpWorkingDir, NULL, 0, title)); }

1 0

[cfinck] 27594: - Brazilian Portuguese Translations by Wagner Leandro Bueno Angelo (wagner.snake AT gmail DOT com), fixes bug #2385 - Moved the localization stuff to "rsrc.rc" files in some more components See issue #2385 for more details.
by cfinck＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: cfinck Date: Wed Jul 11 22:35:42 2007 New Revision: 27594 URL: http://svn.reactos.org/svn/reactos?rev=27594&view=rev Log: - Brazilian Portuguese Translations by Wagner Leandro Bueno Angelo (wagner.snake AT gmail DOT com), fixes bug #2385 - Moved the localization stuff to "rsrc.rc" files in some more components See issue #2385 for more details. Added: trunk/reactos/base/applications/control/lang/pt-BR.rc trunk/reactos/base/applications/mmc/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/system/expand/lang/pt-BR.rc trunk/reactos/base/system/regsvr32/lang/pt-BR.rc trunk/reactos/base/system/rundll32/lang/pt-BR.rc trunk/reactos/base/system/userinit/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc Modified: trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/taskmgr/taskmgr.rc trunk/reactos/base/system/expand/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc Added: trunk/reactos/base/applications/control/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/control/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,28 @@ +// Brazilian language resource file (Wagner Leandro Bueno Angelo, 2007-07-09) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Arquivo" + BEGIN + MENUITEM "&Fechar", IDM_CLOSE + END + POPUP "&Visualizar" + BEGIN + MENUITEM "Ícones grandes", IDM_LARGEICONS + MENUITEM "Ícones pequenos", IDM_SMALLICONS + MENUITEM "Lista", IDM_LIST + MENUITEM "Detalhes", IDM_DETAILS + END + POPUP "Aj&uda" + BEGIN + MENUITEM "Sobre...", IDM_ABOUT + END +END + Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc (original) +++ trunk/reactos/base/applications/control/rsrc.rc Wed Jul 11 22:35:42 2007 @@ -24,6 +24,7 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" Added: trunk/reactos/base/applications/mmc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/mmc/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,21 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Arquivo" + BEGIN + MENUITEM SEPARATOR + MENUITEM "Sai&r\tAlt+F4", ID_FILE_EXIT + END + + POPUP "Aj&uda" + BEGIN + MENUITEM "&Sobre o Console de gerenciamento ReactOS...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Console de gerenciamento ReactOS" + IDS_CONSOLETITLE "Console%1!u!" +END Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Wed Jul 11 22:35:42 2007 @@ -7,4 +7,5 @@ #include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,686 @@ +///////////////////////////////////////////////////////////////////////////// +// Brazilian Portuguese resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Arquivo" + BEGIN + MENUITEM "&Executar nova tarefa", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Sair do gerenciador de tarefas", ID_FILE_EXIT + END + POPUP "&Opções" + BEGIN + MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&Minimizar durante o uso", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&Ocultar ao minimizar", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "&Exibir tarefas de 16-bit", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "E&xibir" + BEGIN + MENUITEM "&Atualizar agora", ID_VIEW_REFRESH + POPUP "&Velocidade de atualização" + BEGIN + MENUITEM "&Alta", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "&Normal", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Baixa", ID_VIEW_UPDATESPEED_LOW + MENUITEM "Em &pausa", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "Íco&nes grandes", ID_VIEW_LARGE + MENUITEM "Ícones &pequenos", ID_VIEW_SMALL + MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED + MENUITEM "&Selecionar colunas...", ID_VIEW_SELECTCOLUMNS + POPUP "&Historico do CPU" + BEGIN + MENUITEM "Um gráfico para &todas as CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Um gráfico &por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "&Mostrar tempos do núcleo", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&Janelas" + BEGIN + MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Minimi&zar", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE + MENUITEM "Em &cascata", ID_WINDOWS_CASCADE + MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT + END + POPUP "Aj&uda" + BEGIN + MENUITEM "&Tópicos da Ajuda do Gerenciador de tarefas", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "So&bre o Gerenciador de tarefas", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Minimi&zar", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE + MENUITEM "Em &cascata", ID_WINDOWS_CASCADE + MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Executar nova tarefa...", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Íco&nes grandes", ID_VIEW_LARGE + MENUITEM "Ícones peq&uenos", ID_VIEW_SMALL + MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "A&lternar para", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Minimi&zar", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE + MENUITEM "Em &cascata", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "&Finalizar tarefa", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&Ir para processo", ID_APPLICATION_PAGE_GOTOPROCESS + + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Restaurar", ID_RESTORE + MENUITEM "&Fechar", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Finalizar processo", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "F&inalizar árvore de processos", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&Depurar", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "Definir &prioridade" + BEGIN + MENUITEM "&Tempo real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "&Alta", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "A&cima do normal", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Normal", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "Abai&xo do normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&Baixa", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Editar &Canais de depuração...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Sobre o Gerenciador de tarefas" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Gerenciador de tarefas v1.0\nCopyright (C) 1999 - 2001\npor Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_TASKMGR_DIALOG DIALOG DISCARDABLE 0, 0, 264, 246 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Gerenciador de tarefas" +MENU IDR_TASKMANAGER +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Nova tarefa...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "A&lternar para",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "&Finalizar tarefa",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Finalizar processo",IDC_ENDPROCESS,171,189,69,14 + CONTROL "&Mostrar processos de todos os usuários",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,136,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Uso de CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Uso de MEM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Totais",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Carga comprometida (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Memória física(K)",IDC_PHYSICAL_MEMORY_FRAME,122,122,120,39,WS_EX_TRANSPARENT + GROUPBOX "Memória usada pelo núcleo (K)",IDC_KERNEL_MEMORY_FRAME,122,166,120,39,0,WS_EX_TRANSPARENT + LTEXT "Identificadores",IDS_TOTALS_HANDLE_COUNT,12,131,47,8 + LTEXT "Segmentos",IDS_TOTALS_THREAD_COUNT,12,140,36,8 + LTEXT "Processos",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,19,8 + LTEXT "Pico",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Total",IDS_PHYSICAL_MEMORY_TOTAL,126,131,27,8 + LTEXT "Disponível",IDS_PHYSICAL_MEMORY_AVAILABLE,126,140,36,8 + LTEXT "Cache do Sistema",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,126,149,57,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Total",IDS_KERNEL_MEMORY_TOTAL,126,174,27,8 + LTEXT "Paginada",IDS_KERNEL_MEMORY_PAGED,126,184,30,8 + LTEXT "Não paginada",IDS_KERNEL_MEMORY_NONPAGED,126,193,45,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + GROUPBOX "Histórico de uso de CPU",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Histórico de uso de Memoria",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "CPU Usage Display",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "MEM Usage Display",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "CPU Usage History",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "MEM Usage History",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,0,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Canais de depuração" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Fechar",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Afinidade com processador" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,174,133,50,14 + LTEXT "O parâmetro 'Afinidade com processador' define as CPUs em que o processo poderá ser executado.", + IDC_STATIC,5,5,220,16 + CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "CPU 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "CPU 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "CPU 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "CPU 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "CPU 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "CPU 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "CPU 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "CPU 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "CPU 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "CPU 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "CPU 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "CPU 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "CPU 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "CPU 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "CPU 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "CPU 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "CPU 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "CPU 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "CPU 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "CPU 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "CPU 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "CPU 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "CPU 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "CPU 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "CPU 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "CPU 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "CPU 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "CPU 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "CPU 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "CPU 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "CPU 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 254, 199 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selecionar colunas" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,138,178,50,14 + LTEXT "Selecione as colunas que aparecerão na página de processos do 'Gerenciador de tarefas.", + IDC_STATIC,7,7,181,17 + CONTROL "Nome da ima&gem",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,66,10 + CONTROL "&Identificação do processo (PID)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,113,10 + CONTROL "&Uso de CPU",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "&Tempo de CPU",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,61,10 + CONTROL "U&so de memória",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "Inter&valo de uso de memória",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,102,10 + CONTROL "&Pico do uso de memória",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,89,10 + CONTROL "&Falhas de página",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,68,10 + CONTROL "&Objetos USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "Leituras de E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,61,10 + CONTROL "Bytes de leitura de E/S",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,86,10 + CONTROL "Ide&ntificação de sessão",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "Nome de usu&ário",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,65,10 + CONTROL "Intervalo de fal&has de página",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,123,28,103,10 + CONTROL "Tamanho da &memória virtual",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,123,39,83,10 + CONTROL "&Reserva de memória paginável",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,123,50,111,10 + CONTROL "R&eserva de memória não-paginável",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,123,61,123,10 + CONTROL "Prioridade &básica",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,123,72,67,10 + CONTROL "&Contagem de identificadores",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,123,83,103,10 + CONTROL "Contagem &de segmentos",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,123,94,91,10 + CONTROL "Ob&jetos GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,123,105,55,10 + CONTROL "Gravações de E/S",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,123,116,71,10 + CONTROL "Bytes de gravação de E/S",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,123,127,97,10 + CONTROL "Outras E/S",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,123,138,47,10 + CONTROL "Outros bytes de E/S",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,123,149,77,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Gerenciador de tarefas" + IDC_TASKMGR "Gerenciador de tarefas" + IDS_IDLE_PROCESS "Processo inativo do sistema" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Executa um novo programa" + ID_OPTIONS_ALWAYSONTOP "O 'Gerenciador de tarefas' permanece na frente de todas as outras janelas, a menos que seja minimizado" + ID_OPTIONS_MINIMIZEONUSE + "O 'Gerenciador de tarefas' é minimizado toda vez que uma operação de alternância for executada" + ID_OPTIONS_HIDEWHENMINIMIZED "Oculta o 'Gerenciador de tarefas' quando ele estiver minimizado" + ID_VIEW_REFRESH "Força o 'Gerenciador de tarefas' a atualizar a tela agora, independentemente do parâmetro 'Velocidade de atualização'" + ID_VIEW_LARGE "Exibe as tarefas usando ícones grandes" + ID_VIEW_SMALL "Exibe as tarefas usando ícones pequenos" + ID_VIEW_DETAILS "Exibe as informações sobre cada tarefa" + ID_VIEW_UPDATESPEED_HIGH "Atualiza a tela duas vezes por segundo" + ID_VIEW_UPDATESPEED_NORMAL "Atualiza a tela a cada dois segundos" + ID_VIEW_UPDATESPEED_LOW "Atualiza a tela a cada quatro segundos" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Não atualiza a tela automaticamente" + ID_WINDOWS_TILEHORIZONTALLY + "Organiza as janelas lado a lado horizontalmente na área de trabalho" + ID_WINDOWS_TILEVERTICALLY "Organiza as janelas lado a lado verticalmente na área de trabalho" + ID_WINDOWS_MINIMIZE "Minimiza as janelas" + ID_WINDOWS_MAXIMIZE "Maximiza as janelas" + ID_WINDOWS_CASCADE "Organiza as janelas em cascata diagonalmente na área de trabalho" + ID_WINDOWS_BRINGTOFRONT "Coloca a janela em primeiro plano, mas não alterna o foco para ela" + ID_HELP_TOPICS "Exibe os tópicos da 'Ajuda' do 'Gerenciador de tarefas'" + ID_HELP_ABOUT "Exibe informações sobre o programa, o número da versão e os direitos autorais" + ID_FILE_EXIT "Sai do aplicativo 'Gerenciador de tarefas'" + ID_OPTIONS_SHOW16BITTASKS + "Exibe as tarefas de 16 bits do Windows sob o arquivo ntvdm.exe associado" + ID_VIEW_SELECTCOLUMNS "Seleciona quais colunas serão visíveis na tela Processo" + ID_VIEW_SHOWKERNELTIMES "Exibe o tempo do núcleo nos gráficos de desempenho" + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "Apenas um único gráfico exibe o uso total de CPU" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Cada CPU possui o seu próprio gráfico" + ID_APPLICATION_PAGE_SWITCHTO + "Coloca a tarefa em primeiro plano e alterna o foco para ela" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Fecha tarefa selecionada" + ID_GOTOPROCESS "Altera o foco para o processo da tarefa selecionada" + ID_RESTORE "Tira o 'Gerenciador de tarefas' do estado oculto" + ID_PROCESS_PAGE_ENDPROCESS "Remover este processo do sistema" + ID_PROCESS_PAGE_ENDPROCESSTREE + "Remover este processo e todos os seus descendentes do sistema" + ID_PROCESS_PAGE_DEBUG "Conecta o depurador a este processo" + ID_PROCESS_PAGE_SETAFFINITY + "Define em que processadores o processo poderá ser executado" + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Define o processo como tendo classe de prioridade TEMPO REAL" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Define o processo como tendo classe de prioridade ALTA" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Define o processo com a classe de prioridade ACIMA DO NORMAL" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Define o processo como tendo classe de prioridade NORMAL" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Define o processo com a classe de prioridade ABAIXO DO NORMAL" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Define o processo como tendo classe de prioridade BAIXA" + IDS_LICENSE "Este programa é software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License conforme publicada pela Free Software Foundation; quer a versão 2 da licença, ou (conforme você escolha) qualquer versão posterior.\r\n\r\nEste programa é distribuído com a esperança de que seja útil, mas SEM QUALQUER GARANTIA; mesmo sem a garantia implícita de MERCANTIBILIDADE OU ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Para mais detalhes, veja a GNU General Public License.\r\n\r\nVocê deve ter recebido uma cópia da GNU General Public License juntamente com este programa; caso contrário, escreva para a Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Aplicativos" + IDS_TAB_PROCESSES "Processos" + IDS_TAB_PERFORMANCE "Performance" + IDS_TAB_TASK "Tarefa" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Nome da imagem" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Nome de usuário" + IDS_TAB_SESSIONID "Identificação de sessão" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "Tempo de CPU" + IDS_TAB_MEMUSAGE "Uso de memória" + IDS_TAB_PEAKMEMUSAGE "Pico do uso de memória" + IDS_TAB_MEMDELTA "Intervalo de memória" + IDS_TAB_PAGEFAULT "Falhas de página" + IDS_TAB_PFDELTA "Intervalo EP" + IDS_TAB_VMSIZE "Tamanho MV" + IDS_TAB_PAGEDPOOL "Reserva paginada" + IDS_TAB_NPPOOL "Reserva não-paginada" + IDS_TAB_BASEPRI "Prioridade básica" + IDS_TAB_HANDLES "Identificadores" + IDS_TAB_THREADS "Segmentos" + IDS_TAB_USERPBJECTS "Objetos USER" + IDS_TAB_GDIOBJECTS "Objetos GDI" + IDS_TAB_IOREADS "Leituras de E/S" + IDS_TAB_IOWRITES "Gravações de E/S" + IDS_TAB_IOOTHER "Outras E/S" + IDS_TAB_IOREADBYTES "Bytes de leitura de E/S" + IDS_TAB_IOWRITESBYTES "Bytes de gravação de E/S" + IDS_TAB_IOOTHERBYTES "Outros Bytes de E/S" + IDS_MENU_SELECTCOLUMNS "&Selecionar colunas..." + IDS_MENU_16BITTASK "&Exibir tarefas de 16 bits" + IDS_MENU_WINDOWS "&Janelas" + IDS_MENU_LARGEICONS "Íco&nes grandes" + IDS_MENU_SMALLICONS "Ícones &pequenos" + IDS_MENU_DETAILS "Detal&hes" + IDS_MENU_ONEGRAPHALLCPUS "Um gráfico para &todas as CPUs" + IDS_MENU_ONEGRAPHPERCPU "Um gráfico &por CPU" + IDS_MENU_CPUHISTORY "&Histórico de CPU" + IDS_MENU_SHOWKERNELTIMES "&Mostrar tempos do núcleo" + IDS_CREATENEWTASK "Executar nova tarefa" + IDS_CREATENEWTASK_DESC "Digite o nome de um programa, pasta, documento ou recurso da Internet e o 'Gerenciador de tarefas' abrirá para você." + IDS_MSG_ACCESSPROCESSAFF "Não é possível acessar ou definir afinidade de processo" + IDS_MSG_PROCESSONEPRO "O processo deve ter afinidade com pelo menos um processador." + IDS_MSG_INVALIDOPTION "Opção inválida" + IDS_MSG_UNABLEDEBUGPROCESS "Não é possível conectar o depurador" + IDS_MSG_WARNINGDEBUG "AVISO: a depuração deste processo pode resultar em perda de dados.\nTem certeza de que deseja conectar o depurador?" + IDS_MSG_TASKMGRWARNING "Aviso do 'Gerenciador de tarefas'" + IDS_MSG_WARNINGTERMINATING "AVISO: o encerramento de um processo pode causar\nefeitos indesejáveis, como perda de dados e\ninstabilidade do sistema. O processo não terá como\nsalvar seu estado e os dados antes de ser encerrado.\nTem certeza de que deseja encerrá-lo?" + IDS_MSG_UNABLETERMINATEPRO "Não é possível finalizar o processo" + IDS_MSG_UNABLECHANGEPRIORITY "Não é possível alterar a prioridade" + IDS_MSG_WARNINGCHANGEPRIORITY "AVISO: a alteração da classe de prioridade do processo\npode causar efeitos indesejáveis, inclusive a instabilidade do sistema. Tem\ncerteza de que deseja alterar a classe de prioridade?" + IDS_MSG_TRAYICONCPUUSAGE "Uso de CPU: %d%%" + IDS_STATUS_MEMUSAGE "Uso de Memória: %dK / %dK" + IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%" + IDS_STATUS_PROCESSES "Processo: %d" + IDS_Not_Responding "Não respondendo" + IDS_Running "Execuando" +END + + +#endif // Brazilian Portuguese resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rc (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rc Wed Jul 11 22:35:42 2007 @@ -201,23 +201,4 @@ '00 00 00 00 00 00' } */ -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#ifdef __GCC__ -#include "lang/ja-JP.rc" -#endif -#include "lang/nb-NO.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sv-SE.rc" -#ifdef __GCC__ -#include "lang/uk-UA.rc" -#endif +#include "rsrc.rc" Added: trunk/reactos/base/system/expand/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/pt… ============================================================================== --- trunk/reactos/base/system/expand/lang/pt-BR.rc (added) +++ trunk/reactos/base/system/expand/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,16 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "ReactOS Utilitário para Expandir Arquivos - Versão 1.0\n\ +Copyright Victor Schneider 1997\n\n\ +Uso: %s origem [destino]\n" + +IDS_FAILS "LZCopy falhou: resultado é %ld\n" +} Modified: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/expand/rsrc.rc (original) +++ trunk/reactos/base/system/expand/rsrc.rc Wed Jul 11 22:35:42 2007 @@ -15,6 +15,7 @@ #include "lang/ja-JP.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" Added: trunk/reactos/base/system/regsvr32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/pt-BR.rc (added) +++ trunk/reactos/base/system/regsvr32/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,32 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nUso: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - Servidor não registrado\n\ +/s - Silencioso; não exibe caixa de mensagens\n\ +/c - Saída no console\n\ +/i - Chamar DllInstall passando [cmdline] opcional; quando usado com /u chama a desinstalação da dll\n\ +/n - Não chame o DllRegisterServer; essa opção deve ser usada com /i" + +IDS_NoDllSpecified, "Nenhum nome de DLL especificado." + +IDS_InvalidFlag, "Sinalizador não reconhecido: %s" + +IDS_SwitchN_NoI, "Sinalizador não reconhecido: /n deve ser usado com o Sinalizador /i" + +IDS_DllNotLoaded, "Falha em LoadLibrary('%s').\nGetLastError retornou 0x%08x." + +IDS_MissingEntry, "%s foi carregado, mas o ponto de entrada %s não foi localizado.\n\n\ +%s não pode ser exportado, ou uma versão corrompida de %s pode estar na memória. Tente usar o PView para detectar e remover isso." + +IDS_FailureMessage, "%s em %s falhou.\nCódigo de retorno: 0x%08x" + +IDS_SuccessMessage "%s em %s teve êxito." +} Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… ============================================================================== --- trunk/reactos/base/system/regsvr32/rsrc.rc (original) +++ trunk/reactos/base/system/regsvr32/rsrc.rc Wed Jul 11 22:35:42 2007 @@ -12,4 +12,5 @@ #include "lang/ja-JP.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/system/rundll32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/pt-BR.rc (added) +++ trunk/reactos/base/system/rundll32/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,12 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "Erro ao carregar '%s'" +IDS_MissingEntry, "Está faltando a entrada:%s\nem %s" +} Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… ============================================================================== --- trunk/reactos/base/system/rundll32/rsrc.rc (original) +++ trunk/reactos/base/system/rundll32/rsrc.rc Wed Jul 11 22:35:42 2007 @@ -14,6 +14,7 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" Added: trunk/reactos/base/system/userinit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/pt-BR.rc (added) +++ trunk/reactos/base/system/userinit/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,12 @@ +#include "resource.h" +/* Start move all hard code string to En.rc + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit falhou ao tentar iniciar o shell!\n" + +} Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… ============================================================================== --- trunk/reactos/base/system/userinit/rsrc.rc (original) +++ trunk/reactos/base/system/userinit/rsrc.rc Wed Jul 11 22:35:42 2007 @@ -15,6 +15,7 @@ #include "lang/ja-JP.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Wed Jul 11 22:35:42 2007 @@ -17,18 +17,4 @@ IDI_CPLICON ICON "resources/applet.ico" -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/ru-RU.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" -#include "lang/pl-PL.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc (added) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,7 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CPLNAME "Adicionar hardware" + IDS_CPLDESCRIPTION "Adiciona hardware ao seu computador." +END Added: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/rsrc.rc (added) +++ trunk/reactos/dll/cpl/hdwwiz/rsrc.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,19 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" +#include "lang/ru-RU.rc" +#include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc (added) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc Wed Jul 11 22:35:42 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Sons e dispositivos de audio" + IDS_CPLDESCRIPTION "Altera o esquema de som para o seu computador ou define as configurações para os auto-falantes e dispositivos de gravação." +END + Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Wed Jul 11 22:35:42 2007 @@ -10,15 +10,4 @@ IDI_CPLICON ICON "resources/mmsys.ico" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc"

1 0

[cfinck] 27593: Oops, accidentally saved this one with UTF-8 encoding, which leads to Quirks Mode in IE. Converted it back to ANSI encoding.
by cfinck＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: cfinck Date: Wed Jul 11 21:23:26 2007 New Revision: 27593 URL: http://svn.reactos.org/svn/reactos?rev=27593&view=rev Log: Oops, accidentally saved this one with UTF-8 encoding, which leads to Quirks Mode in IE. Converted it back to ANSI encoding. Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/index.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/index.php Wed Jul 11 21:23:26 2007 @@ -1,4 +1,4 @@ -ï»¿<?php +<?php /* PROJECT: ReactOS Website LICENSE: GPL v2 or any later version

1 0

[cfinck] 27592: - Check if something has changed before setting elem.value. This prevents the cursor from jumping to the last character in IE, when you press any key. - Converted the small PNG icons to GIF icons without alpha transparency. Fixes the visual appearance in IE 6 and older.
by cfinck＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: cfinck Date: Wed Jul 11 21:17:38 2007 New Revision: 27592 URL: http://svn.reactos.org/svn/reactos?rev=27592&view=rev Log: - Check if something has changed before setting elem.value. This prevents the cursor from jumping to the last character in IE, when you press any key. - Converted the small PNG icons to GIF icons without alpha transparency. Fixes the visual appearance in IE 6 and older. Added: trunk/web/reactos.org/htdocs/getbuilds/images/cd.gif (with props) trunk/web/reactos.org/htdocs/getbuilds/images/info.gif (with props) trunk/web/reactos.org/htdocs/getbuilds/images/web.gif (with props) Removed: trunk/web/reactos.org/htdocs/getbuilds/images/cd.png trunk/web/reactos.org/htdocs/getbuilds/images/info.png trunk/web/reactos.org/htdocs/getbuilds/images/web.png Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php trunk/web/reactos.org/htdocs/getbuilds/index.php Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css Wed Jul 11 21:17:38 2007 @@ -49,7 +49,7 @@ } ul.web { - list-style-image: url(images/web.png); + list-style-image: url(images/web.gif); margin-top: 0; margin-bottom: 1em; } Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php Wed Jul 11 21:17:38 2007 @@ -180,7 +180,7 @@ oddeven = !oddeven; html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="tr_mouseover(this);" onmouseout="tr_mouseout(this);">'; - html += '<td>' + flink + '<img src="images/cd.png" alt=""> ' + fname + '</a></td>'; + html += '<td>' + flink + '<img src="images/cd.gif" alt=""> ' + fname + '</a></td>'; html += '<td>' + flink + fsize + '</a></td>'; html += '<td>' + flink + fdate + '</a></td>'; html += '</tr>'; @@ -356,7 +356,12 @@ function checkRevNum(elem) { - elem.value = elem.value.replace( /[^[0-9-]/g, ""); + var val = elem.value.replace( /[^[0-9-]/g, ""); + + // First check if something was changed by the replace function. + // If not, don't set elem.value = val. Otherwise the cursor would always jump to the last character in IE, when you press any key. + if( elem.value != val ) + elem.value = val; } function showLatestFiles() Added: trunk/web/reactos.org/htdocs/getbuilds/images/cd.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/getbuilds/images/cd.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/web/reactos.org/htdocs/getbuilds/images/cd.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== Binary file - no diff available. Added: trunk/web/reactos.org/htdocs/getbuilds/images/info.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/getbuilds/images/info.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/web/reactos.org/htdocs/getbuilds/images/info.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== Binary file - no diff available. Added: trunk/web/reactos.org/htdocs/getbuilds/images/web.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== Binary file - no diff available. Propchange: trunk/web/reactos.org/htdocs/getbuilds/images/web.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/web/reactos.org/htdocs/getbuilds/images/web.png URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== Binary file - no diff available. Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/index.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/index.php Wed Jul 11 21:17:38 2007 @@ -1,4 +1,4 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Website LICENSE: GPL v2 or any later version @@ -96,7 +96,7 @@ '<img src="images/rightarrow.gif" alt=">" title="<?php echo $getbuilds_langres["nextrev"]; ?>" onclick="nextRev();"><br>' + '</span>' + - '<img src="images/info.png" alt="INFO:"> <?php echo $getbuilds_langres["rangeinfo"]; ?>' + + '<img src="images/info.gif" alt="INFO:"> <?php echo $getbuilds_langres["rangeinfo"]; ?>' + '</td>' + '</tr>' + '<tr>' +

1 0

[fireball] 27591: - Fix wrongly-applied translation.
by fireball＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: fireball Date: Wed Jul 11 20:08:29 2007 New Revision: 27591 URL: http://svn.reactos.org/svn/reactos?rev=27591&view=rev Log: - Fix wrongly-applied translation. Removed: trunk/reactos/base/applications/charmap/ru-RU.rc Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc Wed Jul 11 20:08:29 2007 @@ -3,7 +3,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 -CAPTION "Character Map" +CAPTION "Òàáëèöà ñèìâîëîâ" FONT 8,"MS Sans Serif",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN @@ -20,11 +20,11 @@ END IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "Î Character Map" +CAPTION "Î Òàáëèöå ñèìâîëîâ" FONT 8,"MS Sans Serif",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Òàáëèöà ñèìâîëîâ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Removed: trunk/reactos/base/applications/charmap/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/ru-RU.rc (original) +++ trunk/reactos/base/applications/charmap/ru-RU.rc (removed) @@ -1,37 +1,0 @@ -// Russian language resource file (Dmitry Chapyshev, 2007-06-10) - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 -CAPTION "Òàáëèöà ñèìâîëîâ" -FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX -BEGIN - LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 - COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - PUSHBUTTON "Ñïðàâêà", IDC_CMHELP, 249, 5, 35, 13 - CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 - LTEXT "Êîïèðîâàòü ñèìâîë :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 46, 13 - PUSHBUTTON "Êîïèðîâàòü", IDC_COPY, 244, 186, 46, 13, WS_DISABLED - //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP - //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY -END - -IDD_ABOUTBOX DIALOGEX 22,16,210,182 -CAPTION "Î Òàáëèöå ñèìâîëîâ" -FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Òàáëèöà ñèìâîëîâ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 - ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." - IDS_ABOUT "&Î ïðîãðàììå..." -END

1 0

[cfinck] 27590: Updated XML file by Coviti (coviti AT gmail DOT com) See issue #2358 for more details.
by cfinck＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: cfinck Date: Wed Jul 11 18:34:33 2007 New Revision: 27590 URL: http://svn.reactos.org/svn/reactos?rev=27590&view=rev Log: Updated XML file by Coviti (coviti AT gmail DOT com) See issue #2358 for more details. Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Wed Jul 11 18:34:33 2007 @@ -4,33 +4,33 @@ <regname>Mozilla Firefox (1.5)</regname> <licence>MPL/GPL/LGPL</licence> <version>1.5.0.9</version> - <description>The most popular and one of the best free WebBrowsers out there.</description> + <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> </application> <application name="Firefox 2.0"> <regname>Mozilla Firefox (2.0.0.1)</regname> <licence>MPL/GPL/LGPL</licence> <version>2.0.0.1</version> - <description>The most popular and one of the best free WebBrowsers out there.</description> + <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> <version>1.5.0.9</version> - <description>The most popular and one of the best free MailClients out there.</description> + <description>The most popular and one of the best free Mail Clients out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> </application> <application name="SeaMonkey"> <regname>SeaMonkey (1.0.7)</regname> <version>1.0.7</version> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> + <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> <version>1.7.12</version> - <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> + <description>Essential Component to get ReactOS Explorer's and other applications' Internet Browsing feature running.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> </application> <application name="Off By One Browser"> @@ -85,7 +85,7 @@ <application name="TuxPaint"> <regname>Tux Paint 0.9.16</regname> <version>0.9.16</version> - <description>An open source bitmap graphics editor geared towards young children.</description> + <description>An Open Source bitmap graphics editor geared towards young children.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-in…</location> </application> </category> @@ -107,8 +107,8 @@ <application name="FreeBASIC"> <regname>FreeBASIC 0.16b</regname> <version>0.16b</version> - <description>Open Source Basic Compiler. The Basic syntax is compatible to QBASIC.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.16b-win32.exe</location> + <description>Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC.</description> + <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.17b-win32.exe</location> </application> </category> <category name="Games & Fun" icon="6"> @@ -125,7 +125,7 @@ <application name="OpenTTD"> <regname>OpenTTD 0.5.0</regname> <version>0.5.0-RC5</version> - <description>Open-source-clone of the "Transport Tycoon Deluxe" game-engine. You need a copy of Transport Tycoon.</description> + <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.5.0-RC5-win32.e…</location> </application> <application name="LBreakout2">LBreakout2 2.4.1 @@ -157,7 +157,7 @@ <application name="uTorrent"> <regname>µTorrent</regname> <version>1.6</version> - <description>Small and fast Torrent Client.</description> + <description>Small and fast BitTorrent Client.</description> <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> </application> <application name="Audio Grabber">

1 0

[hpoussin] 27589: Add a status window instead of a black screen at the start of the 2nd stage, when installing devices Now, we should be able to diagnostic if a hang is caused by a bad driver or something else
by hpoussin＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: hpoussin Date: Wed Jul 11 15:51:42 2007 New Revision: 27589 URL: http://svn.reactos.org/svn/reactos?rev=27589&view=rev Log: Add a status window instead of a black screen at the start of the 2nd stage, when installing devices Now, we should be able to diagnostic if a hang is caused by a bad driver or something else Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/en-US.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Jul 11 15:51:42 2007 @@ -397,9 +397,66 @@ } +static BOOL CALLBACK +StatusMessageWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + { + TCHAR szMsg[256]; + + if (!LoadString(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg, sizeof(szMsg)/sizeof(szMsg[0]))) + return FALSE; + SetDlgItemText(hwndDlg, IDC_STATUSLABEL, szMsg); + return TRUE; + } + } + return FALSE; +} + + +static DWORD WINAPI +ShowStatusMessageThread( + IN LPVOID lpParameter) +{ + HWND *phWnd = (HWND *)lpParameter; + HWND hWnd; + MSG Msg; + + hWnd = CreateDialogParam( + hDllInstance, + MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), + GetDesktopWindow(), + StatusMessageWindowProc, + (LPARAM)NULL); + if (!hWnd) + return 0; + *phWnd = hWnd; + + ShowWindow(hWnd, SW_SHOW); + + /* Message loop for the Status window */ + while (GetMessage(&Msg, NULL, 0, 0)) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + + return 0; +} + static BOOL CommonInstall(VOID) { + HWND hWnd = NULL; + hSysSetupInf = SetupOpenInfFileW( L"syssetup.inf", NULL, @@ -418,32 +475,43 @@ return FALSE; } + CreateThread( + NULL, + 0, + ShowStatusMessageThread, + (LPVOID)&hWnd, + 0, + NULL); + if (!EnableUserModePnpManager()) { DebugPrint("EnableUserModePnpManager() failed!\n"); + SetupCloseInfFile(hSysSetupInf); + EndDialog(hWnd, 0); return FALSE; } if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) { DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); + SetupCloseInfFile(hSysSetupInf); + EndDialog(hWnd, 0); return FALSE; } + EndDialog(hWnd, 0); return TRUE; } DWORD WINAPI InstallLiveCD(IN HINSTANCE hInstance) { - HKEY hKey = NULL; - LPTSTR Shell = NULL; STARTUPINFO StartupInfo; PROCESS_INFORMATION ProcessInformation; BOOL res; if (!CommonInstall()) - return 0; + goto cleanup; SetupCloseInfFile(hSysSetupInf); /* Run the shell */ @@ -472,9 +540,6 @@ WaitForSingleObject(ProcessInformation.hProcess, INFINITE); cleanup: - if (hKey != NULL) - RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, Shell); MessageBoxA( NULL, "You can shutdown your computer, or press ENTER to reboot", Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc Wed Jul 11 15:51:42 2007 @@ -161,6 +161,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -221,4 +230,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Wed Jul 11 15:51:42 2007 @@ -163,6 +163,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Anerkennungen" @@ -246,4 +255,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -247,4 +256,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/en-US.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Wed Jul 11 15:51:42 2007 @@ -184,6 +184,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -227,4 +236,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Veuillez patienter..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Remerciements" @@ -247,4 +256,10 @@ IDS_WZD_PASSWORDCHAR "Le mot de passe entré contient des caractères invalides. Veuillez saisir un mot de passe correct." IDS_WZD_LOCALTIME "L'installation n'a pas réussi à définir l'heure locale." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installation des périphériques en cours..." +END + /* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc Wed Jul 11 15:51:42 2007 @@ -176,6 +176,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Köszönetnyílvánítás" @@ -254,4 +263,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc Wed Jul 11 15:51:42 2007 @@ -162,6 +162,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Pengakuan" @@ -245,4 +254,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Wed Jul 11 15:51:42 2007 @@ -155,6 +155,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Riconoscimenti" @@ -238,4 +247,10 @@ IDS_WZD_PASSWORDCHAR "La password contiene caratteri non validi. Digitate una password diversa." IDS_WZD_LOCALTIME "La procedura di installazione non ha potuto impostare l'ora locale." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "³F" @@ -225,4 +234,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc Wed Jul 11 15:51:42 2007 @@ -167,6 +167,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Annerkjennelser" @@ -249,4 +258,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -225,4 +234,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Wed Jul 11 15:51:42 2007 @@ -167,6 +167,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Podziêkowania" @@ -250,4 +259,10 @@ IDS_WZD_PASSWORDCHAR "Wprowadzone has³o zawiera nieodpowiednie znaki. Proszê wprowadziæ has³o bez ich udzia³u." IDS_WZD_LOCALTIME "Program instalacyjny nie zdo³a³ ustawiæ czasu lokalnego." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Wed Jul 11 15:51:42 2007 @@ -145,6 +145,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Ïîäòâåðæäåíèÿ" @@ -228,4 +237,10 @@ IDS_WZD_PASSWORDCHAR "Ïàðîëè, êîòîðûå âû ââåëè ñîäåðæàò çàïðåùåííûå ñèìâîëû. Ââåäèòå èõ ñíîâà." IDS_WZD_LOCALTIME "Íå óäàëîñü óñòàíîâèòü ìåñòíîå âðåìÿ." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Wed Jul 11 15:51:42 2007 @@ -153,6 +153,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Ï³äòâåðäæåííÿ" @@ -235,4 +244,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Wed Jul 11 15:51:42 2007 @@ -152,6 +152,15 @@ END +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -209,4 +218,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Wed Jul 11 15:51:42 2007 @@ -63,6 +63,9 @@ #define IDD_GPL 2100 #define IDC_GPL_TEXT 2101 + +#define IDD_STATUSWINDOW_DLG 2200 +#define IDC_STATUSLABEL 2201 #define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011 @@ -135,6 +138,8 @@ #define IDS_WZD_PASSWORDCHAR 3455 #define IDS_WZD_LOCALTIME 3456 +#define IDS_STATUS_INSTALL_DEV 3500 + #define IDR_GPL 4000 #endif /* RESOURCE_H */

1 0

[hpoussin] 27588: Put common code in livecd and 2nd stage to a shared routine Simplify creating of optional shortcuts Create an install log LiveCD: start userinit.exe instead of directly starting the shell
by hpoussin＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: hpoussin Date: Wed Jul 11 13:55:53 2007 New Revision: 27588 URL: http://svn.reactos.org/svn/reactos?rev=27588&view=rev Log: Put common code in livecd and 2nd stage to a shared routine Simplify creating of optional shortcuts Create an install log LiveCD: start userinit.exe instead of directly starting the shell Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Jul 11 13:55:53 2007 @@ -63,7 +63,7 @@ /* FUNCTIONS ****************************************************************/ -void +static VOID DebugPrint(char* fmt,...) { char buffer[512]; @@ -72,6 +72,8 @@ va_start(ap, fmt); vsprintf(buffer, fmt, ap); va_end(ap); + + LogItem(SYSSETUP_SEVERITY_FATAL_ERROR, L"Failed"); strcat(buffer, "\nRebooting now!"); MessageBoxA(NULL, @@ -138,12 +140,25 @@ static BOOL -CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle) +CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle, BOOL bCheckExistence) { TCHAR path[MAX_PATH]; TCHAR title[256]; TCHAR name[256]; LPTSTR p = path; + TCHAR szSystemPath[MAX_PATH]; + TCHAR szProgramPath[MAX_PATH]; + + if (bCheckExistence) + { + if (!GetSystemDirectory(szSystemPath, sizeof(szSystemPath)/sizeof(szSystemPath[0]))) + return FALSE; + _tcscpy(szProgramPath, szSystemPath); + _tcscat(szProgramPath, _T("\\")); + if ((_taccess(_tcscat(szProgramPath, command), 0 )) == -1) + /* Expected error, don't return FALSE */ + return TRUE; + } if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) return FALSE; @@ -156,11 +171,11 @@ p = PathAddBackslash(p); - if(!LoadString(hDllInstance, nIdName, name, 256)) + if (!LoadString(hDllInstance, nIdName, name, sizeof(name)/sizeof(name[0]))) return FALSE; _tcscpy(p, name); - if (!LoadString(hDllInstance, nIdTitle, title, 256)) + if (!LoadString(hDllInstance, nIdTitle, title, sizeof(title)/sizeof(title[0]))) return FALSE; return SUCCEEDED(CreateShellLink(path, command, _T(""), NULL, NULL, 0, title)); @@ -186,35 +201,37 @@ } -static VOID +static BOOL CreateRandomSid( OUT PSID *Sid) { SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; LARGE_INTEGER SystemTime; PULONG Seed; - - NtQuerySystemTime (&SystemTime); + NTSTATUS Status; + + NtQuerySystemTime(&SystemTime); Seed = &SystemTime.u.LowPart; - RtlAllocateAndInitializeSid( + Status = RtlAllocateAndInitializeSid( &SystemAuthority, 4, SECURITY_NT_NON_UNIQUE, RtlUniform(Seed), - RtlUniform (Seed), - RtlUniform (Seed), + RtlUniform(Seed), + RtlUniform(Seed), SECURITY_NULL_RID, SECURITY_NULL_RID, SECURITY_NULL_RID, SECURITY_NULL_RID, Sid); + return NT_SUCCESS(Status); } static VOID AppendRidToSid( - IN PSID *Dst, + OUT PSID *Dst, IN PSID Src, IN ULONG NewRid) { @@ -260,7 +277,7 @@ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"), 0, - KEY_ALL_ACCESS, + KEY_QUERY_VALUE, &hKey)) { DebugPrint("Error: %lu\n", GetLastError()); @@ -326,7 +343,7 @@ if (!SetupGetStringField(&InfContext, 0, LineBuffer, - 256, + sizeof(LineBuffer)/sizeof(LineBuffer[0]), &LineLength)) { return FALSE; @@ -380,19 +397,9 @@ } -DWORD STDCALL -InstallLiveCD (HINSTANCE hInstance) -{ - LONG rc; - HKEY hKey = NULL; - DWORD dwType; - DWORD requiredSize; - LPTSTR Shell = NULL; - TCHAR CommandLine[MAX_PATH]; - STARTUPINFO StartupInfo; - PROCESS_INFORMATION ProcessInformation; - BOOL res; - +static BOOL +CommonInstall(VOID) +{ hSysSetupInf = SetupOpenInfFileW( L"syssetup.inf", NULL, @@ -401,62 +408,43 @@ if (hSysSetupInf == INVALID_HANDLE_VALUE) { DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); - return 0; + return FALSE; } if (!ProcessSysSetupInf()) { DebugPrint("ProcessSysSetupInf() failed!\n"); - return 0; - } - + SetupCloseInfFile(hSysSetupInf); + return FALSE; + } + + if (!EnableUserModePnpManager()) + { + DebugPrint("EnableUserModePnpManager() failed!\n"); + return FALSE; + } + + if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) + { + DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); + return FALSE; + } + + return TRUE; +} + +DWORD WINAPI +InstallLiveCD(IN HINSTANCE hInstance) +{ + HKEY hKey = NULL; + LPTSTR Shell = NULL; + STARTUPINFO StartupInfo; + PROCESS_INFORMATION ProcessInformation; + BOOL res; + + if (!CommonInstall()) + return 0; SetupCloseInfFile(hSysSetupInf); - - if (!EnableUserModePnpManager()) - { - DebugPrint("EnableUserModePnpManager() failed!\n"); - return 0; - } - - /* Load the default shell */ - rc = RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), /* FIXME: should be REGSTR_PATH_WINLOGON */ - 0, - KEY_QUERY_VALUE, - &hKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - rc = RegQueryValueEx( - hKey, - TEXT("Shell"), - NULL, - &dwType, - NULL, - &requiredSize); - if (rc != ERROR_SUCCESS) - goto cleanup; - else if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) - goto cleanup; - else if (requiredSize > (MAX_PATH - 1) * sizeof(TCHAR)) - goto cleanup; - Shell = HeapAlloc(GetProcessHeap(), 0, requiredSize + sizeof(TCHAR)); - if (!Shell) - goto cleanup; - Shell[requiredSize / sizeof(WCHAR)] = '\0'; - rc = RegQueryValueEx( - hKey, - TEXT("Shell"), - NULL, - NULL, - (LPBYTE)Shell, - &requiredSize); - if (rc != ERROR_SUCCESS) - goto cleanup; - if (dwType == REG_EXPAND_SZ) - ExpandEnvironmentStrings(Shell, CommandLine, MAX_PATH); - else if (dwType == REG_SZ) - _tcscpy(CommandLine, Shell); /* Run the shell */ StartupInfo.cb = sizeof(StartupInfo); @@ -467,7 +455,7 @@ StartupInfo.cbReserved2 = 0; StartupInfo.lpReserved2 = 0; res = CreateProcess( - CommandLine, + _T("userinit.exe"), NULL, NULL, NULL, @@ -496,133 +484,97 @@ } -DWORD STDCALL -InstallReactOS (HINSTANCE hInstance) -{ - TCHAR sAccessories[256]; - TCHAR sGames[256]; +static BOOL +CreateShortcuts(VOID) +{ + TCHAR szFolder[256]; + + CoInitialize(NULL); + + /* Create desktop shortcuts */ + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD, FALSE); + + /* Create program startmenu shortcuts */ + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("explorer.exe"), IDS_CMT_EXPLORER, FALSE); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_FIREFOX, _T("getfirefox.exe"), IDS_CMT_GETFIREFOX, TRUE); + + /* Create administrative tools startmenu shortcuts */ + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("servman.exe"), IDS_CMT_SERVMAN, FALSE); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("devmgmt.exe"), IDS_CMT_DEVMGMT, FALSE); + + /* Create and fill Accessories subfolder */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("calc.exe"), IDS_CMT_CALC, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("notepad.exe"), IDS_CMT_NOTEPAD, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("regedit.exe"), IDS_CMT_REGEDIT, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("wordpad.exe"), IDS_CMT_WORDPAD, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); + } + + /* Create Games subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("sol.exe"), IDS_CMT_SOLITAIRE, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("winemine.exe"), IDS_CMT_WINEMINE, FALSE); + } + + CoUninitialize(); + + return TRUE; +} + +DWORD WINAPI +InstallReactOS(HINSTANCE hInstance) +{ TCHAR szBuffer[MAX_PATH]; - TCHAR Path[MAX_PATH]; - -#if 0 - OutputDebugStringA ("InstallReactOS() called\n"); - - if (!InitializeSetupActionLog (FALSE)) - { - OutputDebugStringA ("InitializeSetupActionLog() failed\n"); - } - - LogItem(SYSSETUP_SEVERITY_INFORMATION, - L"ReactOS Setup starting"); - - LogItem(SYSSETUP_SEVERITY_FATAL_ERROR, - L"Buuuuuuaaaah!"); - - LogItem(SYSSETUP_SEVERITY_INFORMATION, - L"ReactOS Setup finished"); - - TerminateSetupActionLog (); -#endif -#if 0 - UNICODE_STRING SidString; -#endif - ULONG LastError; - - if (!InitializeProfiles ()) - { - DebugPrint ("InitializeProfiles() failed\n"); - return 0; - } - - CoInitialize(NULL); + DWORD LastError; + + InitializeSetupActionLog(FALSE); + LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS"); + + /* Set user langage to the system language */ SetUserDefaultLCID(GetSystemDefaultLCID()); SetThreadLocale(GetSystemDefaultLCID()); - /* Create desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); - - /* Create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("explorer.exe"), IDS_CMT_EXPLORER); - /* workaround to stop empty links for trunk builds */ - if (GetSystemDirectory(szBuffer, MAX_PATH)) - { - _tcscpy(Path, szBuffer); - if ((_taccess(_tcscat(Path, _T("\\downloader.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("downloader.exe"), IDS_CMT_DOWNLOADER); - - _tcscpy(Path, szBuffer); - if ((_taccess(_tcscat(Path, _T("\\getfirefox.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_FIREFOX, _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); - } - - - /* Create administritive tools startmenu shortcuts */ - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("servman.exe"), IDS_CMT_SERVMAN); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("devmgmt.exe"), IDS_CMT_DEVMGMT); - - /* create and fill Accessories subfolder */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) - { - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CALC, _T("calc.exe"), IDS_CMT_CALC); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_NOTEPAD, _T("notepad.exe"), IDS_CMT_NOTEPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_REGEDIT, _T("regedit.exe"), IDS_CMT_REGEDIT); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_WORDPAD, _T("wordpad.exe"), IDS_CMT_WORDPAD); - if (GetSystemDirectory(szBuffer, MAX_PATH)) - { - _tcscpy(Path, szBuffer); - if ((_taccess(_tcscat(Path, _T("\\screenshot.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_SNAP, _T("screenshot.exe"), IDS_CMT_SCREENSHOT); - } - } - - /* Create Games subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) - { - CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_SOLITAIRE, _T("sol.exe"), IDS_CMT_SOLITAIRE); - CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_WINEMINE, _T("winemine.exe"), IDS_CMT_WINEMINE); - } - - CoUninitialize(); + if (!InitializeProfiles()) + { + DebugPrint("InitializeProfiles() failed"); + return 0; + } + + if (!CreateShortcuts()) + { + DebugPrint("InitializeProfiles() failed"); + return 0; + } + + /* Initialize the Security Account Manager (SAM) */ + if (!SamInitializeSAM()) + { + DebugPrint("SamInitializeSAM() failed!"); + return 0; + } /* Create the semi-random Domain-SID */ - CreateRandomSid(&DomainSid); - if (DomainSid == NULL) - { - DebugPrint ("Domain-SID creation failed!\n"); - return 0; - } - -#if 0 - RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); - DebugPrint ("Domain-SID: %wZ\n", &SidString); - RtlFreeUnicodeString (&SidString); -#endif - - /* Initialize the Security Account Manager (SAM) */ - if (!SamInitializeSAM ()) - { - DebugPrint ("SamInitializeSAM() failed!\n"); - RtlFreeSid (DomainSid); + if (!CreateRandomSid(&DomainSid)) + { + DebugPrint("Domain-SID creation failed!"); return 0; } /* Set the Domain SID (aka Computer SID) */ - if (!SamSetDomainSid (DomainSid)) - { - DebugPrint ("SamSetDomainSid() failed!\n"); - RtlFreeSid (DomainSid); + if (!SamSetDomainSid(DomainSid)) + { + DebugPrint("SamSetDomainSid() failed!"); + RtlFreeSid(DomainSid); return 0; } /* Append the Admin-RID */ AppendRidToSid(&AdminSid, DomainSid, DOMAIN_USER_RID_ADMIN); - -#if 0 - RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); - DebugPrint ("Admin-SID: %wZ\n", &SidString); - RtlFreeUnicodeString (&SidString); -#endif /* Create the Administrator account */ if (!SamCreateUser(L"Administrator", L"", AdminSid)) @@ -635,7 +587,7 @@ LastError = GetLastError(); if (LastError != ERROR_USER_EXISTS) { - DebugPrint("SamCreateUser() failed!\n"); + DebugPrint("SamCreateUser() failed!"); RtlFreeSid(AdminSid); RtlFreeSid(DomainSid); return 0; @@ -645,7 +597,7 @@ /* Create the Administrator profile */ if (!CreateUserProfileW(AdminSid, L"Administrator")) { - DebugPrint("CreateUserProfileW() failed!\n"); + DebugPrint("CreateUserProfileW() failed!"); RtlFreeSid(AdminSid); RtlFreeSid(DomainSid); return 0; @@ -664,37 +616,15 @@ CreateDirectory(szBuffer, NULL); } - hSysSetupInf = SetupOpenInfFileW(L"syssetup.inf", - NULL, - INF_STYLE_WIN4, - NULL); - if (hSysSetupInf == INVALID_HANDLE_VALUE) - { - DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); - return 0; - } - - if (!ProcessSysSetupInf()) - { - DebugPrint("ProcessSysSetupInf() failed!\n"); - return 0; - } - - if (!EnableUserModePnpManager()) - { - DebugPrint("EnableUserModePnpManager() failed!\n"); - return 0; - } - - if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) - { - DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); - return 0; - } + if (!CommonInstall()) + return 0; InstallWizard(); SetupCloseInfFile(hSysSetupInf); + + LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done"); + TerminateSetupActionLog(); /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL /// DO NOT REMOVE!!! @@ -708,8 +638,10 @@ * @unimplemented */ DWORD STDCALL -SetupChangeFontSize(HANDLE hWnd, - LPCWSTR lpszFontSize) -{ +SetupChangeFontSize( + IN HANDLE hWnd, + IN LPCWSTR lpszFontSize) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

[hpoussin] 27587: Write source file and line in the setup install log
by hpoussin＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: hpoussin Date: Wed Jul 11 13:04:22 2007 New Revision: 27587 URL: http://svn.reactos.org/svn/reactos?rev=27587&view=rev Log: Write source file and line in the setup install log Modified: trunk/reactos/dll/win32/syssetup/logfile.c trunk/reactos/dll/win32/syssetup/syssetup.def trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/include/reactos/libs/syssetup/syssetup.h Modified: trunk/reactos/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/logfile… ============================================================================== --- trunk/reactos/dll/win32/syssetup/logfile.c (original) +++ trunk/reactos/dll/win32/syssetup/logfile.c Wed Jul 11 13:04:22 2007 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Log file functions @@ -33,7 +32,6 @@ #include <syssetup/syssetup.h> - /* GLOBALS ******************************************************************/ HANDLE hLogFile = NULL; @@ -41,28 +39,26 @@ /* FUNCTIONS ****************************************************************/ -BOOL STDCALL +BOOL WINAPI InitializeSetupActionLog (BOOL bDeleteOldLogFile) { WCHAR szFileName[MAX_PATH]; - GetWindowsDirectoryW (szFileName, - MAX_PATH); - - if (szFileName[wcslen (szFileName)] != L'\\') + GetWindowsDirectoryW(szFileName, MAX_PATH); + + if (szFileName[wcslen(szFileName)] != L'\\') { wcsncat(szFileName, - L"\\", - MAX_PATH); + L"\\", + MAX_PATH); } wcsncat(szFileName, L"setuplog.txt", - MAX_PATH); - - if (bDeleteOldLogFile != FALSE) - { - SetFileAttributesW(szFileName, - FILE_ATTRIBUTE_NORMAL); + MAX_PATH); + + if (bDeleteOldLogFile) + { + SetFileAttributesW(szFileName, FILE_ATTRIBUTE_NORMAL); DeleteFileW(szFileName); } @@ -83,8 +79,8 @@ } -VOID STDCALL -TerminateSetupActionLog (VOID) +VOID WINAPI +TerminateSetupActionLog(VOID) { if (hLogFile != NULL) { @@ -94,16 +90,19 @@ } -BOOL STDCALL -LogItem(DWORD dwSeverity, - LPWSTR lpMessageText) +BOOL WINAPI +SYSSETUP_LogItem(IN const LPSTR lpFileName, + IN DWORD dwLineNumber, + IN DWORD dwSeverity, + IN LPWSTR lpMessageText) { - LPSTR lpNewLine = "\r\n"; - LPSTR lpSeverityString; + const LPCSTR lpNewLine = "\r\n"; + LPCSTR lpSeverityString; LPSTR lpMessageString; DWORD dwMessageLength; DWORD dwMessageSize; DWORD dwWritten; + CHAR Buffer[6]; /* Get the severity code string */ switch (dwSeverity) @@ -136,13 +135,11 @@ dwMessageLength); /* Allocate message string buffer */ - lpMessageString = (LPSTR) HeapAlloc(GetProcessHeap (), + lpMessageString = (LPSTR) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwMessageSize); - if (lpMessageString == NULL) - { + if (!lpMessageString) return FALSE; - } /* Convert unicode to ansi */ RtlUnicodeToMultiByteN(lpMessageString, @@ -157,6 +154,27 @@ NULL, FILE_END); + /* Write file name */ + WriteFile(hLogFile, + lpFileName, + strlen(lpFileName), + &dwWritten, + NULL); + + /* Write comma */ + WriteFile(hLogFile, ",", 1, &dwWritten, NULL); + + /* Write line number */ + snprintf(Buffer, sizeof(Buffer), "%lu", dwLineNumber); + WriteFile(hLogFile, + Buffer, + strlen(Buffer), + &dwWritten, + NULL); + + /* Write comma */ + WriteFile(hLogFile, ",", 1, &dwWritten, NULL); + /* Write severity code */ WriteFile(hLogFile, lpSeverityString, @@ -174,7 +192,7 @@ /* Write newline */ WriteFile(hLogFile, lpNewLine, - 2, + sizeof(lpNewLine), &dwWritten, NULL); Modified: trunk/reactos/dll/win32/syssetup/syssetup.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.def (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.def Wed Jul 11 13:04:22 2007 @@ -7,7 +7,7 @@ InstallLiveCD@4 InstallReactOS@4 KeyboardClassInstaller@12 -LogItem@8 +;LogItem@8 ;LogItem0 ;LogItem1 ;LogItem2 Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Wed Jul 11 13:04:22 2007 @@ -572,7 +572,7 @@ TCHAR Password2[15]; PWCHAR Password; WCHAR Title[64]; - WCHAR EmptyComputerName[256], EmptyPassword[256], NotMatchPassword[256], WrongPassword[256]; + WCHAR EmptyComputerName[256], NotMatchPassword[256], WrongPassword[256]; DWORD Length; LPNMHDR lpnm; Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse… ============================================================================== --- trunk/reactos/include/reactos/libs/syssetup/syssetup.h (original) +++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h Wed Jul 11 13:04:22 2007 @@ -39,16 +39,20 @@ #define SYSSETUP_SEVERITY_FATAL_ERROR 3 -BOOL STDCALL -InitializeSetupActionLog (BOOL bDeleteOldLogFile); +BOOL WINAPI +InitializeSetupActionLog(IN BOOL bDeleteOldLogFile); -VOID STDCALL -TerminateSetupActionLog (VOID); +VOID WINAPI +TerminateSetupActionLog(VOID); -BOOL STDCALL -LogItem (DWORD dwSeverity, - LPWSTR lpMessageText); +BOOL WINAPI +SYSSETUP_LogItem(IN const LPSTR lpFileName, + IN DWORD dwLineNumber, + IN DWORD dwSeverity, + IN LPWSTR lpMessageText); +#define LogItem(dwSeverity, lpMessageText) \ + SYSSETUP_LogItem(__FILE__, __LINE__, dwSeverity, lpMessageText) #endif /* __SYSSETUP_H_INCLUDED__ */

1 0

[hpoussin] 27586: [FORMATTING] Fix indentation (mixed tabs and spaces) by always using 4 spaces
by hpoussin＠svn.reactos.org 11 Jul '07

11 Jul '07

Author: hpoussin Date: Wed Jul 11 12:52:55 2007 New Revision: 27586 URL: http://svn.reactos.org/svn/reactos?rev=27586&view=rev Log: [FORMATTING] Fix indentation (mixed tabs and spaces) by always using 4 spaces Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/logfile.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Jul 11 12:52:55 2007 @@ -66,636 +66,641 @@ void DebugPrint(char* fmt,...) { - char buffer[512]; - va_list ap; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - strcat(buffer, "\nRebooting now!"); - MessageBoxA(NULL, - buffer, - "ReactOS Setup", - MB_OK); + char buffer[512]; + va_list ap; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + strcat(buffer, "\nRebooting now!"); + MessageBoxA(NULL, + buffer, + "ReactOS Setup", + MB_OK); } HRESULT CreateShellLink(LPCTSTR linkPath, LPCTSTR cmd, LPCTSTR arg, LPCTSTR dir, LPCTSTR iconPath, int icon_nr, LPCTSTR comment) { - IShellLink* psl; - IPersistFile* ppf; + IShellLink* psl; + IPersistFile* ppf; #ifndef _UNICODE - WCHAR buffer[MAX_PATH]; + WCHAR buffer[MAX_PATH]; #endif /* _UNICODE */ - HRESULT hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID*)&psl); - - if (SUCCEEDED(hr)) - { - hr = psl->lpVtbl->SetPath(psl, cmd); - - if (arg) - { - hr = psl->lpVtbl->SetArguments(psl, arg); - } - - if (dir) - { - hr = psl->lpVtbl->SetWorkingDirectory(psl, dir); - } - - if (iconPath) - { - hr = psl->lpVtbl->SetIconLocation(psl, iconPath, icon_nr); - } - - if (comment) - { - hr = psl->lpVtbl->SetDescription(psl, comment); - } - - hr = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); - - if (SUCCEEDED(hr)) + HRESULT hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID*)&psl); + + if (SUCCEEDED(hr)) + { + hr = psl->lpVtbl->SetPath(psl, cmd); + + if (arg) + { + hr = psl->lpVtbl->SetArguments(psl, arg); + } + + if (dir) + { + hr = psl->lpVtbl->SetWorkingDirectory(psl, dir); + } + + if (iconPath) + { + hr = psl->lpVtbl->SetIconLocation(psl, iconPath, icon_nr); + } + + if (comment) + { + hr = psl->lpVtbl->SetDescription(psl, comment); + } + + hr = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); + + if (SUCCEEDED(hr)) { #ifdef _UNICODE - hr = ppf->lpVtbl->Save(ppf, linkPath, TRUE); + hr = ppf->lpVtbl->Save(ppf, linkPath, TRUE); #else /* _UNICODE */ - MultiByteToWideChar(CP_ACP, 0, linkPath, -1, buffer, MAX_PATH); - - hr = ppf->lpVtbl->Save(ppf, buffer, TRUE); + MultiByteToWideChar(CP_ACP, 0, linkPath, -1, buffer, MAX_PATH); + + hr = ppf->lpVtbl->Save(ppf, buffer, TRUE); #endif /* _UNICODE */ - ppf->lpVtbl->Release(ppf); - } - - psl->lpVtbl->Release(psl); - } - - return hr; + ppf->lpVtbl->Release(ppf); + } + + psl->lpVtbl->Release(psl); + } + + return hr; } static BOOL CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle) { - TCHAR path[MAX_PATH]; - TCHAR title[256]; - TCHAR name[256]; - LPTSTR p = path; - - if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) - return FALSE; - - if (folder) - { - p = PathAddBackslash(p); - _tcscpy(p, folder); - } - - p = PathAddBackslash(p); - - if(!LoadString(hDllInstance, nIdName, name, 256)) - return FALSE; - _tcscpy(p, name); - - if (!LoadString(hDllInstance, nIdTitle, title, 256)) - return FALSE; - - return SUCCEEDED(CreateShellLink(path, command, _T(""), NULL, NULL, 0, title)); + TCHAR path[MAX_PATH]; + TCHAR title[256]; + TCHAR name[256]; + LPTSTR p = path; + + if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) + return FALSE; + + if (folder) + { + p = PathAddBackslash(p); + _tcscpy(p, folder); + } + + p = PathAddBackslash(p); + + if(!LoadString(hDllInstance, nIdName, name, 256)) + return FALSE; + _tcscpy(p, name); + + if (!LoadString(hDllInstance, nIdTitle, title, 256)) + return FALSE; + + return SUCCEEDED(CreateShellLink(path, command, _T(""), NULL, NULL, 0, title)); } static BOOL CreateShortcutFolder(int csidl, UINT nID, LPTSTR name, int nameLen) { - TCHAR path[MAX_PATH]; - LPTSTR p; - - if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) - return FALSE; - - if (!LoadString(hDllInstance, nID, name, nameLen)) - return FALSE; - - p = PathAddBackslash(path); - _tcscpy(p, name); - - return CreateDirectory(path, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; + TCHAR path[MAX_PATH]; + LPTSTR p; + + if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) + return FALSE; + + if (!LoadString(hDllInstance, nID, name, nameLen)) + return FALSE; + + p = PathAddBackslash(path); + _tcscpy(p, name); + + return CreateDirectory(path, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; } static VOID -CreateRandomSid (PSID *Sid) -{ - SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; - LARGE_INTEGER SystemTime; - PULONG Seed; - - NtQuerySystemTime (&SystemTime); - Seed = &SystemTime.u.LowPart; - - RtlAllocateAndInitializeSid (&SystemAuthority, - 4, - SECURITY_NT_NON_UNIQUE, - RtlUniform (Seed), - RtlUniform (Seed), - RtlUniform (Seed), - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - Sid); +CreateRandomSid( + OUT PSID *Sid) +{ + SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; + LARGE_INTEGER SystemTime; + PULONG Seed; + + NtQuerySystemTime (&SystemTime); + Seed = &SystemTime.u.LowPart; + + RtlAllocateAndInitializeSid( + &SystemAuthority, + 4, + SECURITY_NT_NON_UNIQUE, + RtlUniform(Seed), + RtlUniform (Seed), + RtlUniform (Seed), + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + Sid); } static VOID -AppendRidToSid (PSID *Dst, - PSID Src, - ULONG NewRid) -{ - ULONG Rid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; - UCHAR RidCount; - ULONG i; - - RidCount = *RtlSubAuthorityCountSid (Src); - - for (i = 0; i < RidCount; i++) - Rid[i] = *RtlSubAuthoritySid (Src, i); - - if (RidCount < 8) - { - Rid[RidCount] = NewRid; - RidCount++; - } - - RtlAllocateAndInitializeSid (RtlIdentifierAuthoritySid (Src), - RidCount, - Rid[0], - Rid[1], - Rid[2], - Rid[3], - Rid[4], - Rid[5], - Rid[6], - Rid[7], - Dst); +AppendRidToSid( + IN PSID *Dst, + IN PSID Src, + IN ULONG NewRid) +{ + ULONG Rid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; + UCHAR RidCount; + ULONG i; + + RidCount = *RtlSubAuthorityCountSid (Src); + + for (i = 0; i < RidCount; i++) + Rid[i] = *RtlSubAuthoritySid (Src, i); + + if (RidCount < 8) + { + Rid[RidCount] = NewRid; + RidCount++; + } + + RtlAllocateAndInitializeSid( + RtlIdentifierAuthoritySid(Src), + RidCount, + Rid[0], + Rid[1], + Rid[2], + Rid[3], + Rid[4], + Rid[5], + Rid[6], + Rid[7], + Dst); } static VOID -CreateTempDir(LPCWSTR VarName) -{ - TCHAR szTempDir[MAX_PATH]; - TCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - HKEY hKey; - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"), - 0, - KEY_ALL_ACCESS, - &hKey)) - { - DebugPrint("Error: %lu\n", GetLastError()); - return; - } - - /* Get temp dir */ - dwLength = MAX_PATH * sizeof(TCHAR); - if (RegQueryValueEx(hKey, - VarName, - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) - { - DebugPrint("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return; - } - - /* Expand it */ - if (!ExpandEnvironmentStrings(szBuffer, - szTempDir, - MAX_PATH)) - { - DebugPrint("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return; - } - - /* Create profiles directory */ - if (!CreateDirectory(szTempDir, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DebugPrint("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return; - } - } - - RegCloseKey(hKey); +CreateTempDir( + IN LPCWSTR VarName) +{ + TCHAR szTempDir[MAX_PATH]; + TCHAR szBuffer[MAX_PATH]; + DWORD dwLength; + HKEY hKey; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"), + 0, + KEY_ALL_ACCESS, + &hKey)) + { + DebugPrint("Error: %lu\n", GetLastError()); + return; + } + + /* Get temp dir */ + dwLength = MAX_PATH * sizeof(TCHAR); + if (RegQueryValueEx(hKey, + VarName, + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength)) + { + DebugPrint("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return; + } + + /* Expand it */ + if (!ExpandEnvironmentStrings(szBuffer, + szTempDir, + MAX_PATH)) + { + DebugPrint("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return; + } + + /* Create profiles directory */ + if (!CreateDirectory(szTempDir, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DebugPrint("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return; + } + } + + RegCloseKey(hKey); } BOOL ProcessSysSetupInf(VOID) { - INFCONTEXT InfContext; - TCHAR LineBuffer[256]; - DWORD LineLength; - - if (!SetupFindFirstLine(hSysSetupInf, - _T("DeviceInfsToInstall"), - NULL, - &InfContext)) - { - return FALSE; - } - - do - { - if (!SetupGetStringField(&InfContext, - 0, - LineBuffer, - 256, - &LineLength)) - { - return FALSE; - } - - if (!SetupDiInstallClass(NULL, LineBuffer, DI_QUIETINSTALL, NULL)) - { - return FALSE; - } - } - while (SetupFindNextLine(&InfContext, &InfContext)); - - return TRUE; + INFCONTEXT InfContext; + TCHAR LineBuffer[256]; + DWORD LineLength; + + if (!SetupFindFirstLine(hSysSetupInf, + _T("DeviceInfsToInstall"), + NULL, + &InfContext)) + { + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + LineBuffer, + 256, + &LineLength)) + { + return FALSE; + } + + if (!SetupDiInstallClass(NULL, LineBuffer, DI_QUIETINSTALL, NULL)) + { + return FALSE; + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + + return TRUE; } static BOOL EnableUserModePnpManager(VOID) { - SC_HANDLE hSCManager = NULL; - SC_HANDLE hService = NULL; - BOOL ret = FALSE; - - hSCManager = OpenSCManager(NULL, NULL, 0); - if (hSCManager == NULL) - goto cleanup; - - hService = OpenService(hSCManager, _T("PlugPlay"), SERVICE_CHANGE_CONFIG | SERVICE_START); - if (hService == NULL) - goto cleanup; - - ret = ChangeServiceConfig( - hService, - SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if (!ret) - goto cleanup; - - ret = StartService(hService, 0, NULL); - if (!ret) - goto cleanup; - - ret = TRUE; + SC_HANDLE hSCManager = NULL; + SC_HANDLE hService = NULL; + BOOL ret = FALSE; + + hSCManager = OpenSCManager(NULL, NULL, 0); + if (hSCManager == NULL) + goto cleanup; + + hService = OpenService(hSCManager, _T("PlugPlay"), SERVICE_CHANGE_CONFIG | SERVICE_START); + if (hService == NULL) + goto cleanup; + + ret = ChangeServiceConfig( + hService, + SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (!ret) + goto cleanup; + + ret = StartService(hService, 0, NULL); + if (!ret) + goto cleanup; + + ret = TRUE; cleanup: - if (hSCManager != NULL) - CloseServiceHandle(hSCManager); - if (hService != NULL) - CloseServiceHandle(hService); - return ret; + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hService != NULL) + CloseServiceHandle(hService); + return ret; } DWORD STDCALL InstallLiveCD (HINSTANCE hInstance) { - LONG rc; - HKEY hKey = NULL; - DWORD dwType; - DWORD requiredSize; - LPTSTR Shell = NULL; - TCHAR CommandLine[MAX_PATH]; - STARTUPINFO StartupInfo; - PROCESS_INFORMATION ProcessInformation; - BOOL res; - - hSysSetupInf = SetupOpenInfFileW( - L"syssetup.inf", - NULL, - INF_STYLE_WIN4, - NULL); - if (hSysSetupInf == INVALID_HANDLE_VALUE) - { - DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); + LONG rc; + HKEY hKey = NULL; + DWORD dwType; + DWORD requiredSize; + LPTSTR Shell = NULL; + TCHAR CommandLine[MAX_PATH]; + STARTUPINFO StartupInfo; + PROCESS_INFORMATION ProcessInformation; + BOOL res; + + hSysSetupInf = SetupOpenInfFileW( + L"syssetup.inf", + NULL, + INF_STYLE_WIN4, + NULL); + if (hSysSetupInf == INVALID_HANDLE_VALUE) + { + DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); + return 0; + } + + if (!ProcessSysSetupInf()) + { + DebugPrint("ProcessSysSetupInf() failed!\n"); + return 0; + } + + SetupCloseInfFile(hSysSetupInf); + + if (!EnableUserModePnpManager()) + { + DebugPrint("EnableUserModePnpManager() failed!\n"); + return 0; + } + + /* Load the default shell */ + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), /* FIXME: should be REGSTR_PATH_WINLOGON */ + 0, + KEY_QUERY_VALUE, + &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + rc = RegQueryValueEx( + hKey, + TEXT("Shell"), + NULL, + &dwType, + NULL, + &requiredSize); + if (rc != ERROR_SUCCESS) + goto cleanup; + else if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) + goto cleanup; + else if (requiredSize > (MAX_PATH - 1) * sizeof(TCHAR)) + goto cleanup; + Shell = HeapAlloc(GetProcessHeap(), 0, requiredSize + sizeof(TCHAR)); + if (!Shell) + goto cleanup; + Shell[requiredSize / sizeof(WCHAR)] = '\0'; + rc = RegQueryValueEx( + hKey, + TEXT("Shell"), + NULL, + NULL, + (LPBYTE)Shell, + &requiredSize); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (dwType == REG_EXPAND_SZ) + ExpandEnvironmentStrings(Shell, CommandLine, MAX_PATH); + else if (dwType == REG_SZ) + _tcscpy(CommandLine, Shell); + + /* Run the shell */ + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpReserved = NULL; + StartupInfo.lpDesktop = NULL; + StartupInfo.lpTitle = NULL; + StartupInfo.dwFlags = 0; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpReserved2 = 0; + res = CreateProcess( + CommandLine, + NULL, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (!res) + goto cleanup; + + /* Wait for process termination */ + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + +cleanup: + if (hKey != NULL) + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, Shell); + MessageBoxA( + NULL, + "You can shutdown your computer, or press ENTER to reboot", + "ReactOS LiveCD", + MB_OK); return 0; - } - - if (!ProcessSysSetupInf()) - { - DebugPrint("ProcessSysSetupInf() failed!\n"); - return 0; - } - - SetupCloseInfFile(hSysSetupInf); - - if (!EnableUserModePnpManager()) - { - DebugPrint("EnableUserModePnpManager() failed!\n"); - return 0; - } - - /* Load the default shell */ - rc = RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), /* FIXME: should be REGSTR_PATH_WINLOGON */ - 0, - KEY_QUERY_VALUE, - &hKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - rc = RegQueryValueEx( - hKey, - TEXT("Shell"), - NULL, - &dwType, - NULL, - &requiredSize); - if (rc != ERROR_SUCCESS) - goto cleanup; - else if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) - goto cleanup; - else if (requiredSize > (MAX_PATH - 1) * sizeof(TCHAR)) - goto cleanup; - Shell = HeapAlloc(GetProcessHeap(), 0, requiredSize + sizeof(TCHAR)); - if (!Shell) - goto cleanup; - Shell[requiredSize / sizeof(WCHAR)] = '\0'; - rc = RegQueryValueEx( - hKey, - TEXT("Shell"), - NULL, - NULL, - (LPBYTE)Shell, - &requiredSize); - if (rc != ERROR_SUCCESS) - goto cleanup; - if (dwType == REG_EXPAND_SZ) - ExpandEnvironmentStrings(Shell, CommandLine, MAX_PATH); - else if (dwType == REG_SZ) - _tcscpy(CommandLine, Shell); - - /* Run the shell */ - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; - res = CreateProcess( - CommandLine, - NULL, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - if (!res) - goto cleanup; - - /* Wait for process termination */ - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); - -cleanup: - if (hKey != NULL) - RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, Shell); - MessageBoxA( - NULL, - "You can shutdown your computer, or press ENTER to reboot", - "ReactOS LiveCD", - MB_OK); - return 0; } DWORD STDCALL InstallReactOS (HINSTANCE hInstance) { - TCHAR sAccessories[256]; - TCHAR sGames[256]; - TCHAR szBuffer[MAX_PATH]; - TCHAR Path[MAX_PATH]; - -# if 0 - OutputDebugStringA ("InstallReactOS() called\n"); - - if (!InitializeSetupActionLog (FALSE)) - { - OutputDebugStringA ("InitializeSetupActionLog() failed\n"); - } - - LogItem (SYSSETUP_SEVERITY_INFORMATION, - L"ReactOS Setup starting"); - - LogItem (SYSSETUP_SEVERITY_FATAL_ERROR, - L"Buuuuuuaaaah!"); - - LogItem (SYSSETUP_SEVERITY_INFORMATION, - L"ReactOS Setup finished"); - - TerminateSetupActionLog (); + TCHAR sAccessories[256]; + TCHAR sGames[256]; + TCHAR szBuffer[MAX_PATH]; + TCHAR Path[MAX_PATH]; + +#if 0 + OutputDebugStringA ("InstallReactOS() called\n"); + + if (!InitializeSetupActionLog (FALSE)) + { + OutputDebugStringA ("InitializeSetupActionLog() failed\n"); + } + + LogItem(SYSSETUP_SEVERITY_INFORMATION, + L"ReactOS Setup starting"); + + LogItem(SYSSETUP_SEVERITY_FATAL_ERROR, + L"Buuuuuuaaaah!"); + + LogItem(SYSSETUP_SEVERITY_INFORMATION, + L"ReactOS Setup finished"); + + TerminateSetupActionLog (); #endif #if 0 - UNICODE_STRING SidString; + UNICODE_STRING SidString; #endif - ULONG LastError; - - if (!InitializeProfiles ()) - { - DebugPrint ("InitializeProfiles() failed\n"); - return 0; - } - - CoInitialize(NULL); - SetUserDefaultLCID(GetSystemDefaultLCID()); - SetThreadLocale(GetSystemDefaultLCID()); - - /* create desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); - - /* create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("explorer.exe"), IDS_CMT_EXPLORER); - /* workaround to stop empty links for trunk builds */ - if(GetSystemDirectory(szBuffer, MAX_PATH)) - { - _tcscpy(Path, szBuffer); - if((_taccess(_tcscat(Path, _T("\\downloader.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("downloader.exe"), IDS_CMT_DOWNLOADER); - - _tcscpy(Path, szBuffer); - if((_taccess(_tcscat(Path, _T("\\getfirefox.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_FIREFOX, _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); - } - - - /* create administritive tools startmenu shortcuts */ - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("servman.exe"), IDS_CMT_SERVMAN); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("devmgmt.exe"), IDS_CMT_DEVMGMT); - - /* create and fill Accessories subfolder */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) - { - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CALC, _T("calc.exe"), IDS_CMT_CALC); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_NOTEPAD, _T("notepad.exe"), IDS_CMT_NOTEPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_REGEDIT, _T("regedit.exe"), IDS_CMT_REGEDIT); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_WORDPAD, _T("wordpad.exe"), IDS_CMT_WORDPAD); - if(GetSystemDirectory(szBuffer, MAX_PATH)) - { - _tcscpy(Path, szBuffer); - if((_taccess(_tcscat(Path, _T("\\screenshot.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_SNAP, _T("screenshot.exe"), IDS_CMT_SCREENSHOT); - } - } - - /* create Games subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) - { - CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_SOLITAIRE, _T("sol.exe"), IDS_CMT_SOLITAIRE); - CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_WINEMINE, _T("winemine.exe"), IDS_CMT_WINEMINE); - } - - CoUninitialize(); - - /* Create the semi-random Domain-SID */ - CreateRandomSid (&DomainSid); - if (DomainSid == NULL) - { - DebugPrint ("Domain-SID creation failed!\n"); - return 0; + ULONG LastError; + + if (!InitializeProfiles ()) + { + DebugPrint ("InitializeProfiles() failed\n"); + return 0; + } + + CoInitialize(NULL); + SetUserDefaultLCID(GetSystemDefaultLCID()); + SetThreadLocale(GetSystemDefaultLCID()); + + /* Create desktop shortcuts */ + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); + + /* Create program startmenu shortcuts */ + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("explorer.exe"), IDS_CMT_EXPLORER); + /* workaround to stop empty links for trunk builds */ + if (GetSystemDirectory(szBuffer, MAX_PATH)) + { + _tcscpy(Path, szBuffer); + if ((_taccess(_tcscat(Path, _T("\\downloader.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("downloader.exe"), IDS_CMT_DOWNLOADER); + + _tcscpy(Path, szBuffer); + if ((_taccess(_tcscat(Path, _T("\\getfirefox.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_FIREFOX, _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); + } + + + /* Create administritive tools startmenu shortcuts */ + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("servman.exe"), IDS_CMT_SERVMAN); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("devmgmt.exe"), IDS_CMT_DEVMGMT); + + /* create and fill Accessories subfolder */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) + { + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CALC, _T("calc.exe"), IDS_CMT_CALC); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_NOTEPAD, _T("notepad.exe"), IDS_CMT_NOTEPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_REGEDIT, _T("regedit.exe"), IDS_CMT_REGEDIT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_WORDPAD, _T("wordpad.exe"), IDS_CMT_WORDPAD); + if (GetSystemDirectory(szBuffer, MAX_PATH)) + { + _tcscpy(Path, szBuffer); + if ((_taccess(_tcscat(Path, _T("\\screenshot.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_SNAP, _T("screenshot.exe"), IDS_CMT_SCREENSHOT); + } + } + + /* Create Games subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) + { + CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_SOLITAIRE, _T("sol.exe"), IDS_CMT_SOLITAIRE); + CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_WINEMINE, _T("winemine.exe"), IDS_CMT_WINEMINE); + } + + CoUninitialize(); + + /* Create the semi-random Domain-SID */ + CreateRandomSid(&DomainSid); + if (DomainSid == NULL) + { + DebugPrint ("Domain-SID creation failed!\n"); + return 0; } #if 0 - RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); - DebugPrint ("Domain-SID: %wZ\n", &SidString); - RtlFreeUnicodeString (&SidString); + RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); + DebugPrint ("Domain-SID: %wZ\n", &SidString); + RtlFreeUnicodeString (&SidString); #endif - /* Initialize the Security Account Manager (SAM) */ - if (!SamInitializeSAM ()) - { - DebugPrint ("SamInitializeSAM() failed!\n"); - RtlFreeSid (DomainSid); - return 0; - } - - /* Set the Domain SID (aka Computer SID) */ - if (!SamSetDomainSid (DomainSid)) - { - DebugPrint ("SamSetDomainSid() failed!\n"); - RtlFreeSid (DomainSid); - return 0; - } - - /* Append the Admin-RID */ - AppendRidToSid(&AdminSid, DomainSid, DOMAIN_USER_RID_ADMIN); + /* Initialize the Security Account Manager (SAM) */ + if (!SamInitializeSAM ()) + { + DebugPrint ("SamInitializeSAM() failed!\n"); + RtlFreeSid (DomainSid); + return 0; + } + + /* Set the Domain SID (aka Computer SID) */ + if (!SamSetDomainSid (DomainSid)) + { + DebugPrint ("SamSetDomainSid() failed!\n"); + RtlFreeSid (DomainSid); + return 0; + } + + /* Append the Admin-RID */ + AppendRidToSid(&AdminSid, DomainSid, DOMAIN_USER_RID_ADMIN); #if 0 - RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); - DebugPrint ("Admin-SID: %wZ\n", &SidString); - RtlFreeUnicodeString (&SidString); + RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); + DebugPrint ("Admin-SID: %wZ\n", &SidString); + RtlFreeUnicodeString (&SidString); #endif - /* Create the Administrator account */ - if (!SamCreateUser(L"Administrator", L"", AdminSid)) - { - /* Check what the error was. - * If the Admin Account already exists, then it means Setup - * wasn't allowed to finish properly. Instead of rebooting - * and not completing it, let it restart instead - */ - LastError = GetLastError(); - if (LastError != ERROR_USER_EXISTS) - { - DebugPrint("SamCreateUser() failed!\n"); - RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); - return 0; - } - } - - /* Create the Administrator profile */ - if (!CreateUserProfileW(AdminSid, L"Administrator")) - { - DebugPrint("CreateUserProfileW() failed!\n"); + /* Create the Administrator account */ + if (!SamCreateUser(L"Administrator", L"", AdminSid)) + { + /* Check what the error was. + * If the Admin Account already exists, then it means Setup + * wasn't allowed to finish properly. Instead of rebooting + * and not completing it, let it restart instead + */ + LastError = GetLastError(); + if (LastError != ERROR_USER_EXISTS) + { + DebugPrint("SamCreateUser() failed!\n"); + RtlFreeSid(AdminSid); + RtlFreeSid(DomainSid); + return 0; + } + } + + /* Create the Administrator profile */ + if (!CreateUserProfileW(AdminSid, L"Administrator")) + { + DebugPrint("CreateUserProfileW() failed!\n"); + RtlFreeSid(AdminSid); + RtlFreeSid(DomainSid); + return 0; + } + RtlFreeSid(AdminSid); RtlFreeSid(DomainSid); + + CreateTempDir(L"TEMP"); + CreateTempDir(L"TMP"); + + if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR))) + { + PathAddBackslash(szBuffer); + _tcscat(szBuffer, _T("system")); + CreateDirectory(szBuffer, NULL); + } + + hSysSetupInf = SetupOpenInfFileW(L"syssetup.inf", + NULL, + INF_STYLE_WIN4, + NULL); + if (hSysSetupInf == INVALID_HANDLE_VALUE) + { + DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); + return 0; + } + + if (!ProcessSysSetupInf()) + { + DebugPrint("ProcessSysSetupInf() failed!\n"); + return 0; + } + + if (!EnableUserModePnpManager()) + { + DebugPrint("EnableUserModePnpManager() failed!\n"); + return 0; + } + + if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) + { + DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); + return 0; + } + + InstallWizard(); + + SetupCloseInfFile(hSysSetupInf); + + /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL + /// DO NOT REMOVE!!! + DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); + return 0; - } - - RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); - - CreateTempDir(L"TEMP"); - CreateTempDir(L"TMP"); - - if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR))) - { - PathAddBackslash(szBuffer); - _tcscat(szBuffer, _T("system")); - CreateDirectory(szBuffer, NULL); - } - - hSysSetupInf = SetupOpenInfFileW(L"syssetup.inf", - NULL, - INF_STYLE_WIN4, - NULL); - if (hSysSetupInf == INVALID_HANDLE_VALUE) - { - DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); - return 0; - } - - if (!ProcessSysSetupInf()) - { - DebugPrint("ProcessSysSetupInf() failed!\n"); - return 0; - } - - if (!EnableUserModePnpManager()) - { - DebugPrint("EnableUserModePnpManager() failed!\n"); - return 0; - } - - if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) - { - DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); - return 0; - } - - InstallWizard(); - - SetupCloseInfFile(hSysSetupInf); - - /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL - /// DO NOT REMOVE!!! - DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); - - return 0; } @@ -706,5 +711,5 @@ SetupChangeFontSize(HANDLE hWnd, LPCWSTR lpszFontSize) { - return FALSE; -} + return FALSE; +} Modified: trunk/reactos/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/logfile… ============================================================================== --- trunk/reactos/dll/win32/syssetup/logfile.c (original) +++ trunk/reactos/dll/win32/syssetup/logfile.c Wed Jul 11 12:52:55 2007 @@ -44,145 +44,145 @@ BOOL STDCALL InitializeSetupActionLog (BOOL bDeleteOldLogFile) { - WCHAR szFileName[MAX_PATH]; + WCHAR szFileName[MAX_PATH]; - GetWindowsDirectoryW (szFileName, - MAX_PATH); + GetWindowsDirectoryW (szFileName, + MAX_PATH); - if (szFileName[wcslen (szFileName)] != L'\\') + if (szFileName[wcslen (szFileName)] != L'\\') { - wcsncat (szFileName, - L"\\", - MAX_PATH); + wcsncat(szFileName, + L"\\", + MAX_PATH); } - wcsncat (szFileName, - L"setuplog.txt", - MAX_PATH); + wcsncat(szFileName, + L"setuplog.txt", + MAX_PATH); - if (bDeleteOldLogFile != FALSE) + if (bDeleteOldLogFile != FALSE) { - SetFileAttributesW (szFileName, - FILE_ATTRIBUTE_NORMAL); - DeleteFileW (szFileName); + SetFileAttributesW(szFileName, + FILE_ATTRIBUTE_NORMAL); + DeleteFileW(szFileName); } - hLogFile = CreateFileW (szFileName, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hLogFile == INVALID_HANDLE_VALUE) + hLogFile = CreateFileW(szFileName, + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hLogFile == INVALID_HANDLE_VALUE) { - hLogFile = NULL; - return FALSE; + hLogFile = NULL; + return FALSE; } - return TRUE; + return TRUE; } VOID STDCALL TerminateSetupActionLog (VOID) { - if (hLogFile != NULL) + if (hLogFile != NULL) { - CloseHandle (hLogFile); - hLogFile = NULL; + CloseHandle (hLogFile); + hLogFile = NULL; } } BOOL STDCALL -LogItem (DWORD dwSeverity, - LPWSTR lpMessageText) +LogItem(DWORD dwSeverity, + LPWSTR lpMessageText) { - LPSTR lpNewLine = "\r\n"; - LPSTR lpSeverityString; - LPSTR lpMessageString; - DWORD dwMessageLength; - DWORD dwMessageSize; - DWORD dwWritten; + LPSTR lpNewLine = "\r\n"; + LPSTR lpSeverityString; + LPSTR lpMessageString; + DWORD dwMessageLength; + DWORD dwMessageSize; + DWORD dwWritten; - /* Get the severity code string */ - switch (dwSeverity) + /* Get the severity code string */ + switch (dwSeverity) { - case SYSSETUP_SEVERITY_INFORMATION: - lpSeverityString = "Information : "; - break; + case SYSSETUP_SEVERITY_INFORMATION: + lpSeverityString = "Information : "; + break; - case SYSSETUP_SEVERITY_WARNING: - lpSeverityString = "Warning : "; - break; + case SYSSETUP_SEVERITY_WARNING: + lpSeverityString = "Warning : "; + break; - case SYSSETUP_SEVERITY_ERROR: - lpSeverityString = "Error : "; - break; + case SYSSETUP_SEVERITY_ERROR: + lpSeverityString = "Error : "; + break; - case SYSSETUP_SEVERITY_FATAL_ERROR: - lpSeverityString = "Fatal error : "; - break; + case SYSSETUP_SEVERITY_FATAL_ERROR: + lpSeverityString = "Fatal error : "; + break; - default: - lpSeverityString = "Unknown : "; - break; + default: + lpSeverityString = "Unknown : "; + break; } - /* Get length of the converted ansi string */ - dwMessageLength = wcslen(lpMessageText) * sizeof(WCHAR); - RtlUnicodeToMultiByteSize (&dwMessageSize, - lpMessageText, - dwMessageLength); + /* Get length of the converted ansi string */ + dwMessageLength = wcslen(lpMessageText) * sizeof(WCHAR); + RtlUnicodeToMultiByteSize(&dwMessageSize, + lpMessageText, + dwMessageLength); - /* Allocate message string buffer */ - lpMessageString = (LPSTR) HeapAlloc (GetProcessHeap (), - HEAP_ZERO_MEMORY, - dwMessageSize); - if (lpMessageString == NULL) + /* Allocate message string buffer */ + lpMessageString = (LPSTR) HeapAlloc(GetProcessHeap (), + HEAP_ZERO_MEMORY, + dwMessageSize); + if (lpMessageString == NULL) { - return FALSE; + return FALSE; } - /* Convert unicode to ansi */ - RtlUnicodeToMultiByteN (lpMessageString, - dwMessageSize, - NULL, - lpMessageText, - dwMessageLength); + /* Convert unicode to ansi */ + RtlUnicodeToMultiByteN(lpMessageString, + dwMessageSize, + NULL, + lpMessageText, + dwMessageLength); - /* Set file pointer to the end of the file */ - SetFilePointer (hLogFile, - 0, - NULL, - FILE_END); + /* Set file pointer to the end of the file */ + SetFilePointer(hLogFile, + 0, + NULL, + FILE_END); - /* Write severity code */ - WriteFile (hLogFile, - lpSeverityString, - strlen (lpSeverityString), - &dwWritten, - NULL); + /* Write severity code */ + WriteFile(hLogFile, + lpSeverityString, + strlen(lpSeverityString), + &dwWritten, + NULL); - /* Write message string */ - WriteFile (hLogFile, - lpMessageString, - dwMessageSize, - &dwWritten, - NULL); + /* Write message string */ + WriteFile(hLogFile, + lpMessageString, + dwMessageSize, + &dwWritten, + NULL); - /* Write newline */ - WriteFile (hLogFile, - lpNewLine, - 2, - &dwWritten, - NULL); + /* Write newline */ + WriteFile(hLogFile, + lpNewLine, + 2, + &dwWritten, + NULL); - HeapFree (GetProcessHeap (), - 0, - lpMessageString); + HeapFree(GetProcessHeap(), + 0, + lpMessageString); - return TRUE; + return TRUE; } /* EOF */

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