Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20817: Task Manager enhs & fiexs <Pablo <pborobia@gmail.com>
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

Task Manager enhs & fiexs <Pablo <pborobia(a)gmail.com> - make a last used cpu usage color memory - fix colors in the cpu history - high refresh more offten - fix kernel cpu usage colorbars paint Bug 1271. Modified: trunk/reactos/subsys/system/taskmgr/graph.c Modified: trunk/reactos/subsys/system/taskmgr/graph.h Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c _____ Modified: trunk/reactos/subsys/system/taskmgr/graph.c --- trunk/reactos/subsys/system/taskmgr/graph.c 2006-01-12 20:38:54 UTC (rev 20816) +++ trunk/reactos/subsys/system/taskmgr/graph.c 2006-01-12 20:54:35 UTC (rev 20817) @@ -22,6 +22,8 @@ #include <precomp.h> +int nlastBarsUsed = 0; + LONG OldGraphWndProc; void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd); @@ -158,11 +160,8 @@ * Get the CPU usage */ CpuUsage = PerfDataGetProcessorUsage(); - CpuKernelUsage = PerfDataGetProcessorSystemUsage(); if (CpuUsage < 0) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; - if (CpuKernelUsage < 0) CpuKernelUsage = 0; - if (CpuKernelUsage > 100) CpuKernelUsage = 100; /* * Check and see how many digits it will take @@ -197,11 +196,14 @@ { nBarsUsed = 1; } - nBarsFree = nBars - nBarsUsed; + nBarsFree = nBars - (nlastBarsUsed>nBarsUsed ? nlastBarsUsed : nBarsUsed); + if (TaskManagerSettings.ShowKernelTimes) { - nBarsUsedKernel = ((nBars * 2) * CpuKernelUsage) / 100; - nBarsUsed -= (nBarsUsedKernel / 2); + CpuKernelUsage = PerfDataGetProcessorSystemUsage(); + if (CpuKernelUsage < 0) CpuKernelUsage = 0; + if (CpuKernelUsage > 100) CpuKernelUsage = 100; + nBarsUsedKernel = (nBars * CpuKernelUsage) / 100; } else { @@ -226,7 +228,7 @@ if (nBarsUsedKernel < 0) nBarsUsedKernel = 0; if (nBarsUsedKernel > nBars) nBarsUsedKernel = nBars; - + /* * Draw the "free" bars */ @@ -243,6 +245,25 @@ } /* + * Draw the last "used" bars + */ + if ((nlastBarsUsed - nBarsUsed) > 0) { + for (i=0; i< (nlastBarsUsed - nBarsUsed); i++) + { + if (nlastBarsUsed > 5000) nlastBarsUsed = 5000; + + FillSolidRect(hDC, &rcBarLeft, MEDIUM_GREEN); + FillSolidRect(hDC, &rcBarRight, MEDIUM_GREEN); + + rcBarLeft.top += 3; + rcBarLeft.bottom += 3; + + rcBarRight.top += 3; + rcBarRight.bottom += 3; + } + } + nlastBarsUsed = nBarsUsed; + /* * Draw the "used" bars */ for (i=0; i<nBarsUsed; i++) @@ -262,48 +283,25 @@ /* * Draw the "used" kernel bars */ - rcBarLeft.bottom--; - rcBarRight.bottom--; - if (nBarsUsedKernel && nBarsUsedKernel % 2) - { - rcBarLeft.top -= 2; - rcBarLeft.bottom -= 2; + + rcBarLeft.top -=3; + rcBarLeft.bottom -=3; - rcBarRight.top -= 2; - rcBarRight.bottom -= 2; - - FillSolidRect(hDC, &rcBarLeft, RED); - FillSolidRect(hDC, &rcBarRight, RED); - - rcBarLeft.top += 2; - rcBarLeft.bottom += 2; - - rcBarRight.top += 2; - rcBarRight.bottom += 2; - - nBarsUsedKernel--; - } + rcBarRight.top -=3; + rcBarRight.bottom -=3; + for (i=0; i<nBarsUsedKernel; i++) { - if (nBarsUsedKernel > 5000) nBarsUsedKernel = 5000; FillSolidRect(hDC, &rcBarLeft, RED); FillSolidRect(hDC, &rcBarRight, RED); - rcBarLeft.top++; - rcBarLeft.bottom++; + rcBarLeft.top -=3; + rcBarLeft.bottom -=3; - rcBarRight.top++; - rcBarRight.bottom++; + rcBarRight.top -=3; + rcBarRight.bottom -=3; - if (i % 2) - { - rcBarLeft.top++; - rcBarLeft.bottom++; - - rcBarRight.top++; - rcBarRight.bottom++; - } } } @@ -338,8 +336,10 @@ CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - _stprintf(Text, _T("%dK"), (int)CommitChargeTotal); - + if (CommitChargeTotal > 1024) + _stprintf(Text, _T("%d MB"), (int)(CommitChargeTotal / 1024)); + else + _stprintf(Text, _T("%d K"), (int)CommitChargeTotal); /* * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text _____ Modified: trunk/reactos/subsys/system/taskmgr/graph.h --- trunk/reactos/subsys/system/taskmgr/graph.h 2006-01-12 20:38:54 UTC (rev 20816) +++ trunk/reactos/subsys/system/taskmgr/graph.h 2006-01-12 20:54:35 UTC (rev 20817) @@ -29,6 +29,7 @@ #define BRIGHT_GREEN RGB(0, 255, 0) +#define MEDIUM_GREEN RGB(0, 190, 0) #define DARK_GREEN RGB(0, 130, 0) #define RED RGB(255, 0, 0) _____ Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c --- trunk/reactos/subsys/system/taskmgr/perfpage.c 2006-01-12 20:38:54 UTC (rev 20816) +++ trunk/reactos/subsys/system/taskmgr/perfpage.c 2006-01-12 20:54:35 UTC (rev 20817) @@ -174,8 +174,10 @@ /* PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; */ GraphCtrl_SetBackgroundColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 0, 0)) ; GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(152, 205, 152)) ; - GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(255, 0, 0)) ; - GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 1, RGB(0, 255, 0)) ; + + GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(0, 255, 0)) ; + GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 1, RGB(255, 0, 0)) ; + GetClientRect(hPerformancePageMemUsageHistoryGraph, &rc); GraphCtrl_Create(&PerformancePageMemUsageHistoryGraph, hPerformancePageMemUsageHistoryGraph, hDlg, IDC_MEM_USAGE_HISTORY_GRAPH); @@ -418,12 +420,19 @@ * Get the CPU usage */ CpuUsage = PerfDataGetProcessorUsage(); - CpuKernelUsage = PerfDataGetProcessorSystemUsage(); if (CpuUsage < 0 ) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; - if (CpuKernelUsage < 0) CpuKernelUsage = 0; - if (CpuKernelUsage > 100) CpuKernelUsage = 100; - + + if (TaskManagerSettings.ShowKernelTimes) + { + CpuKernelUsage = PerfDataGetProcessorSystemUsage(); + if (CpuKernelUsage < 0) CpuKernelUsage = 0; + if (CpuKernelUsage > 100) CpuKernelUsage = 100; + } + else + { + CpuKernelUsage = 0; + } /* * Get the memory usage */ @@ -435,6 +444,7 @@ PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK(); nBarsUsed2 = PhysicalMemoryTotal ? ((PhysicalMemoryAvailable * 100) / PhysicalMemoryTotal) : 0; + GraphCtrl_AppendPoint(&PerformancePageCpuUsageHistoryGraph, CpuUsage, CpuKernelUsage, 0.0, 0.0); GraphCtrl_AppendPoint(&PerformancePageMemUsageHistoryGraph, nBarsUsed1, nBarsUsed2, 0.0, 0.0); _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c --- trunk/reactos/subsys/system/taskmgr/taskmgr.c 2006-01-12 20:38:54 UTC (rev 20816) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.c 2006-01-12 20:54:35 UTC (rev 20817) @@ -873,7 +873,7 @@ CheckMenuRadioItem(hUpdateSpeedMenu, ID_VIEW_UPDATESPEED_HIGH, ID_VIEW_UPDATESPEED_PAUSED, ID_VIEW_UPDATESPEED_HIGH, MF_BYCOMMAND); KillTimer(hMainWnd, 1); - SetTimer(hMainWnd, 1, 1000, NULL); + SetTimer(hMainWnd, 1, 500, NULL); } void TaskManager_OnViewUpdateSpeedNormal(void)

