Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20823: Fix boost loop

by ion＠svn.reactos.org

Fix boost loop Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-12 22:16:04 UTC (rev 20822) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-13 00:15:31 UTC (rev 20823) @@ -707,9 +707,13 @@ Size = Owner->TableSize; for (i = 1; i < Size; i++) { - /* Boot every thread in the table */ - OwnerThread = (PKTHREAD) - Resource->OwnerThreads[1].OwnerThread; + /* Move to next entry */ + Owner++ + + /* Get the thread */ + OwnerThread = (PKTHREAD)OwnerEntry->OwnerThread; + + /* Boost it */ if (OwnerThread) ExpBoostOwnerThread(Thread, OwnerThread); } }

18 years, 8 months

[cwittich] 20822: added missing explorer-uk.rc (spotted by temarez@yandex.ru)

by cwittich＠svn.reactos.org

added missing explorer-uk.rc (spotted by temarez(a)yandex.ru) Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-12 21:28:07 UTC (rev 20821) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-12 22:16:04 UTC (rev 20822) @@ -207,6 +207,7 @@ #include "explorer-ru.rc" #include "explorer-jp.rc" #include "explorer-hu.rc" +#include "explorer-uk.rc" #ifndef __WINDRES__ #include "explorer-cn.rc"

18 years, 8 months

[weiden] 20821: don't use a bitmap font to draw the text in the graphs. However, it currently doesn't use the shell font because the graph controls could use some serious work.

by weiden＠svn.reactos.org

don't use a bitmap font to draw the text in the graphs. However, it currently doesn't use the shell font because the graph controls could use some serious work. Deleted: trunk/reactos/subsys/system/taskmgr/font.c Deleted: trunk/reactos/subsys/system/taskmgr/font.h Modified: trunk/reactos/subsys/system/taskmgr/graph.c Modified: trunk/reactos/subsys/system/taskmgr/precomp.h Deleted: trunk/reactos/subsys/system/taskmgr/res/font.bmp Modified: trunk/reactos/subsys/system/taskmgr/resource.h Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml _____ Deleted: trunk/reactos/subsys/system/taskmgr/font.c --- trunk/reactos/subsys/system/taskmgr/font.c 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/font.c 2006-01-12 21:28:07 UTC (rev 20821) @@ -1,53 +0,0 @@ -/* - * ReactOS Task Manager - * - * font.cpp - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * 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 <precomp.h> - -void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y) -{ - HDC hFontDC; - HBITMAP hFontBitmap; - HBITMAP hOldBitmap; - int i; - - hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_FONT)); - hOldBitmap = (HBITMAP)SelectObject(hFontDC, hFontBitmap); - - for (i = 0; i < (int)_tcslen(lpszText); i++) { - if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] - '0') * 8, 0, SRCCOPY); - } - else if (lpszText[i] == 'K') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); - } - else if (lpszText[i] == '%') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); - } - } - SelectObject(hFontDC, hOldBitmap); - DeleteObject(hFontBitmap); - DeleteDC(hFontDC); -} - _____ Deleted: trunk/reactos/subsys/system/taskmgr/font.h --- trunk/reactos/subsys/system/taskmgr/font.h 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/font.h 2006-01-12 21:28:07 UTC (rev 20821) @@ -1,28 +0,0 @@ -/* - * ReactOS Task Manager - * - * font.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * 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 - */ - -#ifndef __FONT_H -#define __FONT_H - -void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y); - -#endif /* __FONT_H */ _____ Modified: trunk/reactos/subsys/system/taskmgr/graph.c --- trunk/reactos/subsys/system/taskmgr/graph.c 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/graph.c 2006-01-12 21:28:07 UTC (rev 20821) @@ -134,6 +134,8 @@ RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; + COLORREF crPrevForeground; TCHAR Text[260]; ULONG CpuUsage; ULONG CpuKernelUsage; @@ -163,28 +165,16 @@ if (CpuUsage < 0) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; - /* - * Check and see how many digits it will take - * so we get the indentation right every time. - */ - if (CpuUsage == 100) - { - _stprintf(Text, _T("%d%%"), (int)CpuUsage); - } - else if (CpuUsage < 10) - { - _stprintf(Text, _T(" %d%%"), (int)CpuUsage); - } - else - { - _stprintf(Text, _T(" %d%%"), (int)CpuUsage); - } + _stprintf(Text, _T("%d%%"), (int)CpuUsage); /* * Draw the font text onto the graph - * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); + rcText = rcClient; + InflateRect(&rcText, -2, -2); + crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SetTextColor(hDC, crPrevForeground); /* * Now we have to draw the graph @@ -310,6 +300,8 @@ RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; + COLORREF crPrevForeground; TCHAR Text[260]; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; @@ -342,9 +334,12 @@ _stprintf(Text, _T("%d K"), (int)CommitChargeTotal); /* * Draw the font text onto the graph - * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (_tcslen(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + rcText = rcClient; + InflateRect(&rcText, -2, -2); + crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SetTextColor(hDC, crPrevForeground); /* * Now we have to draw the graph _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2006-01-12 21:28:07 UTC (rev 20821) @@ -25,7 +25,6 @@ #include "dbgchnl.h" #include "debug.h" #include "endproc.h" -#include "font.h" #include "graph.h" #include "graphctl.h" #include "optnmenu.h" _____ Deleted: trunk/reactos/subsys/system/taskmgr/res/font.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/taskmgr/resource.h --- trunk/reactos/subsys/system/taskmgr/resource.h 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/resource.h 2006-01-12 21:28:07 UTC (rev 20821) @@ -28,7 +28,6 @@ #define IDR_PROCESS_PAGE_CONTEXT 144 #define IDB_TRAYMASK 150 #define IDB_TRAYICON 153 -#define IDB_FONT 154 #define IDD_DEBUG_CHANNELS_DIALOG 155 #define IDC_DEBUG_CHANNELS_LIST 156 _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc --- trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2006-01-12 21:28:07 UTC (rev 20821) @@ -201,52 +201,6 @@ '00 00 00 00 00 00' } */ -/* BINRES font.bmp */ -IDB_FONT BITMAP DISCARDABLE res/font.bmp -/* { - '42 4D 86 02 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 60 00 00 00 0B 00 00 00 01 00 04 00 00 00' - '00 00 10 02 00 00 74 12 00 00 74 12 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 AA AA AA A0 00 00 0A 00 AA AA' - 'AA A0 AA AA AA A0 00 00 00 A0 AA AA AA A0 AA AA' - 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 A0 00' - '00 A0 00 00 00 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00' - '0A 00 00 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00' - 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 0A' - '00 00 0A 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 A0' - '00 00 00 A0 00 00 A0 00 00 A0 00 00 0A 00 AA AA' - 'AA A0 0A AA AA A0 AA AA AA A0 AA AA AA A0 AA AA' - 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 AA 00' - '00 00 00 0A 00 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 A0' - '00 00 00 00 A0 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 0A' - '00 00 0A A0 0A 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00' - 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00' - '0A 00 0A A0 00 00 AA AA AA A0 00 00 0A 00 AA AA' - 'AA A0 AA AA AA A0 A0 00 00 A0 AA AA AA A0 AA AA' - 'AA A0 AA AA AA A0 AA AA AA A0 AA AA AA A0 A0 00' - '00 A0 00 00 00 00' -} */ - #include "Cz.rc" #include "En.rc" #include "De.rc" _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml --- trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2006-01-12 21:28:07 UTC (rev 20821) @@ -17,7 +17,6 @@ <file>dbgchnl.c</file> <file>debug.c</file> <file>endproc.c</file> - <file>font.c</file> <file>graph.c</file> <file>optnmenu.c</file> <file>perfdata.c</file>

