Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[tkreuzer] 26564: GetNonFontObject: - OBJECTTYPE_META_DC does not SetLastError() - beautify the code a little
by tkreuzer＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: tkreuzer Date: Sun Apr 29 01:45:18 2007 New Revision: 26564 URL: http://svn.reactos.org/svn/reactos?rev=26564&view=rev Log: GetNonFontObject: - OBJECTTYPE_META_DC does not SetLastError() - beautify the code a little Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Sun Apr 29 01:45:18 2007 @@ -414,44 +414,43 @@ int GetNonFontObject(HGDIOBJ hGdiObj, int cbSize, LPVOID lpBuffer) { - INT dwType = GDI_HANDLE_GET_TYPE(hGdiObj); + INT dwType; + + hGdiObj = (HANDLE)GdiFixUpHandle(hGdiObj); + dwType = GDI_HANDLE_GET_TYPE(hGdiObj); + + if (!lpBuffer) // Should pass it all to Win32k and let god sort it out. ;^) + { + switch(dwType) + { + case GDI_OBJECT_TYPE_PEN: + return sizeof(LOGPEN); + case GDI_OBJECT_TYPE_BRUSH: + return sizeof(LOGBRUSH); + case GDI_OBJECT_TYPE_BITMAP: + return sizeof(BITMAP); + case GDI_OBJECT_TYPE_PALETTE: + return sizeof(WORD); + case GDI_OBJECT_TYPE_EXTPEN: /* we don't know the size, ask win32k */ + break; + } + } switch(dwType) { + case GDI_OBJECT_TYPE_PEN: //Check the structures and see if A & W are the same. + case GDI_OBJECT_TYPE_EXTPEN: + case GDI_OBJECT_TYPE_BRUSH: // Mixing Apples and Oranges? + case GDI_OBJECT_TYPE_BITMAP: + case GDI_OBJECT_TYPE_PALETTE: + return NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); + case GDI_OBJECT_TYPE_DC: case GDI_OBJECT_TYPE_REGION: case GDI_OBJECT_TYPE_METAFILE: case GDI_OBJECT_TYPE_ENHMETAFILE: case GDI_OBJECT_TYPE_EMF: - case GDI_OBJECT_TYPE_METADC: SetLastError(ERROR_INVALID_HANDLE); - return 0; - - case GDI_OBJECT_TYPE_PEN: //Check the structures and see if A & W are the same. - case GDI_OBJECT_TYPE_BRUSH: // Mixing Apples and Oranges? - case GDI_OBJECT_TYPE_BITMAP: - case GDI_OBJECT_TYPE_PALETTE: - if (!lpBuffer) // Should pass it all to Win32k and let god sort it out. ;^) - { - switch(dwType) - { - case GDI_OBJECT_TYPE_PEN: - return sizeof(LOGPEN); - case GDI_OBJECT_TYPE_BRUSH: - return sizeof(LOGBRUSH); - case GDI_OBJECT_TYPE_BITMAP: - return sizeof(BITMAP); - case GDI_OBJECT_TYPE_PALETTE: - return sizeof(WORD); - case GDI_OBJECT_TYPE_EXTPEN: /* we don't know the size, ask win32k */ - break; - default: - /* Other invalid handle type, windows does not SetLastError() */ - return 0; - } - } - hGdiObj = (HANDLE)GdiFixUpHandle(hGdiObj); - return NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); } return 0; }

1 0

[dgorbachev] 26563: Undo r26555 change as suggested by Aleksey & Thomas.
by dgorbachev＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: dgorbachev Date: Sun Apr 29 01:23:44 2007 New Revision: 26563 URL: http://svn.reactos.org/svn/reactos?rev=26563&view=rev Log: Undo r26555 change as suggested by Aleksey & Thomas. Modified: trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Sun Apr 29 01:23:44 2007 @@ -165,7 +165,7 @@ if (CpuUsage <= 0) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; - wsprintf(Text, _T("%d%%"), (int)CpuUsage); + _stprintf(Text, _T("%d%%"), (int)CpuUsage); /* * Draw the font text onto the graph @@ -329,9 +329,9 @@ CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); if (CommitChargeTotal > 1024) - wsprintf(Text, _T("%d MB"), (int)(CommitChargeTotal / 1024)); + _stprintf(Text, _T("%d MB"), (int)(CommitChargeTotal / 1024)); else - wsprintf(Text, _T("%d K"), (int)CommitChargeTotal); + _stprintf(Text, _T("%d K"), (int)CommitChargeTotal); /* * Draw the font text onto the graph */ Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Sun Apr 29 01:23:44 2007 @@ -1067,7 +1067,7 @@ lpszBuf[0] = TEXT('\0'); } else { lpszTemp[lstrlen(lpszTemp)-2] = TEXT('\0'); /*remove cr and newline character */ - wsprintf(lpszBuf, TEXT("%s (0x%x)"), lpszTemp, (int)GetLastError()); + _stprintf(lpszBuf, TEXT("%s (0x%x)"), lpszTemp, (int)GetLastError()); } if (lpszTemp) { LocalFree((HLOCAL)lpszTemp);