1 0

[cwittich] 20816: added/updated spanish translations by samwise52 <samcharly@hotmail.com> (fixed bug 1266)
by cwittich＠svn.reactos.org 12 Jan '06

12 Jan '06

added/updated spanish translations by samwise52 <samcharly(a)hotmail.com> (fixed bug 1266) Added: trunk/reactos/lib/cpl/access/Es.rc Modified: trunk/reactos/lib/cpl/access/access.rc Added: trunk/reactos/lib/cpl/timedate/Es.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc Modified: trunk/reactos/lib/devmgr/Es.rc Modified: trunk/reactos/lib/newdev/Es.rc Added: trunk/reactos/lib/user32/Es.rc Modified: trunk/reactos/lib/user32/user32.rc Added: trunk/reactos/subsys/ntvdm/Es.rc Modified: trunk/reactos/subsys/ntvdm/ntvdm.rc Modified: trunk/reactos/subsys/system/notepad/Es.rc _____ Added: trunk/reactos/lib/cpl/access/Es.rc --- trunk/reactos/lib/cpl/access/Es.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/cpl/access/Es.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -0,0 +1,113 @@ +/* Spanish Resource file + * ReactOS (c) 2006 Samuel Serapion + */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + + +IDI_CPLACCESS ICON "resources/applet.ico" + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Teclado" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Teclas Pegajosas",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use Teclas Pegajosas si quiere utilizar las llaves Shift, Ctrl, ¾ Alt presionando una tecla a la vez.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PR OPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Usar Teclas Pegajosas",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSH EETPADDING),14 + PUSHBUTTON "&Opciones",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Filtro de Teclas",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(7)+2 + LTEXT "Use Teclas Filtradas si desea que Reactos ignore presionadas de teclas quebradas o repetidas, o hacer mßs corto la repetici¾n de teclas.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usar Teclas &Filtradas",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROP SHEETPADDING),14 + PUSHBUTTON "Opcion&es",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(13)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Teclas Activas",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEET PADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use &Teclas Activas si desea escuchar tonos al presionar Caps Lock, Num Lock, y Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWI DTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + PUSHBUTTON "Opcio&nes",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(20)+2,(15*PROPSHEETPADDING),14 +// CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sonidos" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando sus systema haga un sonido.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6 *PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHE ETPADDING),14 + PUSHBUTTON "Opcione&s",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(7)+2 + LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que ense±en texto por las voces y sonidos que utilizen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Despliegue" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Alto Contraste",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use esta opci¾n si desea que Reactos use colores y letras dese±adas para lectura fßcil.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6* PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Usar Alto Contraste",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROP SHEETPADDING),14 + PUSHBUTTON "Opcione&s",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Raton" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Raton de teclas",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADD ING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Use esta opci¾n si desea controlar el cursor con el teclado numerico de su teclado.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usar Raton de Teclas",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETP ADDING),14 + PUSHBUTTON "Opcione&s",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELL INE(5)+2,(15*PROPSHEETPADDING),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(5) + CHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + + //POPUP IDC_RESET_POPUP, GRAYED + //{ + // MENUITEM "5 Minutos", IDC_RESET_5 + // MENUITEM "10 Minutos", IDC_RESET_10 + // MENUITEM "15 Minutos", IDC_RESET_15 + // MENUITEM "20 Minutos", IDC_RESET_20 + // MENUITEM "25 Minutos", IDC_RESET_25 + // MENUITEM "30 Minutos", IDC_RESET_30 + //} + + GROUPBOX "Notificaci¾n",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(5) + CHECKBOX "Dar mensage de aviso al activar unacaracterÝstica",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLI NE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Hacer un sonido al activar una caracterÝstica",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10 )-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + + GROUPBOX "Dispositivos de Teclados Seriales",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(5) + LTEXT "Los Dispositivos de Teclados Seriales te permiten una alternativa de acceso de teclado y raton.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Apoyar Dispositivos de Teclados &Seriales",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4, PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + PUSHBUTTON "Opcion&es",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + GROUPBOX "Opciones Administrativas",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*P ROPSHEETPADDING),LABELLINE(5) + + CHECKBOX "Applicar todas las opciones al escritorio de inicio",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Applicar todas las opciones al escritorio de nuevos usuarios",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPS HEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Accessibilidad" + IDS_CPLSYSTEMDESCRIPTION "Cambia las caracterÝsticas de accesibilidad disponibles para su computadora." +END + Property changes on: trunk/reactos/lib/cpl/access/Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/access/access.rc --- trunk/reactos/lib/cpl/access/access.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/cpl/access/access.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -13,3 +13,4 @@ #include "Nl.rc" #include "Pl.rc" #include "Fr.rc" +#include "Es.rc" _____ Added: trunk/reactos/lib/cpl/timedate/Es.rc --- trunk/reactos/lib/cpl/timedate/Es.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/cpl/timedate/Es.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -0,0 +1,42 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Dia && Hora" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&Dia", -1, 4, 2, 122, 125 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 17, 108, 12 + CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80 + GROUPBOX "&Hora", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 17, 90, 12 + LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Zona de Tiempo" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", + IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Dia/Hora" + IDS_CPLDESCRIPTION "Cambia el dia, hora y la zona del tiempo." + IDS_TIMEZONETEXT "Zona de tiempo actual: %s" + IDS_TIMEZONEINVALID "Invalido" + IDS_TIMEZONEUNKNOWN "Desconocido" +END Property changes on: trunk/reactos/lib/cpl/timedate/Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -27,3 +27,4 @@ #include "Pl.rc" #include "Ru.rc" #include "Sv.rc" +#include "Es.rc" _____ Modified: trunk/reactos/lib/devmgr/Es.rc --- trunk/reactos/lib/devmgr/Es.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/devmgr/Es.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -143,3 +143,26 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY END +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Driver File Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Driver files:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Provedor:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Version Fichero:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Derechos:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Firma Digital:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "Aceptar", IDOK, 167, 228, 50, 14 +END + + _____ Modified: trunk/reactos/lib/newdev/Es.rc --- trunk/reactos/lib/newdev/Es.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/newdev/Es.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenido",IDC_WELCOMETITLE,120,8,195,24 - LTEXT "Este asistentelo ayudarß a instalar un nuevo controlador de dispositivos para:", + LTEXT "Este asistente lo ayudarß a instalar un nuevo controlador de dispositivos para:", IDC_STATIC,120,40,195,16 LTEXT "Haga click en Siguiente para continuar.",IDC_STATIC,120,169,195,17 LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,134,55,164,11 _____ Added: trunk/reactos/lib/user32/Es.rc --- trunk/reactos/lib/user32/Es.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/user32/Es.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -0,0 +1,75 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialogs +// + +SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 +STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +FONT 8, "Bitstream Vera Sans" +CAPTION "Selecciones Ventana" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&Acceptar", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Cancelar", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "DUMMY" + BEGIN + MENUITEM "&Desacer", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "Cor&tar", WM_CUT + MENUITEM "&Copiar", WM_COPY + MENUITEM "&Pegar", WM_PASTE + MENUITEM "Borrar", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Seleccionar &Todo", EM_SETSEL + END +} + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Restaurar", 61728 + MENUITEM "&Mover", 61456 + MENUITEM "Tama±o", 61440 + MENUITEM "Mi&nimizar", 61472 + MENUITEM "Ma&ximizar", 61488 + MENUITEM SEPARATOR + MENUITEM "&Cerrar\tAlt-F4", 61536 +} + +/////////////////////////////////////////////////////////////////////// ////// +// +// Strings +// + +STRINGTABLE +{ + IDS_ERROR, "Error" + IDS_OK, "Acceptar" + IDS_CANCEL, "Cancelar" + IDS_ABORT, "&Abortar" + IDS_RETRY, "&Retratar" + IDS_IGNORE, "&Ignorar" + IDS_YES, "&Si" + IDS_NO, "&No" + IDS_HELP, "Ayuda" + IDS_TRYAGAIN, "&Tratar Otravez" + IDS_CONTINUE, "&Continuar" +} + +STRINGTABLE +{ + IDS_MDI_MOREWINDOWS, "&Mßs Ventanas..." +} + Property changes on: trunk/reactos/lib/user32/Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/user32/user32.rc --- trunk/reactos/lib/user32/user32.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/lib/user32/user32.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -58,6 +58,11 @@ OBM_COMBO BITMAP "resources/obm_combo.bmp" OBM_MNARROW BITMAP "resources/obm_mnarrow.bmp" +/////////////////////////////////////////////////////////////////////// ////// +// +// Languages +// + #include "En.rc" #include "Da.rc" #include "De.rc" @@ -67,3 +72,4 @@ #include "Ja.rc" #include "Sv.rc" #include "Hu.rc" +#include "Es.rc" _____ Added: trunk/reactos/subsys/ntvdm/Es.rc --- trunk/reactos/subsys/ntvdm/Es.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/subsys/ntvdm/Es.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -0,0 +1,13 @@ +#include "resource.h" +/* + * Spanish Resource File + * Reactos(c)2006 Samuel Serapion + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "Maquina virtual de DOS en ReactOS.\n" +STRING_PromptMsg, "Escriba r<cr> para correr, s<cr> para desactivar or q<cr> para salir ahora." +} Property changes on: trunk/reactos/subsys/ntvdm/Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/ntvdm/ntvdm.rc --- trunk/reactos/subsys/ntvdm/ntvdm.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/subsys/ntvdm/ntvdm.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -10,3 +10,4 @@ #include "De.rc" #include "Ja.rc" #include "Hu.rc" +#include "Es.rc" _____ Modified: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2006-01-12 20:38:18 UTC (rev 20815) +++ trunk/reactos/subsys/system/notepad/Es.rc 2006-01-12 20:38:54 UTC (rev 20816) @@ -125,5 +125,13 @@ STRING_OUT_OF_MEMORY, "No hay suficiente memoria para terminar esta \ tarea. \nCierre una o mßs aplicaciones para \ aumentar la cantidad \nde memoria libre." +STRING_CANNOTFIND "No pudo encontrar '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" }