18 years, 8 months

[ion] 20820: Set KernelApcPending == TRUE in KiCheckForKernelApcDelivery if we are at APC_LEVEL. This should hopefully fix some of those silent bugs. Thanks to Ignatich for poking me about it.

by ion＠svn.reactos.org

Set KernelApcPending == TRUE in KiCheckForKernelApcDelivery if we are at APC_LEVEL. This should hopefully fix some of those silent bugs. Thanks to Ignatich for poking me about it. Modified: trunk/reactos/ntoskrnl/ke/apc.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2006-01-12 21:16:42 UTC (rev 20819) +++ trunk/reactos/ntoskrnl/ke/apc.c 2006-01-12 21:21:19 UTC (rev 20820) @@ -57,6 +57,7 @@ * be delivered now, but after the IRQL is lowered to passive * level again. */ + KeGetCurrentThread()->ApcState.KernelApcPending = TRUE; HalRequestSoftwareInterrupt(APC_LEVEL); } }

18 years, 8 months

[ion] 20819: - Unfsck NtGdiExtCreatePen (thanks Christopher).

by ion＠svn.reactos.org

- Unfsck NtGdiExtCreatePen (thanks Christopher). Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/lib/gdi32/gdi32.def 2006-01-12 21:16:42 UTC (rev 20819) @@ -223,7 +223,7 @@ EudcLoadLinkW@16 EudcUnloadLinkW@8 ExcludeClipRect@20=NtGdiExcludeClipRect@20 -ExtCreatePen@20=NtGdiExtCreatePen@20 +ExtCreatePen@20 ExtCreateRegion@12=NtGdiExtCreateRegion@12 ExtEscape@24=NtGdiExtEscape@24 ExtFloodFill@20=NtGdiExtFloodFill@20 _____ Modified: trunk/reactos/lib/gdi32/objects/brush.c --- trunk/reactos/lib/gdi32/objects/brush.c 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/lib/gdi32/objects/brush.c 2006-01-12 21:16:42 UTC (rev 20819) @@ -20,6 +20,31 @@ /* * @implemented */ +HPEN +APIENTRY +ExtCreatePen(DWORD dwPenStyle, + DWORD dwWidth, + CONST LOGBRUSH *lplb, + DWORD dwStyleCount, + CONST DWORD *lpStyle) +{ + /* Call NTGDI (hack... like most of gdi32..sigh) */ + return NtGdiExtCreatePen(dwPenStyle, + dwWidth, + lplb->lbStyle, + lplb->lbColor, + lplb->lbHatch, + 0, + dwStyleCount, + (PULONG)lpStyle, + 0, + FALSE, + NULL); +} + +/* + * @implemented + */ HBRUSH STDCALL CreateDIBPatternBrush( HGLOBAL hglbDIBPacked, _____ Modified: trunk/reactos/subsys/win32k/objects/pen.c --- trunk/reactos/subsys/win32k/objects/pen.c 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/subsys/win32k/objects/pen.c 2006-01-12 21:16:42 UTC (rev 20819) @@ -137,9 +137,6 @@ IN OPTIONAL HBRUSH hbrush) { LOGPEN LogPen; - /* NOTE: This is HACK! */ - DPRINT1("FIXME: FIX CALLERS FIRST!\n"); - KEBUGCHECK(0); if (PenStyle & PS_USERSTYLE) PenStyle = (PenStyle & ~PS_STYLE_MASK) | PS_SOLID; _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-12 21:16:42 UTC (rev 20819) @@ -70,7 +70,7 @@ NtGdiEqualRgn 2 NtGdiEscape 5 NtGdiExcludeClipRect 5 -NtGdiExtCreatePen 5 +NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 NtGdiExtEscape 6 NtGdiExtFloodFill 5

18 years, 8 months

[cwittich] 20818: added sk kbd layout to registry patch by Malin <malin23@atlas.sk> (fixed bug 1251)

by cwittich＠svn.reactos.org

added sk kbd layout to registry patch by Malin <malin23(a)atlas.sk> (fixed bug 1251) Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/bootdata/txtsetup.sif _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-12 20:54:35 UTC (rev 20817) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-12 21:15:38 UTC (rev 20818) @@ -64,6 +64,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout Text",0x00000000,"BE (point)" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout File",0x00000000,"kbdhe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout Text",0x00000000,"Greek" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layou t File",0x00000000,"kbdsk.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layou t Text",0x00000000,"Slovak" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Adapters" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-12 20:54:35 UTC (rev 20817) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-12 21:15:38 UTC (rev 20818) @@ -113,6 +113,7 @@ lib\keyboard\kbdru\kbdru.dll 1 lib\keyboard\kbdse\kbdse.dll 1 lib\keyboard\kbdsg\kbdsg.dll 1 +lib\keyboard\kbdsk\kbdsk.dll 1 lib\keyboard\kbduk\kbduk.dll 1 lib\keyboard\kbdur\kbdur.dll 1 lib\keyboard\kbdus\kbdus.dll 1 _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2006-01-12 20:54:35 UTC (rev 20817) +++ trunk/reactos/bootdata/txtsetup.sif 2006-01-12 21:15:38 UTC (rev 20818) @@ -100,6 +100,7 @@ 00000408 = "Greek" 00000422 = "Ukrainian" 00010408 = "Greek 220" +0000041B = "Slovak (QWERTZ)" [Files.KeyboardLayout] 00000406 = kbdda.dll @@ -117,6 +118,7 @@ 00000813 = kbdbe.dll 00000408 = kbdhe.dll 00010408 = kbdhe.dll +0000041B = kbdsk.dll [HiveInfs.Install] AddReg=hivecls.inf,AddReg

18 years, 8 months

[ion] 20817: Task Manager enhs & fiexs <Pablo <pborobia@gmail.com>

by ion＠svn.reactos.org

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)

18 years, 8 months

[cwittich] 20816: added/updated spanish translations by samwise52 <samcharly@hotmail.com> (fixed bug 1266)

by cwittich＠svn.reactos.org

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" }

18 years, 8 months

[weiden] 20815: fixed maximum wait time in EnterCriticalPolicySection

by weiden＠svn.reactos.org

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; }

18 years, 8 months

[weiden] 20814: remove incorrect comment that was accidentally copied

by weiden＠svn.reactos.org

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; }

18 years, 8 months

← Newer
1
...
24
25
26
27
28
29
30
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006