1 0

[gedmurphy] 26562: update wine doc with hhctrl info
by gedmurphy＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: gedmurphy Date: Sat Apr 28 15:50:21 2007 New Revision: 26562 URL: http://svn.reactos.org/svn/reactos?rev=26562&view=rev Log: update wine doc with hhctrl info Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sat Apr 28 15:50:21 2007 @@ -47,6 +47,7 @@ reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/dbghelp # +reactos/dll/win32/hhctrl.ocx # Synced to wine-0_9_35 reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Autosync reactos/dll/win32/iphlpapi # Out of sync

1 0

[gedmurphy] 26561: add sensapi.dll to bootcd
by gedmurphy＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: gedmurphy Date: Sat Apr 28 15:47:48 2007 New Revision: 26561 URL: http://svn.reactos.org/svn/reactos?rev=26561&view=rev Log: add sensapi.dll to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Apr 28 15:47:48 2007 @@ -205,6 +205,7 @@ dll\win32\samlib\samlib.dll 1 dll\win32\samsrv\samsrv.dll 1 dll\win32\secur32\secur32.dll 1 +dll\win32\sensapi\sensapi.dll 1 dll\win32\serialui\serialui.dll 1 dll\win32\setupapi\setupapi.dll 1 dll\win32\shdocvw\shdocvw.dll 1

1 0

[tkreuzer] 26560: wintests build fix: - comment out type redefinitions
by tkreuzer＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: tkreuzer Date: Sat Apr 28 13:02:15 2007 New Revision: 26560 URL: http://svn.reactos.org/svn/reactos?rev=26560&view=rev Log: wintests build fix: - comment out type redefinitions Modified: trunk/rostests/winetests/powrprof/pwrprof.c trunk/rostests/winetests/shell32/shelllink.c Modified: trunk/rostests/winetests/powrprof/pwrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/pwrpro… ============================================================================== --- trunk/rostests/winetests/powrprof/pwrprof.c (original) +++ trunk/rostests/winetests/powrprof/pwrprof.c Sat Apr 28 13:02:15 2007 @@ -22,6 +22,7 @@ unsigned int g_ActivePwrScheme = 3; unsigned int g_TempPwrScheme = 99; +#if 0 // FIXME: needed to build. Please update pwrprof winetest. typedef struct _PROCESSOR_POWER_INFORMATION { ULONG Number; ULONG MaxMhz; @@ -31,6 +32,7 @@ ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; +#endif POWER_POLICY g_PowerPolicy; Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… ============================================================================== --- trunk/rostests/winetests/shell32/shelllink.c (original) +++ trunk/rostests/winetests/shell32/shelllink.c Sat Apr 28 13:02:15 2007 @@ -45,7 +45,9 @@ static const WCHAR lnkfile[]= { 'C',':','\\','t','e','s','t','.','l','n','k',0 }; static const WCHAR notafile[]= { 'C',':','\\','n','o','n','e','x','i','s','t','e','n','t','\\','f','i','l','e',0 }; +#if 0 // FIXME: needed to build. Please update shell32 winetest. const GUID IID_IPersistFile = { 0x0000010b, 0x0000, 0x0000, { 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46 } }; +#endif /* For some reason SHILCreateFromPath does not work on Win98 and * SHSimpleIDListFromPathA does not work on NT4. But if we call both we

1 0

[jimtabor] 26558: Fix build.
by jimtabor＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: jimtabor Date: Sat Apr 28 11:05:13 2007 New Revision: 26558 URL: http://svn.reactos.org/svn/reactos?rev=26558&view=rev Log: Fix build. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Sat Apr 28 11:05:13 2007 @@ -41,7 +41,7 @@ GdiFixUpHandle(HGDIOBJ hGdiObj) { if (((ULONG_PTR)(hGdiObj)) & GDI_HANDLE_UPPER_MASK ) return hGdiObj; - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_TO_ENTRY(hGdiObj); + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); return hGdiObj = (HGDIOBJ)(((LONG_PTR)(hGdiObj)) | (Entry->Type << 16)); // Rebuild handle for Object }