1 0

[weiden] 20815: fixed maximum wait time in EnterCriticalPolicySection
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

fixed maximum wait time in EnterCriticalPolicySection Modified: trunk/reactos/lib/userenv/gpolicy.c _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:35:36 UTC (rev 20814) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:38:18 UTC (rev 20815) @@ -493,9 +493,9 @@ if (hSection != NULL) { - /* wait up to 10 seconds */ + /* wait up to 10 minutes */ if (WaitForSingleObject(hSection, - 60000) != WAIT_FAILED) + 600000) != WAIT_FAILED) { return hSection; }

1 0

[weiden] 20814: remove incorrect comment that was accidentally copied
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

remove incorrect comment that was accidentally copied Modified: trunk/reactos/lib/userenv/gpolicy.c _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:32:44 UTC (rev 20813) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:35:36 UTC (rev 20814) @@ -540,7 +540,6 @@ CloseHandle(hEvent); } - /* return TRUE even if the mutex doesn't exist! */ return Ret; } @@ -560,6 +559,5 @@ CloseHandle(hEvent); } - /* return TRUE even if the mutex doesn't exist! */ return Ret; }

1 0

[weiden] 20813: implemented WaitForUserPolicyForegroundProcessing() and WaitForMachinePolicyForegroundProcessing()
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