1 0

[jimtabor] 26557: Fix indexing mistake, added new LDC structure items. New defines for LDC and Xfroms. Now the Dc_Attr works. Read and write to it in user space.
by jimtabor＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: jimtabor Date: Sat Apr 28 10:43:44 2007 New Revision: 26557 URL: http://svn.reactos.org/svn/reactos?rev=26557&view=rev Log: Fix indexing mistake, added new LDC structure items. New defines for LDC and Xfroms. Now the Dc_Attr works. Read and write to it in user space. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Sat Apr 28 10:43:44 2007 @@ -58,8 +58,10 @@ BOOL GdiIsHandleValid(HGDIOBJ hGdiObj) { - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_TO_ENTRY(hGdiObj); - if(Entry->KernelData != NULL && (Entry->Type & GDI_HANDLE_TYPE_MASK) == (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); + if(Entry->KernelData != NULL && + (Entry->Type & GDI_HANDLE_TYPE_MASK) == + (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) @@ -72,8 +74,10 @@ BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, PVOID *UserData) { - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_TO_ENTRY(hGdiObj); - if(Entry->KernelData != NULL && (Entry->Type & GDI_HANDLE_TYPE_MASK) == (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); + if(Entry->KernelData != NULL && + (Entry->Type & GDI_HANDLE_TYPE_MASK) == + (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); if(pid == NULL || pid == CurrentProcessId) Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Sat Apr 28 10:43:44 2007 @@ -94,8 +94,30 @@ #define DC_LAST_CLIPRGN_VALID 0x00008000 #define DC_PRIMARY_DISPLAY 0x00010000 -#define LDC_LDC 0x01 // (init) local DC other than a normal DC -#define LDC_EMFLDC 0x02 // Enhance Meta File local DC +/* DC_ATTR LCD Flags */ +#define LDC_LDC 0x00000001 // (init) local DC other than a normal DC +#define LDC_EMFLDC 0x00000002 // Enhance Meta File local DC +#define LDC_INIT_DOCUMENT 0x00000040 +#define LDC_INIT_PAGE 0x00000080 +#define LDC_KILL_DOCUMENT 0x00010000 + + +/* DC_ATTR Xform Flags */ +#define METAFILE_TO_WORLD_IDENTITY 0x00000001 +#define WORLD_TO_PAGE_IDENTITY 0x00000002 +#define DEVICE_TO_PAGE_INVALID 0x00000008 +#define DEVICE_TO_WORLD_INVALID 0x00000010 +#define WORLD_TRANSFORM_SET 0x00000020 +#define POSITIVE_Y_IS_UP 0x00000040 +#define INVALIDATE_ATTRIBUTES 0x00000080 +#define PTOD_EFM11_NEGATIVE 0x00000100 +#define PTOD_EFM22_NEGATIVE 0x00000200 +#define ISO_OR_ANISO_MAP_MODE 0x00000400 +#define PAGE_TO_DEVICE_IDENTITY 0x00000800 +#define PAGE_TO_DEVICE_SCALE_IDENTITY 0x00001000 +#define PAGE_XLATE_CHANGED 0x00002000 +#define PAGE_EXTENTS_CHANGED 0x00004000 +#define WORLD_XFORM_CHANGED 0x00008000 /* TYPES *********************************************************************/ @@ -106,11 +128,6 @@ LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; - - -#define GDI_HANDLE_TO_ENTRY(h) \ - ((((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) * sizeof(GDI_TABLE_ENTRY)) - typedef struct _RGNATTR { @@ -127,6 +144,9 @@ INT iType; PVOID pvEmfDC; /* Pointer to ENHMETAFILE structure */ ABORTPROC pAbortProc; /* AbortProc for Printing */ + HANDLE hPrinter; /* Local or Remote Printer driver */ + INT iInitPage; /* Start/Stop */ + INT iInitDocument; } LDC, *PLDC; typedef struct _DC_ATTR

1 0