implemented WaitForUserPolicyForegroundProcessing() and WaitForMachinePolicyForegroundProcessing() Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/userenv.def _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:31:08 UTC (rev 20812) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:32:44 UTC (rev 20813) @@ -47,10 +47,12 @@ static const WCHAR szLocalGPMutex[] = L"userenv: user policy mutex"; static const WCHAR szLocalGPRefreshEvent[] = L"userenv: user policy refresh event"; static const WCHAR szLocalGPForceRefreshEvent[] = L"userenv: user policy force refresh event"; +static const WCHAR szLocalGPDoneEvent[] = L"userenv: User Policy Foreground Done Event"; static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; static const WCHAR szMachineGPMutex[] = L"Global\\userenv: machine policy mutex"; static const WCHAR szMachineGPRefreshEvent[] = L"Global\\userenv: machine policy refresh event"; static const WCHAR szMachineGPForceRefreshEvent[] = L"Global\\userenv: machine policy force refresh event"; +static const WCHAR szMachineGPDoneEvent[] = L"Global\\userenv: Machine Policy Foreground Done Event"; static CRITICAL_SECTION GPNotifyLock; static PGP_NOTIFY NotificationList = NULL; @@ -521,3 +523,43 @@ return Ret; } + +BOOL WINAPI +WaitForUserPolicyForegroundProcessing(VOID) +{ + HANDLE hEvent; + BOOL Ret = FALSE; + + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + szLocalGPDoneEvent); + if (hEvent != NULL) + { + Ret = WaitForSingleObject(hEvent, + INFINITE) != WAIT_FAILED; + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; +} + +BOOL WINAPI +WaitForMachinePolicyForegroundProcessing(VOID) +{ + HANDLE hEvent; + BOOL Ret = FALSE; + + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + szMachineGPDoneEvent); + if (hEvent != NULL) + { + Ret = WaitForSingleObject(hEvent, + INFINITE) != WAIT_FAILED; + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; +} _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-12 20:31:08 UTC (rev 20812) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-12 20:32:44 UTC (rev 20813) @@ -38,4 +38,6 @@ RegisterGPNotification@8 UnloadUserProfile@8 UnregisterGPNotification@4 +WaitForUserPolicyForegroundProcessing@0 +WaitForMachinePolicyForegroundProcessing@0 ;EOF

1 0

[cwittich] 20812: added Ukranian translations by temarez <temarez@yandex.ru> (fixed bug 1269)
by cwittich＠svn.reactos.org 12 Jan '06

12 Jan '06

added Ukranian translations by temarez <temarez(a)yandex.ru> (fixed bug 1269) Added: trunk/reactos/subsys/system/calc/Uk.rc Modified: trunk/reactos/subsys/system/calc/rsrc.rc Added: trunk/reactos/subsys/system/winlogon/Uk.rc Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc _____ Added: trunk/reactos/subsys/system/calc/Uk.rc --- trunk/reactos/subsys/system/calc/Uk.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/calc/Uk.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -0,0 +1,155 @@ +/* + * WineCalc (Uk.rc) + * + * Copyright 2006 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "?ÓÙ³Û¾Ù ?¯" + + IDS_COPYRIGHT1, "?ÓÙ³Û¾Ù ?¯ 5.0. ??÷ÕÝþ¯ÔÓÝ¯ ´?õ LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "ÐÓÝ-i¯±Õ, ?ÓÙ?¶¯Ý? , ÐÏ?" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "?Õ´ÓÔÞÙ³ÝÞÚ ÓÒ¾ýÕÝ? ¶¾ÝÛ÷??." + IDS_ERR_DIVIDE_BY_ZERO, "??ÙÞ?Þ ÝÓ Ý¾Ù³ ÝÕ ý¯µÝÓ." + IDS_ERR_UNDEFINED, "ðÕþ¾Ù³?Ó? ¶¾ÝÛ÷?? ÝÕÔÞþÝÓ¸ÕÝÞÚ." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&¤ÓÔÛÓ" { + MENUITEM "&?¯´??ÔÓ?Þ Ctrl+C", IDM_COPY + MENUITEM "?±?&ÓÔÞ?Þ Ctrl+V", IDM_PASTE + } + POPUP "&?ÞÒÙ õ" { + MENUITEM "ÃÔÞ¸ÓÚÝÞÚ", IDM_MODE_STANDARD + MENUITEM "?ÝµÕÝÕÝÞÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "??Ù³Û?±?³ ÷Þ¶ ¾ Ò¾´?", IDM_DIGIT_GROUPING + } + POPUP "&?¯Ô?õÛÓ" { + MENUITEM "Ãý?±?", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "About Calculator", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&¤ÓÔÛÓ" { + MENUITEM "&?¯´??ÔÓ?Þ Ctrl+C", IDM_COPY + MENUITEM "?±?&ÓÔÞ?Þ Ctrl+V", IDM_PASTE + } + POPUP "&?ÞÒÙ õ" { + MENUITEM "ÃÔÞ¸ÓÚÝÞÚ", IDM_MODE_STANDARD + MENUITEM "?ÝµÕÝÕÝÞÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ï?±?ÝÓõ÷ ?Û¯ÔÞÚ (Hex)\tF5", ID_CALC_NS_HEX + MENUITEM "?Õ± ?Û¯ÔÞÚ (Dec)\tF6", ID_CALC_NS_DEC + MENUITEM "??±?ýÛ¯ÔÞÚ (Oct)\tF7", ID_CALC_NS_OCT + MENUITEM "?Ô?ÚÛ¯ÔÞÚ (Bin)\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "?Óõ¾±Þ\tF2", ID_CALC_MS_DEGREES + MENUITEM "ðÓõ?ÓÝÞ\tF3", ID_CALC_MS_RADIANS + MENUITEM "?ÓõÞ\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "??Ù³Û?±?³ ÷Þ¶ ¾ Ò¾´?", IDM_DIGIT_GROUPING + } + POPUP "&?¯Ô?õÛÓ" { + MENUITEM "Ãý?±?", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "¤¯ ?ÓÙ³Û¾Ù ?¯", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&¤ÓÔÛÓ" { + MENUITEM "&?¯´??ÔÓ?Þ Ctrl+C", IDM_COPY + MENUITEM "?±?&ÓÔÞ?Þ Ctrl+V", IDM_PASTE + } + POPUP "&?ÞÒÙ õ" { + MENUITEM "ÃÔÞ¸ÓÚÝÞÚ", IDM_MODE_STANDARD + MENUITEM "?ÝµÕÝÕÝÞÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ï?±?ÝÓõ÷ ?Û¯ÔÞÚ (Hex)\tF5", ID_CALC_NS_HEX + MENUITEM "?Õ± ?Û¯ÔÞÚ (Dec)\tF6", ID_CALC_NS_DEC + MENUITEM "??±?ýÛ¯ÔÞÚ (Oct)\tF7", ID_CALC_NS_OCT + MENUITEM "?Ô?ÚÛ¯ÔÞÚ (Bin)\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "??Ù³Û?±?³ ÷Þ¶ ¾ Ò¾´?", IDM_DIGIT_GROUPING + } + POPUP "&?¯Ô?õÛÓ" { + MENUITEM "Ãý?±?", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "¤¯ ?ÓÙ³Û¾Ù ?¯", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "¤¯ GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "?¯ ÷Õ?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Property changes on: trunk/reactos/subsys/system/calc/Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/calc/rsrc.rc --- trunk/reactos/subsys/system/calc/rsrc.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/calc/rsrc.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -33,5 +33,6 @@ #include "Ru.rc" #include "Sv.rc" #include "Hu.rc" +#include "Uk.rc" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL _____ Added: trunk/reactos/subsys/system/winlogon/Uk.rc --- trunk/reactos/subsys/system/winlogon/Uk.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/winlogon/Uk.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -0,0 +1,45 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÃÓÔÕ°ÕÝÝ ¯ß¯?Þ þ Û¯ý´'??Õ¯ý" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÊÕ´Õ ý¯µÝÓ ÔÞýÛÝ¾?Þ Û¯ý´'??Õ.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&¤ÕÕþÓÔÓÝ?ÓµÕÝÝ ", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¤¯ýÞÙÛÓ ?Ý?Õ¶ÕÚ±¾ Û¯Þ±?¾ÔÓ¸Ó" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "?Õ ÔõÓÙ¯± þÓÔÓÝ?ÓµÞ?Þ ß?ßÙ?¯?ÕÛ¾ ?Ý?Õ¶ÕÚ±¾ Ô§¯õ¾ Û¯Þ±?¾ÔÓ ¸Ó %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "ÃÔÕÝ??³± õ¯ ±Þ±?ÕýÝ¯Ò¯ Óõý?Ý?±?Ó?¯Ó ¨¯ß þÓý?ÝÞ?Þ ÝÓ ÔÝ¾, Óß¯ Ô?õÝ¯Ô??³ ´¯¸Ó?Û¯Ô¾ ß?ßÙ?¯?ÕÛ¾.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&¤ÕÕþÓÔÓÝ?ÓµÕÝÝ ", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "¤?õÒ¯?¯ÔÛÓ ýÕÕµÝÞ§ ´?õÛÙ?¸ÕÝ³..." + IDS_APPLYINGCOMPUTERSETTINGS "ÃÓ±?¯±¾ÔÓÝÝ ´ÓÓýÕ??Ô Û¯ý´'??Õ Ó..." + IDS_RUNNINGSTARTUPSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô þÓ´¾±Û¾..." + IDS_RUNNINGSHUTDOWNSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô þÓÔÕ°ÕÝÝ ¯ß¯ ?Þ..." + IDS_APPLYINGYOURPERSONALSETTINGS "ÃÓ±?¯±¾ÔÓÝÝ ¯±¯ßÞ±?Þ§ ´ÓÓýÕ?? Ô..." + IDS_RUNNINGLOGOFFSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô ÔÞ§¯õ¾ ?þ ±Þ±?ÕýÞ..." + IDS_RUNNINGLOGONSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô Ô§¯õ¾ õ¯ ±Þ±?ÕýÞ..." + IDS_LOADINGYOURPERSONALSETTINGS "ÃÓÔÓÝ?ÓµÕÝÝ ¯±¯ßÞ±?Þ§ ´ÓÓýÕ?? Ô..." + IDS_CLOSINGNETWORKCONNECTIONS "ÃÓÛÞ?? ýÕÕµÝÞ§ ´?õÛÙ?¸ÕÝ³..." + IDS_REACTOSISSHUTTINGDOWN "ÃÓÔÕ°ÕÝÝ ¯ß¯?Þ ReactOS..." + IDS_PREPARETOSTANDBY "¤?õÒ¯?¯ÔÛÓ õ¯ ÕµÞý¾ ¯¸?Û¾ÔÓÝÝ ..." + IDS_PREPARETOHIBERNATE "¤?õÒ¯?¯ÔÛÓ õ¯ ±´Ù ¸¯Ò¯ ÕµÞý¾..." + IDS_SAVEYOURSETTINGS "ÃßÕÕµÕÝÝ ´ÓÓýÕ??Ô..." + IDS_REACTOSISSTARTINGUP "ÃÓ´¾±Û ReactOS..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon ÝÕ ÔõÓÙ¯± ÓÛ?ÞÔ¾ÔÓ?Þ ¯ß¯Ù¯ÝÛ¾ Û¯Þ±?¾ÔÓ¸Ó!" +END + Property changes on: trunk/reactos/subsys/system/winlogon/Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc --- trunk/reactos/subsys/system/winlogon/winlogon.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/winlogon/winlogon.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -21,3 +21,4 @@ #include "Sv.rc" #include "Hu.rc" #include "Fr.rc" +#include "Uk.rc"

1 0

[ion] 20811: Temporarly disable a correct bugcheck in order to hide a ReactOS bug, now that the bug is in bugzilla/ML
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

Temporarly disable a correct bugcheck in order to hide a ReactOS bug, now that the bug is in bugzilla/ML Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-12 18:56:21 UTC (rev 20810) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-12 19:32:43 UTC (rev 20811) @@ -87,6 +87,7 @@ AtPassive: +#if 0 /* Make sure that we are not attached and that APCs are not disabled */ movzx eax, byte ptr [ebx+KTHREAD_APC_STATE_INDEX] mov edx, [ebx+KTHREAD_COMBINED_APC_DISABLE] @@ -103,7 +104,7 @@ push 0 push APC_INDEX_MISMATCH call _KeBugCheckEx@20 - +#endif ApcsEnabled: #endif