[dgorbachev] 26556: Chinese translation by Zhangbing (bug #2219).
by dgorbachev＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: dgorbachev Date: Sat Apr 28 10:02:39 2007 New Revision: 26556 URL: http://svn.reactos.org/svn/reactos?rev=26556&view=rev Log: Chinese translation by Zhangbing (bug #2219). Added: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc Added: 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 (added) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Sat Apr 28 10:02:39 2007 @@ -1,0 +1,202 @@ +/* + * PROJECT: System Setup + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/syssetup/lang/zh-CN.rc + * PURPOSE: Chinese translation + * TRANSLATOR: Copyright (C) 2007 ÕÅ±ù(e_zb(a)21cn.com, ezb(a)mail.gywb.cn, + * www.gywz.gz.cn/zb) ÖÐÎÄÖ§³Ö + * + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Ïòµ¼" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "»¶ÓÊ¹ÓÃReactOS°²×°Ïòµ¼¡£", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "°²×°Ïòµ¼½«ÔÚ¼ÆËã»úÉÏ°²×° ReactOS ¡£\n"\ + "ËüÐèÒªËÑ¼¯ÓÐ¹ØÄúµÄºÍ¼ÆËã»úµÄÐÅÏ¢£¬\n"\ + "ÒÔ±ãÕýÈ·°²×° ReactOS¡£", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Òª¼ÌÐø£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Ïòµ¼ " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS µÄ¿ª·¢ÈËÔ±¾ÍÒÔÏÂµÄ×ÔÓÉÈí¼þÏîÄ¿±íÊ¾¸ÐÐ»¡£"\ + "ÔÚ½¨Á¢ ReactOS Ê±Ê¹ÓÃÁËÆäÖÐµÄ´úÂë :", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS ÊÇ»ùÓÚGPLÐÒé·¢²¼µÄ£¬Òò´ËÈç¹ûÄúÐèÒªÔÙÓÃ»òÖØÐÂ·¢²¼ ReactOS "\ + "(»ò²¿·Ö)±ØÐë×ñÑGPLÐí¿É¡£", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "²é¿´GPL(&V)...",IDC_VIEWGPL,245,110,65,15 + LTEXT "¼ÌÐø°²×°µ¥»÷ ¡° ÏÂÒ»²½ ¡± ¡£",IDC_STATIC,15,136,195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Ïòµ¼ " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "ÊäÈëÄúµÄÐÕÃûÒÔ¼°¹«Ë¾»òµ¥Î»µÄÃû³Æ¡£",IDC_STATIC, 54, 7, 242, 21 + LTEXT "ÐÕÃû(&M):", IDC_STATIC,54,37,44,8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "µ¥Î»(&O):", IDC_STATIC,54,57,60,20 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Ïòµ¼ " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "ÇëÊäÈë²»³¬¹ý63¸ö×Ö·ûµÄ¼ÆËã»úÃû¡£"\ + "Ã¿Ò»¸öÔÚÄúÍøÂçÉÏµÄ¼ÆËã»ú¶¼±ØÐëÓÐÒ»¸öÎ¨Ò»µÄÃû³Æ¡£", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "¼ÆËã»úÃû(&C):", IDC_STATIC,54,38,75,8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "°²×°³ÌÐò»á´´½¨Ò»¸ö³ÆÎª Administrator (ÏµÍ³¹ÜÀíÔ±)µÄÓÃ»§ÕÊ»§¡£"\ + "ÐèÒªÍêÈ«¿ØÖÆ¼ÆËã»úÊ±£¬¿ÉÒÔÊ¹ÓÃÕâ¸öÕÊ»§¡£", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Çë¼üÈë²»³¬¹ý14¸ö×Ö·ûµÄÏµÍ³¹ÜÀíÔ±ÃÜÂë¡£", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "ÏµÍ³¹ÜÀíÔ±ÃÜÂë(&A):", IDC_STATIC,54,104,75,8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "È·ÈÏÃÜÂë(&O):", IDC_STATIC,54,123,75,8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Ïòµ¼ " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "ÏµÍ³ÇøÓòÓÃÓÚÉèÖÃÓ¦ÓÃÊ¹ÓÃµÄÓïÑÔ£¬"\ + "ÓÃ»§ÇøÓòÓÃÓÚÉèÖÃÊýÖµ£¬»õ±Ò£¬ÈÕÆÚµÄÏÔÊ¾·½Ê½ ", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Òª¸ü¸ÄÏµÍ³ºÍÓÃ»§µÄÇøÓòÉèÖÃ£¬Çëµ¥»÷ ¡°×Ô¶¨Òå¡± ¡£", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "×Ô¶¨Òå(&C)...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "¡°ÎÄ×ÖÊäÈëÓïÑÔ¡±ÈÃÄúÊ¹ÓÃ¶àÖÖÊäÈë·½·¨ºÍÉè±¸ÓÃ\r\nÐí¶à²»Í¬µÄÓïÑÔÊäÈëÎÄ×Ö¡£", + IDC_STATIC, 53, 86, 253, 20 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Òª²é¿´»ò¸Ä±äµ±Ç°ÅäÖÃ£¬Çëµ¥»÷¡°×Ô¶¨Òå¡±¡£", + IDC_STATIC, 53, 124, 184, 8 + PUSHBUTTON "×Ô¶¨Òå(&U)...", IDC_CUSTOMLAYOUT, 245, 120, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Ïòµ¼ " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "ÈÕÆÚºÍÊ±¼ä", IDC_STATIC,53,7,253,8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Ê±¼äÇøÓò", IDC_STATIC,53,42,253,8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "ÏÄÊ±ÖÆ×Ô¶¯µ÷ÕûÊ±¼ä(&D)", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Ïòµ¼ " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS °²×°Íê³É " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "ÕýÔÚÍê³É ReactOS °²×°Ïòµ¼", IDC_FINISHTITLE,115,8,195,24 + LTEXT "ReactOS °²×°³ÌÐòÒÑË³ÀûÍê³É¡£\n\n"\ + "ÒªÖØÐÂÆô¶¯¼ÆËã»ú£¬Çëµ¥»÷¡°Íê³É¡±¡£", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Èç¹ûÇý¶¯Æ÷ÀïÓÐCD£¬Çë½«ÆäÈ¡³ö"\ + "ÒªÖØÐÂÆô¶¯¼ÆËã»ú£¬Çëµ¥»÷¡°Íê³É¡±¡£", IDC_STATIC, 115, 160, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU Í¨ÓÃ¹«¹²Ðí¿ÉÖ¤" +FONT 9, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "È·¶¨",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Acknowledgements" + IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information " + IDS_OWNERTITLE "×Ô¶¨ÒåÈí¼þ" + IDS_OWNERSUBTITLE "°²×°³ÌÐò½«Ê¹ÓÃÄúÌá¹©µÄ¸öÈËÐÅÏ¢£¬×Ô¶¨ÒåÄúµÄ ReactOS Èí¼þ¡£" + IDS_COMPUTERTITLE "¼ÆËã»úÃûºÍÏµÍ³¹ÜÀíÔ±ÃÜÂë" + IDS_COMPUTERSUBTITLE "Äú±ØÐëÌá¹©¼ÆËã»úÃûºÍÏµÍ³¹ÜÀíÔ±ÃÜÂë¡£" + IDS_LOCALETITLE "ÇøÓòÉèÖÃ " + IDS_LOCALESUBTITLE "Äú¿ÉÒÔÎª²»Í¬µÄÇøÓòºÍÓïÑÔ×Ô¶¨Òå ReactOS¡£" + IDS_DATETIMETITLE "ÈÕÆÚºÍÊ±¼ä " + IDS_DATETIMESUBTITLE "ÎªÄúµÄ¼ÆËã»úÅäÖÃÕýÈ·µÄÈÕÆÚºÍÊ±¼ä¡£" + IDS_PROCESSTITLE "Process page title" + IDS_PROCESSSUBTITLE "Process page subtitle" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accessories" + IDS_CMT_CALC "Launch Calculator" + IDS_CMT_CMD "Open command prompt" + IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_WINEFILE "Launch Winefile" + IDS_CMT_NOTEPAD "Launch Text Editor" + IDS_CMT_REGEDIT "Launch Registry Editor" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS °²×°³ÌÐò" + IDS_UNKNOWN_ERROR "Î´Öª´íÎó" + IDS_REGISTERING_COMPONENTS "×¢²á×é¼þ..." + IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " + IDS_GETPROCADDR_FAILED "GetProcAddr failed: " + IDS_REGSVR_FAILED "DllRegisterServer failed: " + IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_TIMEOUT "Timeout during registration" + IDS_REASON_UNKNOWN "" +END + +/* EOF */ Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc Sat Apr 28 10:02:39 2007 @@ -54,3 +54,4 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc"

1 0

[dgorbachev] 26555: Patch by Sbs (sbarthes [at] gmail [dot] com). Bugzilla report #2137.
by dgorbachev＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: dgorbachev Date: Sat Apr 28 10:02:22 2007 New Revision: 26555 URL: http://svn.reactos.org/svn/reactos?rev=26555&view=rev Log: Patch by Sbs (sbarthes [at] gmail [dot] com). Bugzilla report #2137. Modified: trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.rc Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Sat Apr 28 10:02:22 2007 @@ -165,7 +165,7 @@ if (CpuUsage <= 0) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; - _stprintf(Text, _T("%d%%"), (int)CpuUsage); + wsprintf(Text, _T("%d%%"), (int)CpuUsage); /* * Draw the font text onto the graph @@ -329,9 +329,9 @@ CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); if (CommitChargeTotal > 1024) - _stprintf(Text, _T("%d MB"), (int)(CommitChargeTotal / 1024)); + wsprintf(Text, _T("%d MB"), (int)(CommitChargeTotal / 1024)); else - _stprintf(Text, _T("%d K"), (int)CommitChargeTotal); + wsprintf(Text, _T("%d K"), (int)CommitChargeTotal); /* * Draw the font text onto the graph */ Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc Sat Apr 28 10:02:22 2007 @@ -163,7 +163,7 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "à propos du Gestionnaire des tâches" +CAPTION "A propos du Gestionnaire des tâches ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Gestionnaire des tâches v1.0\nCopyright (C) 1999 - 2001\nby Brian Palmer (brianp(a)reactos.org)\nTraduit par Benoit Plante - 2005", @@ -179,7 +179,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Gestionnaire des tâches" +CAPTION "Gestionnaire des tâches ReactOS" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN @@ -218,38 +218,38 @@ GROUPBOX "Util. du fichier",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totaux",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Charge dédiée (Ko)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Mémoire physique (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Mémoire physique (Ko)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Kernel Memory (Ko)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 - LTEXT "Processus",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + LTEXT "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,53,8 + LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,53,8 + LTEXT "Processus",IDS_TOTALS_PROCESS_COUNT,12,149,53,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,15,8 - LTEXT "Pic",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,53,8 + LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,53,8 + LTEXT "Pic",IDS_COMMIT_CHARGE_PEAK,12,193,53,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,137,131,27,8 - LTEXT "Disponible",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "Cache système",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "Total",IDS_PHYSICAL_MEMORY_TOTAL,137,131,48,8 + LTEXT "Disponible",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,48,8 + LTEXT "Cache système",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,48,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,137,174,27,8 - LTEXT "Paginée",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "Non paginée",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "Total",IDS_KERNEL_MEMORY_TOTAL,137,174,48,8 + LTEXT "Paginée",IDS_KERNEL_MEMORY_PAGED,137,184,48,8 + LTEXT "Non paginée",IDS_KERNEL_MEMORY_NONPAGED,137,193,48,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 | @@ -354,65 +354,65 @@ WS_DISABLED | WS_TABSTOP,175,119,41,10 END -IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 244, 198 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sélection de colonnes" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "Annuler",IDCANCEL,138,178,50,14 + DEFPUSHBUTTON "OK",IDOK,130,177,50,14 + PUSHBUTTON "Annuler",IDCANCEL,187,177,50,14 LTEXT "Sélectionnez les colones qui apparaîtront dans la page Processus du Gestionnaire des tâches", IDC_STATIC,7,7,181,17 CONTROL "&Nom de l'image",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,7,28,56,10 + WS_DISABLED | WS_TABSTOP,7,28,123,10 CONTROL "&PID (Identificateur du Processus)",IDC_PID,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,123,10 CONTROL "Utilisation de l'UC",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,50,53,10 + WS_TABSTOP,7,50,123,10 CONTROL "T&emps processeur",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,61,48,10 + WS_TABSTOP,7,61,123,10 CONTROL "Utilisation de la &mémoire",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,72,63,10 + WS_TABSTOP,7,72,123,10 CONTROL "Écart &d'utilisation de la mémoire",IDC_MEMORYUSAGEDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,123,10 CONTROL "Utilisation ma&ximale de la mémoire",IDC_PEAKMEMORYUSAGE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,123,10 CONTROL "Erreurs de page",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,105,53,10 + WS_TABSTOP,7,105,123,10 CONTROL "Objets &USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,116,62,10 + WS_TABSTOP,7,116,123,10 CONTROL "Lectures E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,127,49,10 + WS_TABSTOP,7,127,123,10 CONTROL "Octets de lecture E/S",IDC_IOREADBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,123,10 CONTROL "Identificateur de &session",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,149,50,10 + WS_TABSTOP,7,149,123,10 CONTROL "&Nom de l'utilisateur",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,160,51,10 + WS_TABSTOP,7,160,123,10 CONTROL "Éc&art d'erreurs de pagination",IDC_PAGEFAULTSDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + BS_AUTOCHECKBOX | WS_TABSTOP,129,28,108,10 CONTROL "Taille de la mémoire &virtuelle",IDC_VIRTUALMEMORYSIZE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + BS_AUTOCHECKBOX | WS_TABSTOP,129,39,108,10 CONTROL "Réserve pa&ginée",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,50,53,10 + WS_TABSTOP,129,50,108,10 CONTROL "Réserve &non paginée",IDC_NONPAGEDPOOL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + BS_AUTOCHECKBOX | WS_TABSTOP,129,61,108,10 CONTROL "P&riorité de base",IDC_BASEPRIORITY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + BS_AUTOCHECKBOX | WS_TABSTOP,129,72,108,10 CONTROL "Nombre de &handles",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,83,59,10 + WS_TABSTOP,129,83,108,10 CONTROL "Nombre de &threads",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,94,59,10 + WS_TABSTOP,129,94,108,10 CONTROL "Objets GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,105,55,10 + WS_TABSTOP,129,105,108,10 CONTROL "Écritures E/S",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,116,49,10 + WS_TABSTOP,129,116,108,10 CONTROL "Octets d'écriture E/S",IDC_IOWRITEBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,129,127,108,10 CONTROL "Autres E/S",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,138,46,10 + WS_TABSTOP,129,138,108,10 CONTROL "Octets d'autres E/S",IDC_IOOTHERBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,129,149,108,10 END @@ -602,7 +602,7 @@ ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Place le processus dans la priorité INFÉRIRIEURE À LA NORMALE" ID_PROCESS_PAGE_SETPRIORITY_LOW "Place le processus dans la priorité BASSE" - IDS_LICENSE "Ce program est un logiciel libre; vous pouvez le distribuer et/ou le modifier sous les termes de la Licence GNU Lesser General Public License telle que publiée par laFree Software Foundation; soit la version 2.1 de la Licence, ou (à votre option) toute autre version plus récente.\r\n\r\nCe program est distribué dans l'espoir qu'il vous soit util, mais sans AUCUNE GARANTIE; sans même la garantie implicite de MARCHANDISABILITÉ ou d'FONCTIONNEMENT POUR UN USAGE PARTICULIER. Voir la GNU General Public License pour plus de détails.\r\n\r\n Vous devriez avoir reçu une copie de la GNU General Public License avec ce program; sinon, écrivez à la Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + IDS_LICENSE "Ce program est un logiciel libre; vous pouvez le distribuer et/ou le modifier sous les termes de la Licence GNU Lesser General Public License telle que publiée par laFree Software Foundation; soit la version 2.1 de la Licence, ou (à votre option) toute autre version plus récente.\r\n\r\nCe program est distribué dans l'espoir qu'il vous soit util, mais sans AUCUNE GARANTIE; sans même la garantie implicite de MARCHANDISABILITÉ ou de FONCTIONNEMENT POUR UN USAGE PARTICULIER. Voir la GNU General Public License pour plus de détails.\r\n\r\n Vous devriez avoir reçu une copie de la GNU General Public License avec ce program; sinon, écrivez à la Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END @@ -654,7 +654,7 @@ IDS_MSG_PROCESSONEPRO "Le processus doit avoir de l'affinité avec au moins un processeur." IDS_MSG_INVALIDOPTION "Option Invalide" IDS_MSG_UNABLEDEBUGPROCESS "Impossible de déboguer le processus." - IDS_MSG_WARNINGDEBUG "ATTENTION: Déboguer ce processus peut entrîner une perte de données.\nÊtes-vous sûrs de vouloir le déboguer?" + IDS_MSG_WARNINGDEBUG "ATTENTION: Déboguer ce processus peut entraîner une perte de données.\nÊtes-vous sûrs de vouloir le déboguer?" IDS_MSG_TASKMGRWARNING "Avertissement du Gestionnaire des tâches" IDS_MSG_WARNINGTERMINATING "ATTENTION: Terminer un processus peut causer des effets indésirables\nincluant une perte de donnée ou une instabilité du système.\nLe processus n'aura pas la chance de sauvegarder son état\nou les données avant de terminer.\nÊtes-vous sûr de vouloir terminer le processus?" IDS_MSG_UNABLETERMINATEPRO "Impossible de terminer le processus" @@ -665,7 +665,7 @@ IDS_STATUS_CPUUSAGE "UC utilisée: %3d%%" IDS_STATUS_PROCESSES "Processus: %d" IDS_Not_Responding "Ne répond pas" - IDS_Running "En cours d'exécution" + IDS_Running "En cours d'exécution" END Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Sat Apr 28 10:02:22 2007 @@ -1067,7 +1067,7 @@ lpszBuf[0] = TEXT('\0'); } else { lpszTemp[lstrlen(lpszTemp)-2] = TEXT('\0'); /*remove cr and newline character */ - _stprintf(lpszBuf, TEXT("%s (0x%x)"), lpszTemp, (int)GetLastError()); + wsprintf(lpszBuf, TEXT("%s (0x%x)"), lpszTemp, (int)GetLastError()); } if (lpszTemp) { LocalFree((HLOCAL)lpszTemp); 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 Sat Apr 28 10:02:22 2007 @@ -9,7 +9,7 @@ #endif /* BINRES taskmgr.ico */ -IDI_TASKMANAGER ICON DISCARDABLE res/taskmgr.ico +IDI_TASKMANAGER ICON DISCARDABLE "res/taskmgr.ico" /* { '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02' '00 00 26 00 00 00 10 10 10 00 00 00 00 00 28 01' @@ -82,7 +82,7 @@ } */ /* BINRES window.ico */ -IDI_WINDOW ICON DISCARDABLE res/window.ico +IDI_WINDOW ICON DISCARDABLE "res/window.ico" /* { '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' @@ -135,7 +135,7 @@ } */ /* BINRES windowsm.ico */ -IDI_WINDOWSM ICON DISCARDABLE res/windowsm.ico +IDI_WINDOWSM ICON DISCARDABLE "res/windowsm.ico" /* { '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01' '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00' @@ -160,7 +160,7 @@ } */ /* BINRES traymask.bmp */ -IDB_TRAYMASK BITMAP DISCARDABLE res/traymask.bmp +IDB_TRAYMASK BITMAP DISCARDABLE "res/traymask.bmp" /* { '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00' @@ -181,7 +181,7 @@ } */ /* BINRES trayicon.bmp */ -IDB_TRAYICON BITMAP DISCARDABLE res/trayicon.bmp +IDB_TRAYICON BITMAP DISCARDABLE "res/trayicon.bmp" /* { '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00' @@ -210,9 +210,13 @@ #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/sv-SE.rc" +#ifdef __GCC__ #include "lang/uk-UA.rc" +#endif

1 0

[dgorbachev] 26554: - Use hack to prevent Explorer crash.
by dgorbachev＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: dgorbachev Date: Sat Apr 28 08:10:33 2007 New Revision: 26554 URL: http://svn.reactos.org/svn/reactos?rev=26554&view=rev Log: - Use hack to prevent Explorer crash. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sat Apr 28 08:10:33 2007 @@ -396,23 +396,23 @@ } if (Bits == NULL) - { + { if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; - coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - - coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; - if (BitmapObj->SurfObj.lDelta > 0) - coreheader->bcHeight = -coreheader->bcHeight; - - Result = BitmapObj->SurfObj.sizlBitmap.cy; - } - - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { + coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + + coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; + if (BitmapObj->SurfObj.lDelta > 0) + coreheader->bcHeight = -coreheader->bcHeight; + + Result = BitmapObj->SurfObj.sizlBitmap.cy; + } + + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; /* Report negtive height for top-down bitmaps. */ @@ -453,7 +453,7 @@ else { if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) - { + { Result = 0; } else @@ -462,34 +462,34 @@ DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cy = ScanLines; - DestBitmap = NULL; - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - DestBitmap = EngCreateBitmap( DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), - BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), - 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, - Bits); - } - - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - - DestBitmap = EngCreateBitmap( DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), - BitmapFormat(coreheader->bcBitCount, BI_RGB), - 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, - Bits); - } - - + DestBitmap = NULL; + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { + DestBitmap = EngCreateBitmap(DestSize, + /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ + DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ + BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), + 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, + Bits); + } + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + + DestBitmap = EngCreateBitmap(DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), + BitmapFormat(coreheader->bcBitCount, BI_RGB), + 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, + Bits); + } + if(DestBitmap == NULL) { BITMAPOBJ_UnlockBitmap(BitmapObj); return 0; } - + DestSurfObj = EngLockSurface((HSURF)DestBitmap); SourcePalette = PALETTE_LockPalette(hSourcePalette);

1 0

← Newer
1
2
3
4
5
6
7
8
...
38
Older →

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 April 2007