1 0

[weiden] 20810: fixed a memory leak in EnterCriticalPolicySection()
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

fixed a memory leak in EnterCriticalPolicySection() Modified: trunk/reactos/lib/userenv/gpolicy.c _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:50:39 UTC (rev 20809) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:56:21 UTC (rev 20810) @@ -477,29 +477,29 @@ /* create or open the mutex */ lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); - if (lpSecurityDescriptor == NULL) + if (lpSecurityDescriptor != NULL) { - return NULL; - } + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; + SecurityAttributes.bInheritHandle = FALSE; - SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); - SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; - SecurityAttributes.bInheritHandle = FALSE; + hSection = CreateMutexW(&SecurityAttributes, + FALSE, + (bMachine ? szMachineGPMutex : szLocalGPMutex)); - hSection = CreateMutexW(&SecurityAttributes, - FALSE, - (bMachine ? szMachineGPMutex : szLocalGPMutex)); + LocalFree((HLOCAL)lpSecurityDescriptor); - if (hSection != NULL) - { - /* wait up to 10 seconds */ - if (WaitForSingleObject(hSection, - 60000) != WAIT_FAILED) + if (hSection != NULL) { - return hSection; + /* wait up to 10 seconds */ + if (WaitForSingleObject(hSection, + 60000) != WAIT_FAILED) + { + return hSection; + } + + CloseHandle(hSection); } - - CloseHandle(hSection); } return NULL;

1 0

[weiden] 20809: - implemented RefreshPolicy() and RefreshPolicyEx()
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

- implemented RefreshPolicy() and RefreshPolicyEx() - added missing definitions to userenv.h Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/userenv.def Modified: trunk/reactos/lib/userenv/userenv.xml Modified: trunk/reactos/w32api/include/userenv.h _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:50:39 UTC (rev 20809) @@ -45,8 +45,12 @@ static const WCHAR szLocalGPApplied[] = L"userenv: User Group Policy has been applied"; static const WCHAR szLocalGPMutex[] = L"userenv: user policy mutex"; +static const WCHAR szLocalGPRefreshEvent[] = L"userenv: user policy refresh event"; +static const WCHAR szLocalGPForceRefreshEvent[] = L"userenv: user policy force refresh event"; static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; static const WCHAR szMachineGPMutex[] = L"Global\\userenv: machine policy mutex"; +static const WCHAR szMachineGPRefreshEvent[] = L"Global\\userenv: machine policy refresh event"; +static const WCHAR szMachineGPForceRefreshEvent[] = L"Global\\userenv: machine policy force refresh event"; static CRITICAL_SECTION GPNotifyLock; static PGP_NOTIFY NotificationList = NULL; @@ -412,6 +416,58 @@ return Ret; } +BOOL WINAPI +RefreshPolicy(IN BOOL bMachine) +{ + HANDLE hEvent; + BOOL Ret = TRUE; + + hEvent = OpenEventW(EVENT_MODIFY_STATE, + FALSE, + (bMachine ? szMachineGPRefreshEvent : szLocalGPRefreshEvent)); + if (hEvent != NULL) + { + Ret = SetEvent(hEvent); + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; +} + +BOOL WINAPI +RefreshPolicyEx(IN BOOL bMachine, + IN DWORD dwOptions) +{ + if (dwOptions & ~RP_FORCE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (dwOptions & RP_FORCE) + { + HANDLE hEvent; + BOOL Ret = TRUE; + + hEvent = OpenEventW(EVENT_MODIFY_STATE, + FALSE, + (bMachine ? szMachineGPForceRefreshEvent : szLocalGPForceRefreshEvent)); + if (hEvent != NULL) + { + Ret = SetEvent(hEvent); + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; + } + else + { + return RefreshPolicy(bMachine); + } +} + HANDLE WINAPI EnterCriticalPolicySection(IN BOOL bMachine) { _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-12 18:50:39 UTC (rev 20809) @@ -33,6 +33,8 @@ LeaveCriticalPolicySection@4 LoadUserProfileA@8 LoadUserProfileW@8 +RefreshPolicy@4 +RefreshPolicyEx@8 RegisterGPNotification@8 UnloadUserProfile@8 UnregisterGPNotification@4 _____ Modified: trunk/reactos/lib/userenv/userenv.xml --- trunk/reactos/lib/userenv/userenv.xml 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/lib/userenv/userenv.xml 2006-01-12 18:50:39 UTC (rev 20809) @@ -4,6 +4,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> <library>uuid</library> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/w32api/include/userenv.h --- trunk/reactos/w32api/include/userenv.h 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/w32api/include/userenv.h 2006-01-12 18:50:39 UTC (rev 20809) @@ -12,6 +12,10 @@ #define PI_NOUI (1) #define PI_APPLYPOLICY (2) +#if (WINVER >= 0x0500) +#define RP_FORCE (1) +#endif + typedef struct _PROFILEINFOA { DWORD dwSize; @@ -70,7 +74,20 @@ BOOL WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL); BOOL WINAPI DestroyEnvironmentBlock(LPVOID); +#if (WINVER >= 0x0500) +BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); +BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); +#endif +HANDLE WINAPI EnterCriticalPolicySection (BOOL); +BOOL WINAPI LeaveCriticalPolicySection (HANDLE); +BOOL WINAPI RefreshPolicy (BOOL); +#if (WINVER >= 0x0500) +BOOL WINAPI RefreshPolicyEx (BOOL, DWORD); +#endif +BOOL WINAPI RegisterGPNotification (HANDLE, BOOL); +BOOL WINAPI UnregisterGPNotification (HANDLE); + #ifdef UNICODE typedef PROFILEINFOW PROFILEINFO; typedef LPPROFILEINFOW LPPROFILEINFO; @@ -89,6 +106,9 @@ #define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryW #define GetProfilesDirectory GetProfilesDirectoryW #define GetUserProfileDirectory GetUserProfileDirectoryW +#if (WINVER >= 0x0500) +#define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserW +#endif #else typedef PROFILEINFOA PROFILEINFO; typedef LPPROFILEINFOA LPPROFILEINFO; @@ -107,7 +127,10 @@ #define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryA #define GetProfilesDirectory GetProfilesDirectoryA #define GetUserProfileDirectory GetUserProfileDirectoryA +#if (WINVER >= 0x0500) +#define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserA #endif +#endif #ifdef __cplusplus }

1 0

[weiden] 20808: implemented EnterCriticalPolicySection() and LeaveCriticalPolicySection()
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

implemented EnterCriticalPolicySection() and LeaveCriticalPolicySection() Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/userenv.def _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 17:52:51 UTC (rev 20807) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:05:35 UTC (rev 20808) @@ -44,7 +44,9 @@ } GP_ACTION; static const WCHAR szLocalGPApplied[] = L"userenv: User Group Policy has been applied"; +static const WCHAR szLocalGPMutex[] = L"userenv: user policy mutex"; static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; +static const WCHAR szMachineGPMutex[] = L"Global\\userenv: machine policy mutex"; static CRITICAL_SECTION GPNotifyLock; static PGP_NOTIFY NotificationList = NULL; @@ -409,3 +411,57 @@ return Ret; } + +HANDLE WINAPI +EnterCriticalPolicySection(IN BOOL bMachine) +{ + SECURITY_ATTRIBUTES SecurityAttributes; + PSECURITY_DESCRIPTOR lpSecurityDescriptor; + HANDLE hSection; + + /* create or open the mutex */ + lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); + if (lpSecurityDescriptor == NULL) + { + return NULL; + } + + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; + SecurityAttributes.bInheritHandle = FALSE; + + hSection = CreateMutexW(&SecurityAttributes, + FALSE, + (bMachine ? szMachineGPMutex : szLocalGPMutex)); + + if (hSection != NULL) + { + /* wait up to 10 seconds */ + if (WaitForSingleObject(hSection, + 60000) != WAIT_FAILED) + { + return hSection; + } + + CloseHandle(hSection); + } + + return NULL; +} + +BOOL WINAPI +LeaveCriticalPolicySection(IN HANDLE hSection) +{ + BOOL Ret; + + if (hSection == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Ret = ReleaseMutex(hSection); + CloseHandle(hSection); + + return Ret; +} _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-12 17:52:51 UTC (rev 20807) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-12 18:05:35 UTC (rev 20808) @@ -19,6 +19,7 @@ DeleteDesktopItemW@8 @116 NONAME CreateEnvironmentBlock@12 DestroyEnvironmentBlock@4 +EnterCriticalPolicySection@4 ExpandEnvironmentStringsForUserA@16 ExpandEnvironmentStringsForUserW@16 GetAllUsersProfileDirectoryA@8 @@ -29,6 +30,7 @@ GetProfilesDirectoryW@8 GetUserProfileDirectoryA@12 GetUserProfileDirectoryW@12 +LeaveCriticalPolicySection@4 LoadUserProfileA@8 LoadUserProfileW@8 RegisterGPNotification@8

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