Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 50652: [RTL] - Move page heap related code to heappage.c.
by fireball＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: fireball Date: Thu Feb 10 13:24:39 2011 New Revision: 50652 URL: http://svn.reactos.org/svn/reactos?rev=50652&view=rev Log: [RTL] - Move page heap related code to heappage.c. Added: trunk/reactos/lib/rtl/heappage.c (with props) Modified: trunk/reactos/lib/rtl/heapdbg.c trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/lib/rtl/heapdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=5065… ============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Thu Feb 10 13:24:39 2011 @@ -14,12 +14,6 @@ #define NDEBUG #include <debug.h> -BOOLEAN RtlpPageHeapEnabled = FALSE; -ULONG RtlpPageHeapGlobalFlags; -ULONG RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; -ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; -WCHAR RtlpPageHeapTargetDlls[512]; - /* FUNCTIONS ******************************************************************/ HANDLE NTAPI @@ -548,18 +542,4 @@ return Result; } - -// Page heap -> move to another file - -HANDLE NTAPI -RtlpPageHeapCreate(ULONG Flags, - PVOID Addr, - SIZE_T TotalSize, - SIZE_T CommitSize, - PVOID Lock, - PRTL_HEAP_PARAMETERS Parameters) -{ - return NULL; -} - /* EOF */ Added: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c (added) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Thu Feb 10 13:24:39 2011 @@ -1,0 +1,39 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/heappage.c + * PURPOSE: RTL Page Heap implementation + * PROGRAMMERS: Copyright 2011 Aleksey Bragin + */ + +/* Useful references: + http://msdn.microsoft.com/en-us/library/ms220938(VS.80).aspx +*/ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> +#include <heap.h> + +#define NDEBUG +#include <debug.h> + +BOOLEAN RtlpPageHeapEnabled = FALSE; +ULONG RtlpPageHeapGlobalFlags; +ULONG RtlpPageHeapSizeRangeStart, RtlpPageHeapSizeRangeEnd; +ULONG RtlpPageHeapDllRangeStart, RtlpPageHeapDllRangeEnd; +WCHAR RtlpPageHeapTargetDlls[512]; + +/* FUNCTIONS ******************************************************************/ + +HANDLE NTAPI +RtlpPageHeapCreate(ULONG Flags, + PVOID Addr, + SIZE_T TotalSize, + SIZE_T CommitSize, + PVOID Lock, + PRTL_HEAP_PARAMETERS Parameters) +{ + return NULL; +} + +/* EOF */ Propchange: trunk/reactos/lib/rtl/heappage.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Thu Feb 10 13:24:39 2011 @@ -74,6 +74,7 @@ <file>handle.c</file> <file>heap.c</file> <file>heapdbg.c</file> + <file>heappage.c</file> <file>image.c</file> <file>interlck.c</file> <file>message.c</file>

1 0

[tkreuzer] 50651: [CLASSPNP] Fix a bug, I introduced.
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 13:07:54 2011 New Revision: 50651 URL: http://svn.reactos.org/svn/reactos?rev=50651&view=rev Log: [CLASSPNP] Fix a bug, I introduced. Modified: branches/cmake-bringup/drivers/storage/classpnp/class.c branches/cmake-bringup/drivers/storage/classpnp/obsolete.c Modified: branches/cmake-bringup/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] Thu Feb 10 13:07:54 2011 @@ -2485,7 +2485,7 @@ retry = TRUE; } - if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. Modified: branches/cmake-bringup/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] Thu Feb 10 13:07:54 2011 @@ -161,7 +161,7 @@ retry = TRUE; } - if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. If the class driver has supplied a StartIo,

1 0

[tkreuzer] 50650: Merge MSVC fixes from cmake branch
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 13:01:39 2011 New Revision: 50650 URL: http://svn.reactos.org/svn/reactos?rev=50650&view=rev Log: Merge MSVC fixes from cmake branch Modified: trunk/reactos/base/applications/mmc/precomp.h trunk/reactos/base/applications/mscutils/eventvwr/resource.h trunk/reactos/base/applications/network/ping/ping.c trunk/reactos/base/applications/paint/registry.c trunk/reactos/base/applications/rapps/rappsmsg.mc trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/taskmgr/resource.h trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/registry.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/drivers/base/kddll/kddll.h trunk/reactos/drivers/usb/usbehci/irp.c trunk/reactos/drivers/video/miniport/vga_new/vga.c trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/float.h trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/crt/sec_api/string_s.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/dxsdk/d3dx9shape.h trunk/reactos/include/dxsdk/dmksctrl.h trunk/reactos/include/dxsdk/dxsdkver.h trunk/reactos/include/dxsdk/pixplugin.h trunk/reactos/include/ndk/umfuncs.h trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/include/reactos/mc/errcodes.mc trunk/reactos/include/reactos/mc/ntstatus.mc trunk/reactos/include/reactos/undocuser.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/ddk/imm.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/lib/3rdparty/mingw/cinitexe.c trunk/reactos/lib/3rdparty/mingw/crt_handler.c trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/3rdparty/mingw/merr.c trunk/reactos/lib/3rdparty/mingw/pesect.c trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/base/applications/mmc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/prec… ============================================================================== --- trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,4 +1,3 @@ -#pragma once #include <windows.h> #include <commctrl.h> Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -60,3 +60,4 @@ #define IDS_COLUMNUSER 306 #define IDS_COLUMNCOMPUTER 307 #define IDS_COLUMNEVENTDATA 308 + Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -738,6 +738,7 @@ FormatOutput(IDS_PACKETS_SENT_RECEIVED_LOST,\ SentCount, SentCount - LostCount, LostCount, Count); + /* Print approximate times or NO approximate times if 100% loss */ if ((SentCount - LostCount) > 0) { Modified: trunk/reactos/base/applications/paint/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/re… ============================================================================== --- trunk/reactos/base/applications/paint/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/registry.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -16,10 +16,10 @@ void SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too { - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); - HKEY hDesktop; TCHAR szStyle[3], szTile[3]; + + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); if ((dwStyle > 2) || (dwTile > 2)) return; Modified: trunk/reactos/base/applications/rapps/rappsmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rappsmsg.mc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rappsmsg.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -25,4 +25,3 @@ Removal of the program "%1" is called. . -; EOF Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -367,12 +367,14 @@ TCHAR Caption[128]; LPCTSTR pszKeyPath; HKEY hRootKey; + LONG regUnloadResult; + /* get the item key to unload */ pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); /* load and set the caption and flags for dialog */ LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption)); /* now unload the hive */ - LONG regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); + regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); if(regUnloadResult == ERROR_SUCCESS) { /* refresh tree and list views */ Modified: trunk/reactos/base/applications/taskmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -251,3 +251,4 @@ #define _APS_NEXT_SYMED_VALUE 110 #endif #endif + Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1725,8 +1725,9 @@ if (hmenu) { POINT pt; + int cmd; GetCursorPos(&pt); - int cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); + cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); if (cmd) { SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); @@ -1756,19 +1757,19 @@ TaskSwitchWnd_HandleTaskGroupRightClick(This, TaskGroup); return TRUE; - } + } } TaskItem = FindTaskItemByIndex(This, (INT)wIndex); - + if (TaskItem != NULL) { TaskSwitchWnd_HandleTaskItemRightClick(This, TaskItem); return TRUE; } - + return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -606,6 +606,8 @@ // if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) { + PCHAR File; + // // Append boot-time options // @@ -614,7 +616,6 @@ // // Check if a ramdisk file was given // - PCHAR File; File = strstr(value, "/RDIMAGEPATH="); if (File) { Modified: trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/dhcp_re… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/dhcp_reactos.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -11,9 +11,6 @@ #include "dhcpcsdk.h" #include "dhcpcapi.h" #include <assert.h> - -#define NDEBUG -#include "debug.h" DWORD APIENTRY DhcpRosGetAdapterInfo(DWORD AdapterIndex, PBOOL DhcpEnabled, Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -40,9 +40,6 @@ #include "ifenum.h" #include <assert.h> -//#define NDEBUG -#include "debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); /* Functions */ Modified: trunk/reactos/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/registr… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,6 +1,4 @@ #include "iphlpapi_private.h" - -#include "debug.h" int GetLongestChildKeyName( HANDLE RegHandle ) { LONG Status; Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -3,7 +3,7 @@ * * Copyright 1995 Martin von Loewis * Copyright 1998 David Lee Lambert - * Copyright 2000 Julio CÃ©sar GÃ¡zquez + * Copyright 2000 Julio César Gázquez * Copyright 2003 Jon Griffiths * Copyright 2005 Dmitry Timoshkov * Modified: trunk/reactos/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -12,14 +12,14 @@ #include <ntifs.h> #define NDEBUG #include <halfuncs.h> -#include <stdio.h> -#include <stdlib.h> #include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <wdbgexts.h> #include <ioaccess.h> /* port intrinsics */ + +long atol(const char *str); typedef UCHAR BYTE, *PBYTE; Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -540,6 +540,7 @@ if (!(PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus & 0x8000)) CompletePendingURBRequest(PdoDeviceExtension); + break; } case USB_REQUEST_SET_ADDRESS: Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -93,7 +93,7 @@ PVIDEO_PALETTE_DATA PaletteBuffer, ULONG PaletteBufferSize ); - + VP_STATUS VgaSetColorLookup( PHW_DEVICE_EXTENSION HwDeviceExtension, @@ -846,10 +846,10 @@ case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES: { - VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n")); - PVIDEO_PUBLIC_ACCESS_RANGES portAccess; ULONG physicalPortLength; + + VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n")); if (RequestPacket->OutputBufferLength < sizeof(VIDEO_PUBLIC_ACCESS_RANGES)) @@ -882,7 +882,7 @@ // eVb: 1.17 [END] VideoDebugPrint((2, "VgaStartIO - mapping ports to (%x)\n", portAccess->VirtualAddress)); } - + break; case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES: @@ -891,7 +891,7 @@ status = ERROR_INVALID_FUNCTION; break; - + // // if we get here, an invalid IoControlCode was specified. // @@ -1371,7 +1371,7 @@ { PVIDEOMODE CurrentMode = HwDeviceExtension->CurrentMode; USHORT i; - + // // Check if the size of the data in the input buffer is large enough. // @@ -1400,9 +1400,9 @@ // // Check SVGA mode // - + if (CurrentMode->bitsPerPlane >= 8) return VbeSetColorLookup(HwDeviceExtension, ClutBuffer); -// eVb: 1.14 [END] +// eVb: 1.14 [END] // // Path for VGA mode // @@ -1507,11 +1507,11 @@ { VP_STATUS Status = NO_ERROR; ULONG Ranges, i; - + // // Try exclusive ranges (vga + ati) // - + Ranges = NUM_VGA_ACCESS_RANGES; for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = FALSE; if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) @@ -1519,14 +1519,14 @@ // // Not worked, try vga only // - + Ranges = 3; if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) { // // Still not, try shared ranges // - + for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); if (Status == NO_ERROR) @@ -1534,7 +1534,7 @@ // // It did work // - + VideoPortVerifyAccessRanges(DeviceExtension, 0, 0); Status = NO_ERROR; } @@ -1546,7 +1546,7 @@ // // Worked with exclusive, also try shared // - + for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); } Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -197,9 +197,9 @@ /* V86 TRAP HANDLERS **********************************************************/ #ifndef _MINIHAL_ +DECLSPEC_NORETURN VOID FASTCALL -DECLSPEC_NORETURN HalpTrap0DHandler(IN PKTRAP_FRAME TrapFrame) { /* Enter the trap */ Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -187,7 +187,7 @@ #endif #endif -#ifdef _WIN64 +#if defined(_WIN64) && !defined(_MSC_VER) #undef USE_MINGW_SETJMP_TWO_ARGS #define USE_MINGW_SETJMP_TWO_ARGS #endif Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -133,7 +133,13 @@ #endif #ifndef _CRT_ALIGN +#if defined (__midl) || defined(__WIDL__) +#define _CRT_ALIGN(x) +#elif defined(_MSC_VER) +#define _CRT_ALIGN(x) __declspec(align(x)) +#else #define _CRT_ALIGN(x) __attribute__ ((aligned(x))) +#endif #endif #ifndef _CRTNOALIAS Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=50… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -104,12 +104,12 @@ /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew, * leaving other bits unchanged. */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _clearfp (void); /* Clear the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */ #define _clear87 _clearfp #define _status87 _statusfp @@ -123,11 +123,11 @@ per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when building your application. */ -void __cdecl __MINGW_NOTHROW _fpreset (void); -void __cdecl __MINGW_NOTHROW fpreset (void); +__MINGW_NOTHROW void __cdecl _fpreset (void); +__MINGW_NOTHROW void __cdecl fpreset (void); /* Global 'variable' for the current floating point error code. */ -_CRTIMP int * __cdecl __MINGW_NOTHROW __fpecode(void); +__MINGW_NOTHROW _CRTIMP int * __cdecl __fpecode(void); #define _fpecode (*(__fpecode())) /* @@ -135,15 +135,15 @@ * but they really belong in math.h. */ -_CRTIMP double __cdecl __MINGW_NOTHROW _chgsign (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _copysign (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _logb (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _nextafter (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _scalb (double, long); +__MINGW_NOTHROW _CRTIMP double __cdecl _chgsign (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _copysign (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _logb (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _nextafter (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _scalb (double, long); -_CRTIMP int __cdecl __MINGW_NOTHROW _finite (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _fpclass (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _isnan (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _finite (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _fpclass (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _isnan (double); #ifdef __cplusplus } Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -21,16 +21,10 @@ void _WriteBarrier(void); #pragma intrinsic(_WriteBarrier) -char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); -#pragma intrinsic(_InterlockedCompareExchange8) -short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); -#pragma intrinsic(_InterlockedCompareExchange16) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); #pragma intrinsic(_InterlockedCompareExchange) long _InterlockedExchange(volatile long * const Target, const long Value); #pragma intrinsic(_InterlockedExchange) -short _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); -#pragma intrinsic(_InterlockedExchangeAdd16) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); #pragma intrinsic(_InterlockedExchangeAdd) char _InterlockedAnd8(volatile char * const value, const char mask); @@ -51,8 +45,6 @@ #pragma intrinsic(_InterlockedXor16) long _InterlockedXor(volatile long * const value, const long mask); #pragma intrinsic(_InterlockedXor) -long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); -#pragma intrinsic(_InterlockedAddLargeStatistic) long _InterlockedDecrement(volatile long * const lpAddend); #pragma intrinsic(_InterlockedDecrement) long _InterlockedIncrement(volatile long * const lpAddend); @@ -66,7 +58,10 @@ unsigned char _interlockedbittestandset(volatile long * a, const long b); #pragma intrinsic(_interlockedbittestandset) -#if defined(_M_AMD64) +#if defined(_M_IX86) +long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); +#pragma intrinsic(_InterlockedAddLargeStatistic) +#elif defined(_M_AMD64) __int64 _InterlockedExchange64(volatile __int64 * const Target, const __int64 Value); #pragma intrinsic(_InterlockedExchange64) __int64 _InterlockedExchangeAdd64(volatile __int64 * const Addend, const __int64 Value); @@ -77,7 +72,7 @@ #pragma intrinsic(_InterlockedExchangePointer) __int64 _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); #pragma intrinsic(_InterlockedAnd64) -long _InterlockedOr64(volatile __int64 * const value, const __int64 mask); +__int64 _InterlockedOr64(volatile __int64 * const value, const __int64 mask); #pragma intrinsic(_InterlockedOr64) __int64 _InterlockedCompareExchange64(volatile __int64 * const Destination, const __int64 Exchange, const __int64 Comperand); #pragma intrinsic(_InterlockedCompareExchange64) @@ -139,7 +134,7 @@ #pragma intrinsic(__addgsqword) #endif -//#if defined(_M_IX86) +#if defined(_M_IX86) /*** FS segment addressing ***/ void __writefsbyte(const unsigned long Offset, const unsigned char Data); #pragma intrinsic(__writefsbyte) @@ -165,7 +160,7 @@ #pragma intrinsic(__addfsword) void __addfsdword(const unsigned long Offset, const unsigned int Data); #pragma intrinsic(__addfsdword) -//#endif +#endif /*** Bit manipulation ***/ @@ -289,7 +284,12 @@ unsigned long __readcr0(void); unsigned long __readcr2(void); unsigned long __readcr3(void); -unsigned long __readcr4(void); +//unsigned long __readcr4(void); +//#pragma intrinsic(__readcr4) +// HACK: MSVC is broken +unsigned long ___readcr4(void); +#define __readcr4 ___readcr4 + unsigned int __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned int value); #endif Modified: trunk/reactos/include/crt/sec_api/string_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/string… ============================================================================== --- trunk/reactos/include/crt/sec_api/string_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/string_s.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -21,6 +21,9 @@ _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); + #ifndef _WSTRING_S_DEFINED #define _WSTRING_S_DEFINED _CRTIMP wchar_t *__cdecl wcstok_s(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context); Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5065… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -7897,7 +7897,7 @@ { KIRQL OldIrql; - OldIrql = __readcr8(); + OldIrql = (KIRQL)__readcr8(); //ASSERT(OldIrql <= NewIrql); __writecr8(NewIrql); return OldIrql; @@ -9309,7 +9309,7 @@ ret64 = UnsignedMultiplyHigh(Pos ? Dividend.QuadPart : -Dividend.QuadPart, MagicDivisor.QuadPart); ret64 >>= ShiftCount; - ret.QuadPart = Pos ? ret64 : -ret64; + ret.QuadPart = Pos ? ret64 : -(LONG64)ret64; return ret; } #endif Modified: trunk/reactos/include/dxsdk/d3dx9shape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shape.h… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9shape.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/d3dx9shape.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -92,4 +92,4 @@ } #endif -#endif +#endif Modified: trunk/reactos/include/dxsdk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmksctrl.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dmksctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dmksctrl.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -112,4 +112,4 @@ #pragma warning(pop) #endif -#endif +#endif Modified: trunk/reactos/include/dxsdk/dxsdkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdkver.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdkver.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dxsdkver.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -7,4 +7,4 @@ #define _DXSDK_BUILD_MAJOR 91 #define _DXSDK_BUILD_MINOR 0000 -#endif +#endif Modified: trunk/reactos/include/dxsdk/pixplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/pixplugin.h?… ============================================================================== --- trunk/reactos/include/dxsdk/pixplugin.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/pixplugin.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -44,4 +44,4 @@ #ifdef __cplusplus }; -#endif +#endif Modified: trunk/reactos/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -157,6 +157,7 @@ IN HANDLE Process ); +NTSYSAPI NTSTATUS NTAPI DbgUiWaitStateChange( @@ -295,7 +296,7 @@ IN PVOID BaseAddress ); -typedef VOID NTAPI (*PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); +typedef VOID (NTAPI *PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); NTSTATUS NTAPI LdrVerifyImageMatchesChecksum( Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,12 +1,3 @@ -; -; Created by : Marc Piulachs. -; This source code is offered for use in the public domain. -; - -; -; ntoskrnl.exe bug codes -; - MessageIdTypedef=ULONG SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS @@ -23,9 +14,6 @@ LanguageNames=(English=0x409:MSG00409) -; -; message definitions -; MessageId=0x7E Severity=Informational Facility=System @@ -1528,5 +1516,3 @@ Language=English An attempt was made to execute to non-executable memory. . - -; EOF Modified: trunk/reactos/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/errcode… ============================================================================== --- trunk/reactos/include/reactos/mc/errcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/errcodes.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,7 +1,3 @@ -; -; kernel32.mc MESSAGE resources for kernel32.dll -; - MessageIdTypedef=ULONG SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS @@ -17,13 +13,6 @@ LanguageNames=(English=0x409:MSG00409) - -; -; message definitions -; - -; Facility=System - MessageId=0 Severity=Success Facility=System @@ -17172,8 +17161,6 @@ ERROR_EVT_CHANNEL_PATH_TOO_GENERAL - The specified channel path selects more than one instance of a channel. The operation requires that only one channel be selected. It may be necessary to scope channel path to version / publicKeyToken to select only one instance. . - -; Facility=WIN32 MessageId=0x000E Severity=Warning @@ -17208,8 +17195,6 @@ . -; Facility=ITF - MessageId=0x0000 Severity=Warning Facility=ITF @@ -17489,5 +17474,3 @@ Language=English CLASS_E_NOTLICENSED - Class is not licensed for use . - -; EOF Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… ============================================================================== --- trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -20,7 +20,6 @@ ) LanguageNames=(English=0x409:MSG00409) -;#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) MessageId=0x00 Severity=Success Facility=System Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -172,4 +172,4 @@ BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); BOOL WINAPI UnregisterUserApiHook(VOID); -#endif +#endif Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -777,7 +777,9 @@ /* #undef HAVE_SYS_TIMES_H */ /* Define to 1 if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 +#ifndef _MSC_VER + #define HAVE_SYS_TIME_H 1 +#endif /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 Modified: trunk/reactos/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/i… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -2,7 +2,7 @@ #ifndef _WINE_IMM_H_ #define _WINE_IMM_H_ -#include <psdk/wingdi.h> +#include <wingdi.h> #ifdef WINE_NO_UNICODE_MACROS # define WINELIB_NAME_AW(func) \ Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -2630,7 +2630,7 @@ ret64 = UnsignedMultiplyHigh(Pos ? Dividend.QuadPart : -Dividend.QuadPart, MagicDivisor.QuadPart); ret64 >>= ShiftCount; - ret.QuadPart = Pos ? ret64 : -ret64; + ret.QuadPart = Pos ? ret64 : -(LONG64)ret64; return ret; } #endif Modified: trunk/reactos/lib/3rdparty/mingw/cinitexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cinitex… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/cinitexe.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1,6 +1,10 @@ #include <stdio.h> #include <internal.h> #include <sect_attribs.h> + +#ifdef _MSC_VER +#pragma comment(linker, "/merge:.CRT=.rdata") +#endif _CRTALLOC(".CRT$XIA") _PVFV __xi_a[] = { NULL }; _CRTALLOC(".CRT$XIZ") _PVFV __xi_z[] = { NULL }; Modified: trunk/reactos/lib/3rdparty/mingw/crt_handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt_han… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -16,7 +16,9 @@ #if defined (_WIN64) && defined (__ia64__) #error FIXME: Unsupported __ImageBase implementation. #else +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif /* This symbol is defined by the linker. */ extern IMAGE_DOS_HEADER __ImageBase; #endif Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -33,7 +33,10 @@ #endif /* Hack, for bug in ld. Will be removed soon. */ +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif + /* This symbol is defined by ld. */ extern IMAGE_DOS_HEADER __ImageBase; Modified: trunk/reactos/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/merr.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/merr.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/merr.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -50,4 +50,3 @@ type, pexcept->name, pexcept->arg1, pexcept->arg2, pexcept->retval); return 0; } - Modified: trunk/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pesect.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -11,7 +11,9 @@ #error FIXME: Unsupported __ImageBase implementation. #else /* Hack, for bug in ld. Will be removed soon. */ +#ifndef _MSC_VER #define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif /* This symbol is defined by the linker. */ extern IMAGE_DOS_HEADER __ImageBase; #endif Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -46,7 +46,10 @@ extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; -extern char __MINGW_LSYMBOL(_image_base__); +#ifndef _MSC_VER +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif +extern char __ImageBase; void _pei386_runtime_relocator (void); @@ -363,5 +366,5 @@ ++was_init; do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, &__RUNTIME_PSEUDO_RELOC_LIST_END__, - &__MINGW_LSYMBOL(_image_base__)); + &__ImageBase); } Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -1143,7 +1143,7 @@ /* Unlock the pushlock */ OldValue.Value = InterlockedExchangeAddSizeT((PSIZE_T)PushLock, - -(SIZE_T)EX_PUSH_LOCK_LOCK); + -(SSIZE_T)EX_PUSH_LOCK_LOCK); /* Sanity checks */ ASSERT(OldValue.Locked); Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -358,14 +358,14 @@ { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } } else { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } } Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -21,6 +21,7 @@ #endif #elif _MSC_VER #define UNREACHABLE __assume(0) +#define __builtin_expect(a,b) (a) #else #define UNREACHABLE #endif Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -549,7 +549,7 @@ if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; /* FIXME: Implement Lookaside Floats */ - + /* Figure out which Lookaside List to use */ if ((StackSize <= 8) && (ChargeQuota == FALSE)) { @@ -1832,7 +1832,7 @@ IoIs32bitProcess( IN PIRP Irp OPTIONAL) { -#pragma message IoIs32bitProcess is hardcoded to FALSE +#pragma message "IoIs32bitProcess is hardcoded to FALSE" return FALSE; } #endif Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -30,11 +30,6 @@ PDRIVER_OBJECT IopRootDriverObject; PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList = NULL; - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, PnpInit) -#pragma alloc_text(INIT, PnpInit2) -#endif typedef struct _INVALIDATE_DEVICE_RELATION_DATA { Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -97,11 +97,13 @@ IN PMMADDRESS_NODE Parent, IN TABLE_SEARCH_RESULT Result) { + PMMVAD Vad; + /* Insert it into the tree */ RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); /* Now insert an ARM3 MEMORY_AREA for this node, unless the insert was already from the MEMORY_AREA code */ - PMMVAD Vad = (PMMVAD)NewNode; + Vad = (PMMVAD)NewNode; if (Vad->u.VadFlags.Spare == 0) { NTSTATUS Status; @@ -165,6 +167,8 @@ MiRemoveNode(IN PMMADDRESS_NODE Node, IN PMM_AVL_TABLE Table) { + PMMVAD Vad; + /* Call the AVL code */ RtlpDeleteAvlTreeNode(Table, Node); @@ -180,7 +184,7 @@ } /* Free the node from ReactOS view as well */ - PMMVAD Vad = (PMMVAD)Node; + Vad = (PMMVAD)Node; if (Vad->u.VadFlags.Spare == 0) { PMEMORY_AREA MemoryArea; Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=50… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -374,8 +374,9 @@ /* Build a lame VAD if this is a user-space allocation */ if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) { + PMMVAD Vad; + ASSERT(marea->Type == MEMORY_AREA_VIRTUAL_MEMORY || marea->Type == MEMORY_AREA_SECTION_VIEW); - PMMVAD Vad; Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); ASSERT(Vad); RtlZeroMemory(Vad, sizeof(MMVAD)); Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Thu Feb 10 13:01:39 2011 @@ -29,7 +29,7 @@ #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" -#define strcasecmp _strcmpi +#define strcasecmp _stricmp #define strdup _strdup #define AllocateMemory(size) HeapAlloc(GetProcessHeap(), 0, size) @@ -80,7 +80,7 @@ #else /* DBG */ #undef DPRINT -#define DPRINT(_t_, _x_) +#define DPRINT(_t_, _x_) do { } while(0) #undef ASSERT #define ASSERT(_x_)

1 0

[tkreuzer] 50649: [USB] Fix merge artifact
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 12:56:12 2011 New Revision: 50649 URL: http://svn.reactos.org/svn/reactos?rev=50649&view=rev Log: [USB] Fix merge artifact Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbehci/usbehci.h [iso-8859-1] Thu Feb 10 12:56:12 2011 @@ -17,7 +17,6 @@ #define DEVICEBUSY 0x04 #define DEVICESTOPPED 0x08 #define DEVICESTALLED 0x10 -#define DEVICEREMOVED 0x20 #define DEVICEREMOVED 0x20

1 0

[tkreuzer] 50648: [RTL] Merge changes to rtl from cmake branch. Mostly use portable interlocked functions
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 11:47:17 2011 New Revision: 50648 URL: http://svn.reactos.org/svn/reactos?rev=50648&view=rev Log: [RTL] Merge changes to rtl from cmake branch. Mostly use portable interlocked functions Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/critical.c trunk/reactos/lib/rtl/largeint.c trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/rtl/srw.c trunk/reactos/lib/rtl/timerqueue.c trunk/reactos/lib/rtl/vectoreh.c trunk/reactos/lib/rtl/wait.c trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=50648… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -575,12 +575,12 @@ static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) { - _InterlockedExchangeAdd( &actctx->ref_count, 1 ); + InterlockedExchangeAdd( &actctx->ref_count, 1 ); } static void actctx_release( ACTIVATION_CONTEXT *actctx ) { - if (_InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) + if (InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) { unsigned int i, j; Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -59,15 +59,15 @@ /* We failed, this is bad... */ DPRINT1("Failed to Create Event!\n"); - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); RtlRaiseStatus(Status); return; } DPRINT("Created Event: %p \n", hNewEvent); - if (_InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, - (PVOID)hNewEvent, - 0)) { + if (InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, + (PVOID)hNewEvent, + 0)) { /* Some just created an event */ DPRINT("Closing already created event: %p\n", hNewEvent); @@ -437,7 +437,7 @@ HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* Try to Lock it */ - if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { + if (InterlockedIncrement(&CriticalSection->LockCount) != 0) { /* * We've failed to lock it! Does this thread @@ -621,7 +621,7 @@ if (--CriticalSection->RecursionCount) { /* Someone still owns us, but we are free. This needs to be done atomically. */ - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); } else { @@ -630,7 +630,7 @@ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - if (-1 != _InterlockedDecrement(&CriticalSection->LockCount)) { + if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { /* Let him have us */ RtlpUnWaitCriticalSection(CriticalSection); @@ -662,7 +662,7 @@ RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ - if (_InterlockedCompareExchange(&CriticalSection->LockCount, + if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { @@ -674,7 +674,7 @@ } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { /* It's already ours */ - _InterlockedIncrement(&CriticalSection->LockCount); + InterlockedIncrement(&CriticalSection->LockCount); CriticalSection->RecursionCount++; return TRUE; } Modified: trunk/reactos/lib/rtl/largeint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/largeint.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/largeint.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/largeint.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -14,6 +14,40 @@ /* FUNCTIONS *****************************************************************/ +#undef RtlUlonglongByteSwap +#undef RtlUlongByteSwap +#undef RtlUshortByteSwap + +/* + * @implemented + */ +USHORT +FASTCALL +RtlUshortByteSwap(IN USHORT Source) +{ + return _byteswap_ushort(Source); +} + +/* + * @implemented + */ +ULONG +FASTCALL +RtlUlongByteSwap(IN ULONG Source) +{ + return _byteswap_ulong(Source); +} + +/* + * @implemented + */ +ULONGLONG +FASTCALL +RtlUlonglongByteSwap(IN ULONGLONG Source) +{ + return _byteswap_uint64(Source); +} + /* * @implemented */ Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=50648&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -32,6 +32,17 @@ #include <intrin.h> +/* Use intrinsics for x86 and x64 */ +#if defined(_M_IX86) || defined(_M_AMD64) +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchange _InterlockedExchange +#define InterlockedBitTestAndSet _interlockedbittestandset +#define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#endif + #endif /* RTL_H */ /* EOF */ Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=50648&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -131,7 +131,7 @@ } } - (void)_InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); + (void)InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); if (FirstWaitBlock->Exclusive) { @@ -186,7 +186,7 @@ NewValue = RTL_SRWLOCK_OWNED; } - (void)_InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); + (void)InterlockedExchangePointer(&SRWLock->Ptr, (PVOID)NewValue); (void)InterlockedOr(&FirstWaitBlock->Wake, TRUE); @@ -420,9 +420,9 @@ NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully incremented the shared count, we acquired the lock */ break; @@ -499,9 +499,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockSharedWait(SRWLock, &StackWaitBlock, @@ -521,9 +521,9 @@ RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully set the shared count, we acquired the lock */ break; @@ -580,9 +580,9 @@ NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; } - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* Successfully released the lock */ break; @@ -639,9 +639,9 @@ NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -697,9 +697,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -767,9 +767,9 @@ ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); NewValue = 0; - if ((LONG_PTR)_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == CurrentValue) + if ((LONG_PTR)InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == CurrentValue) { /* We released the lock */ break; Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=5… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -372,7 +372,7 @@ NTSTATUS status = RtlCreateTimerQueue(&q); if (status == STATUS_SUCCESS) { - PVOID p = _InterlockedCompareExchangePointer( + PVOID p = InterlockedCompareExchangePointer( (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -61,7 +61,7 @@ if (--veh->Refs == 0) { RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); Remove = TRUE; } Ret = TRUE; @@ -74,7 +74,7 @@ { CurrentEntry = veh->ListEntry.Flink; RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); RtlFreeHeap(RtlGetProcessHeap(), @@ -136,7 +136,7 @@ InsertTailList(&RtlpVectoredExceptionHead, &veh->ListEntry); } - _InterlockedIncrement (&RtlpVectoredExceptionsInstalled); + InterlockedIncrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } @@ -190,4 +190,23 @@ return Ret; } +PVOID +NTAPI +RtlAddVectoredContinueHandler( + IN ULONG FirstHandler, + IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + IN PVOID VectoredHandlerHandle) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ Modified: trunk/reactos/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/wait.c?rev=50648&r… ============================================================================== --- trunk/reactos/lib/rtl/wait.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/wait.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -91,7 +91,7 @@ completion_event = Wait->CompletionEvent; if (completion_event) NtSetEvent( completion_event, NULL ); - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { NtClose( Wait->CancelEvent ); RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); @@ -220,7 +220,7 @@ if (Status != STATUS_SUCCESS) return Status; - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); @@ -229,7 +229,7 @@ } else { - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) Status = STATUS_PENDING; @@ -239,7 +239,7 @@ Status = STATUS_PENDING; } - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { Status = STATUS_SUCCESS; NtClose( Wait->CancelEvent ); Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Thu Feb 10 11:47:17 2011 @@ -55,7 +55,7 @@ do { - InitStatus = _InterlockedCompareExchange(&ThreadPoolInitialized, + InitStatus = InterlockedCompareExchange(&ThreadPoolInitialized, 2, 0); if (InitStatus == 0) @@ -91,7 +91,7 @@ Finish: /* Initialization done */ - _InterlockedExchange(&ThreadPoolInitialized, + InterlockedExchange(&ThreadPoolInitialized, 1); break; } @@ -223,11 +223,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -237,11 +237,11 @@ { NTSTATUS Status = STATUS_SUCCESS; - _InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); } if (WorkItem->Flags & WT_EXECUTEINPERSISTENTTHREAD) @@ -270,11 +270,11 @@ if (!NT_SUCCESS(Status)) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -351,11 +351,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -461,14 +461,14 @@ ASSERT(IoThread != NULL); - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { /* We're about to queue a long function, mark the thread */ IoThread->Flags |= WT_EXECUTELONGFUNCTION; - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); } /* It's time to queue the work item */ @@ -480,11 +480,11 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to queue APC for work item 0x%p\n", WorkItem->Function); - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -543,7 +543,7 @@ BOOLEAN Terminate; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) { /* Oops, too many worker threads... */ goto InitFailed; @@ -562,10 +562,10 @@ DPRINT1("Failed to create handle to own thread! Status: 0x%x\n", Status); InitFailed: - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); RtlExitUserThread(Status); @@ -579,7 +579,7 @@ (PLIST_ENTRY)&ThreadInfo.ListEntry); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -626,7 +626,7 @@ if (Terminate) { /* Rundown the thread and unlink it from the list */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); RemoveEntryList((PLIST_ENTRY)&ThreadInfo.ListEntry); } @@ -663,10 +663,10 @@ PKNORMAL_ROUTINE ApcRoutine; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) { /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); /* Oops, too many worker threads... */ @@ -675,7 +675,7 @@ } /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -736,7 +736,7 @@ if (Terminate) { - _InterlockedDecrement(&ThreadPoolWorkerThreads); + InterlockedDecrement(&ThreadPoolWorkerThreads); Status = STATUS_SUCCESS; break; }

1 0

[tkreuzer] 50647: Merge CRT changes from cmake branch (mainly MSVC compilation fixes)
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 11:35:05 2011 New Revision: 50647 URL: http://svn.reactos.org/svn/reactos?rev=50647&view=rev Log: Merge CRT changes from cmake branch (mainly MSVC compilation fixes) Modified: trunk/reactos/lib/sdk/crt/except/cpp.c trunk/reactos/lib/sdk/crt/except/cppexcept.c trunk/reactos/lib/sdk/crt/except/except.c trunk/reactos/lib/sdk/crt/include/internal/file.h trunk/reactos/lib/sdk/crt/include/internal/time.h trunk/reactos/lib/sdk/crt/math/abs.c trunk/reactos/lib/sdk/crt/math/acos.c trunk/reactos/lib/sdk/crt/math/asin.c trunk/reactos/lib/sdk/crt/math/cosf.c trunk/reactos/lib/sdk/crt/math/cosh.c trunk/reactos/lib/sdk/crt/math/labs.c trunk/reactos/lib/sdk/crt/math/logf.c trunk/reactos/lib/sdk/crt/math/modf.c trunk/reactos/lib/sdk/crt/math/powf.c trunk/reactos/lib/sdk/crt/math/sinf.c trunk/reactos/lib/sdk/crt/math/sinh.c trunk/reactos/lib/sdk/crt/math/tanh.c trunk/reactos/lib/sdk/crt/mem/memcmp.c trunk/reactos/lib/sdk/crt/misc/assert.c trunk/reactos/lib/sdk/crt/stdlib/rot.c trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/lib/sdk/crt/string/strset.c trunk/reactos/lib/sdk/crt/string/wcs.c trunk/reactos/lib/sdk/crt/time/ctime.c trunk/reactos/lib/sdk/crt/time/futime.c trunk/reactos/lib/sdk/crt/time/utime.c Modified: trunk/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -63,6 +63,10 @@ #define THISCALL(func) __thiscall_ ## func #define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) + +#ifdef _MSC_VER +#include <internal/wine_msc.h> +#else #define DEFINE_THISCALL_WRAPPER(func,args) \ extern void THISCALL(func)(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -70,6 +74,8 @@ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ + #else /* __i386__ */ #define THISCALL(func) func @@ -658,6 +664,7 @@ /* vtables */ +#ifdef __GNUC__ #ifdef _WIN64 #define __ASM_VTABLE(name,funcs) \ @@ -700,6 +707,16 @@ #ifndef __GNUC__ } +#endif +#endif + +#ifdef _MSC_VER +#pragma message ("HAXX!") +const vtable_ptr MSVCRT_exception_vtable; +const vtable_ptr MSVCRT_bad_typeid_vtable; +const vtable_ptr MSVCRT_bad_cast_vtable; +const vtable_ptr MSVCRT___non_rtti_object_vtable; +const vtable_ptr MSVCRT_type_info_vtable; #endif /* Static RTTI for exported objects */ Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -45,6 +45,9 @@ { void *ret; int dummy; +#ifdef _MSC_VER +#pragma message ("call_ebp_func is unimplemented for MSC") +#else __asm__ __volatile__ ("pushl %%ebx\n\t" "pushl %%ebp\n\t" "movl %4,%%ebp\n\t" @@ -53,6 +56,7 @@ "popl %%ebx" : "=a" (ret), "=S" (dummy), "=D" (dummy) : "0" (func), "1" (ebp) : "ecx", "edx", "memory" ); +#endif return ret; } @@ -60,6 +64,9 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); +#ifdef _MSC_VER +#pragma message ("call_copy_ctor is unimplemented for MSC") +#else if (has_vbase) /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ __asm__ __volatile__("pushl $1; pushl %2; call *%0" @@ -67,19 +74,28 @@ else __asm__ __volatile__("pushl %2; call *%0" : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); +#endif } /* call the destructor of the exception object */ static inline void call_dtor( void *func, void *object ) { +#ifdef _MSC_VER +#pragma message ("call_dtor is unimplemented for MSC") +#else __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); +#endif } /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) { +#ifdef _MSC_VER +#pragma message ("continue_after_catch is unimplemented for MSC") +#else __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" : : "r" (frame), "a" (addr) ); +#endif for (;;) ; /* unreached */ } @@ -415,6 +431,14 @@ */ extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); +#ifdef _MSC_VER +#pragma message ("__CxxFrameHandler is unimplemented for MSC") +DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ) +{ + return 0; +} +#else __ASM_GLOBAL_FUNC( __CxxFrameHandler, "pushl $0\n\t" /* nested_trylevel */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -434,7 +458,7 @@ "add $28,%esp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") "ret" ) - +#endif /********************************************************************* * __CxxLongjmpUnwind (MSVCRT.@) Modified: trunk/reactos/lib/sdk/crt/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/except.… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/except.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -96,6 +96,57 @@ : "ecx", "edx", "memory" ); return ret; } +#elif defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4731) // Don't complain about changing ebp +void __inline call_finally_block( void *code_block, void *base_ptr ) +{ + __asm + { + mov eax, code_block + mov ebp, base_ptr + call [eax] + } +} + +int __inline call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *_ebp ) +{ + int _ret; + __asm + { + push ebp + mov eax, arg + push eax + mov ebp, _ebp + mov eax, func + call [eax] + mov _ret, eax + pop ebp + pop ebp + } + return _ret; +} +int __inline call_unwind_func( int (*func)(void), void *_ebp ) +{ + int _ret; + + __asm + { + push ebp + push ebx + push esi + push edi + mov ebp, _ebp + call dword ptr [func] + mov _ret, eax + pop edi + pop esi + pop ebx + pop ebp + } + return _ret; +} +#pragma warning(pop) #endif static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, Modified: trunk/reactos/lib/sdk/crt/include/internal/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -127,8 +127,6 @@ int _isnanl(long double x); int _isinfl(long double x); -int _isnan(double x); -int _isinf(double x); /* Flags for the iobuf structure (for reference) */ #if 0 Modified: trunk/reactos/lib/sdk/crt/include/internal/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -20,9 +20,9 @@ ULargeInt.HighPart = FileTime->dwHighDateTime; ULargeInt.QuadPart -= DIFFTIME; - time = ULargeInt.QuadPart / 10000000; + time = (time_t)(ULargeInt.QuadPart / 10000000); if (millitm) - *millitm = (ULargeInt.QuadPart % 10000000) / 10000; + *millitm = (USHORT)((ULargeInt.QuadPart % 10000000) / 10000); return time; } Modified: trunk/reactos/lib/sdk/crt/math/abs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/abs.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/abs.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,4 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(abs) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/acos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/acos.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/acos.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/acos.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -21,6 +21,9 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(acos) +#endif double acos(double __x) { Modified: trunk/reactos/lib/sdk/crt/math/asin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/asin.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/asin.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/asin.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -21,6 +21,9 @@ #include <math.h> +#ifdef _MSC_VER +#pragma function(asin) +#endif double asin(double __x) { Modified: trunk/reactos/lib/sdk/crt/math/cosf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/cosf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/cosf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/cosf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define cosf _dummy_cosf #include <math.h> +#undef cosf float cosf(float _X) { Modified: trunk/reactos/lib/sdk/crt/math/cosh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/cosh.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/cosh.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/cosh.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,6 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> +#ifdef _MSC_VER +#pragma function(cosh) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/labs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/labs.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/labs.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,4 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(labs) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/logf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/logf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/logf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/logf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define logf _dummy_logf #include <math.h> +#undef logf float logf(float _X) { Modified: trunk/reactos/lib/sdk/crt/math/modf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/modf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/modf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/modf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -9,8 +9,9 @@ * is preserved. * ==================================================== */ - +#define modfl _dummy_modfl #include <precomp.h> +#undef modfl //static const double one = 1.0; Modified: trunk/reactos/lib/sdk/crt/math/powf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/powf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/powf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/powf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,8 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include <math.h> + +double __cdecl pow(double x, double y); float powf(float x, float y) { Modified: trunk/reactos/lib/sdk/crt/math/sinf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sinf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sinf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sinf.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,7 +3,9 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define sinf _dummy_sinf #include <math.h> +#undef sinf float sinf(float _X) { Modified: trunk/reactos/lib/sdk/crt/math/sinh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sinh.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sinh.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sinh.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,5 +1,9 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> + +#ifdef _MSC_VER +#pragma function(sinh) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/tanh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/tanh.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/tanh.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/tanh.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -1,6 +1,10 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <math.h> + +#ifdef _MSC_VER +#pragma function(tanh) +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/mem/memcmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcmp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcmp.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -3,6 +3,11 @@ */ #include <string.h> + +#ifdef _MSC_VER +#pragma warning(disable: 4164) +#pragma function(memcmp) +#endif int memcmp(const void *s1, const void *s2, size_t n) { Modified: trunk/reactos/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/assert.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -32,7 +32,7 @@ /* Get MessageBoxA function pointer */ hmodUser32 = LoadLibrary("user32.dll"); - pMessageBoxA = GetProcAddress(hmodUser32, "MessageBoxA"); + pMessageBoxA = (PVOID)GetProcAddress(hmodUser32, "MessageBoxA"); if (!pMessageBoxA) { abort(); Modified: trunk/reactos/lib/sdk/crt/stdlib/rot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/rot.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/rot.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/rot.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -9,6 +9,10 @@ */ #include <stdlib.h> + +#ifdef _MSC_VER +#pragma function(_rotr, _rotl, _rotr, _lrotl, _lrotr) +#endif unsigned int _rotr( unsigned int value, int shift ); /* Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -460,7 +460,7 @@ if ((*(format - 1)) < *(format + 1)) RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); else - RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); + RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); format++; } else RtlSetBits(&bitMask, *format, 1); Modified: trunk/reactos/lib/sdk/crt/string/strset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strset.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strset.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -10,6 +10,9 @@ #if defined(__GNUC__) && !defined(__clang__) #define __int64 long long +#elif defined(_MSC_VER) +#pragma warning(disable: 4164) +#pragma function(_strset) #endif #ifdef _WIN64 @@ -49,3 +52,4 @@ } return t; } + Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -47,6 +47,10 @@ #undef vprintf #undef vwprintf +#ifdef _MSC_VER +#pragma function(_wcsset) +#endif + #ifndef _LIBCNT_ /********************************************************************* * _wcsdup (MSVCRT.@) Modified: trunk/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -7,6 +7,7 @@ */ #define MINGW_HAS_SECURE_API 1 +#define RC_INVOKED 1 // to prevent inline functions #include <tchar.h> #include <time.h> #include "bitsfixup.h" Modified: trunk/reactos/lib/sdk/crt/time/futime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/futime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -6,6 +6,7 @@ * PROGRAMERS: Timo Kreuzer */ #include <precomp.h> +#define RC_INVOKED 1 // to prevent inline functions #include <time.h> #include <sys/utime.h> #include "bitsfixup.h" Modified: trunk/reactos/lib/sdk/crt/time/utime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/utime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/utime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/utime.c [iso-8859-1] Thu Feb 10 11:35:05 2011 @@ -7,6 +7,7 @@ */ #include <precomp.h> #include <tchar.h> +#define RC_INVOKED 1 // to prevent inline functions #include <sys/utime.h> #include "bitsfixup.h"

1 0

[fireball] 50646: - Edijs: Properly load window size and position. See issue #5872 for more details.
by fireball＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: fireball Date: Thu Feb 10 11:18:00 2011 New Revision: 50646 URL: http://svn.reactos.org/svn/reactos?rev=50646&view=rev Log: - Edijs: Properly load window size and position. See issue #5872 for more details. Modified: trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Thu Feb 10 11:18:00 2011 @@ -134,10 +134,10 @@ QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines); QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar); - QueryByte(hKey, _T("iWindowPosX"), (LPBYTE)&Globals.main_rect.left); - QueryByte(hKey, _T("iWindowPosX"), (LPBYTE)&Globals.main_rect.top); - QueryByte(hKey, _T("iWindowPosDX"), (LPBYTE)&dx); - QueryByte(hKey, _T("iWindowPosDY"), (LPBYTE)&dy); + QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left); + QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top); + QueryDword(hKey, _T("iWindowPosDX"), (DWORD*)&dx); + QueryDword(hKey, _T("iWindowPosDY"), (DWORD*)&dy); Globals.main_rect.right = Globals.main_rect.left + dx; Globals.main_rect.bottom = Globals.main_rect.top + dy;

1 0

[tkreuzer] 50645: Fix build of shlwapi
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 11:03:43 2011 New Revision: 50645 URL: http://svn.reactos.org/svn/reactos?rev=50645&view=rev Log: Fix build of shlwapi Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Thu Feb 10 11:03:43 2011 @@ -32,17 +32,17 @@ { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Ne jelení&tse meg ezt az üzenetet mégegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Ne jelenÃ&tse meg ezt az Ã¼zenetet mÃ©gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&MÃ©gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE { - IDS_BYTES_FORMAT "%ld bájt" - IDS_TIME_INTERVAL_HOURS " óra" + IDS_BYTES_FORMAT "%ld bÃ¡jt" + IDS_TIME_INTERVAL_HOURS " Ã³ra" IDS_TIME_INTERVAL_MINUTES " perc" IDS_TIME_INTERVAL_SECONDS " mp" } Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Thu Feb 10 11:03:43 2011 @@ -2,8 +2,8 @@ * Portuguese resources for shlwapi * * Copyright 2004 Marcelo Duarte - * Copyright 2006 Américo José Melo - * Copyright 2010 Gustavo Henrique Milaré + * Copyright 2006 AmÃ©rico JosÃ© Melo + * Copyright 2010 Gustavo Henrique MilarÃ© * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,11 +33,11 @@ { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "NÃ£o &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&NÃ£o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE

1 0

[tkreuzer] 50644: fix taskmgr build
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 10:51:26 2011 New Revision: 50644 URL: http://svn.reactos.org/svn/reactos?rev=50644&view=rev Log: fix taskmgr build Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Thu Feb 10 10:51:26 2011 @@ -14,85 +14,85 @@ IDR_TASKMANAGER MENU DISCARDABLE BEGIN - POPUP "ÆtÆ@ÆCÆâ¹(&F)" - BEGIN - MENUITEM "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÅ½ÃÂs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃÂIâÂ¹(&X)", ID_FILE_EXIT - END - POPUP "ÆIÆvÆVÆâ¡Æâ(&O)" - BEGIN - MENUITEM "ÂÃâÃÅ½Ã¨âOâÃâ¢\\Å½Â¦(&A)", ID_OPTIONS_ALWAYSONTOP + POPUP "t@C(&F)" + BEGIN + MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "^XN }l[WÌI¹(&X)", ID_FILE_EXIT + END + POPUP "IvV(&O)" + BEGIN + MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP , CHECKED - MENUITEM "âÂ¢Å½gâpÅ½Å¾âÃÂÃÂÂ¬â°Â»(&M)", ID_OPTIONS_MINIMIZEONUSE + MENUITEM "¢gpÉÅ¬»(&M)", ID_OPTIONS_MINIMIZEONUSE , CHECKED - MENUITEM "ÂÃÂÂ¬â°Â»Å½Å¾âÃâ°BâÂ·(&H)", ID_OPTIONS_HIDEWHENMINIMIZED + MENUITEM "Å¬»ÉB·(&H)", ID_OPTIONS_HIDEWHENMINIMIZED , CHECKED - MENUITEM "16 ÆrÆbÆg Æ^ÆXÆNâÃâ¢\\Å½Â¦(&S)", ID_OPTIONS_SHOW16BITTASKS + MENUITEM "16 rbg ^XNÌ\\¦(&S)", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "â¢\\Å½Â¦(&V)" - BEGIN - MENUITEM "ÂÃÂVâÃÂÃ³âÃâÃÂXÂV(&R)", ID_VIEW_REFRESH - POPUP "ÂXÂVâÃâ¢pâx(&U)" + POPUP "\\¦(&V)" + BEGIN + MENUITEM "ÅVÌóÔÉXV(&R)", ID_VIEW_REFRESH + POPUP "XVÌpx(&U)" BEGIN - MENUITEM "Ââ(&H)", ID_VIEW_UPDATESPEED_HIGH - MENUITEM "âÃÂÃ(&N)", ID_VIEW_UPDATESPEED_NORMAL + MENUITEM "(&H)", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "Êí(&N)", ID_VIEW_UPDATESPEED_NORMAL , CHECKED - MENUITEM "âÃ¡(&L)", ID_VIEW_UPDATESPEED_LOW - MENUITEM "ËÃªÅ½Å¾âÃ¢Å½~(&P)", ID_VIEW_UPDATESPEED_PAUSED + MENUITEM "á(&L)", ID_VIEW_UPDATESPEED_LOW + MENUITEM "êâ~(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)", ID_VIEW_LARGE - MENUITEM "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)", ID_VIEW_SMALL - MENUITEM "ÂÃÂÃ(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "âÃ±âÃâIâÃ°(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU âÃâÅ¡âÃ°(&C)" + MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE + MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL + MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "ñÌIð(&S)...", ID_VIEW_SELECTCOLUMNS + POPUP "CPU Ìð(&C)" BEGIN - MENUITEM "âÂ·âÃâÃâÃ CPU âÃ 1 ÆOÆâ°Æt(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL - - MENUITEM "CPU âÂ²âÃâÃ 1 ÆOÆâ°Æt(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + MENUITEM "·×ÄÌ CPU Å 1 Ot(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "CPU ²ÆÉ 1 Ot(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)", ID_VIEW_SHOWKERNELTIMES - END - POPUP "ÆEÆBÆâÆhÆE(&W)" - BEGIN - MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT - END - POPUP "ÆwÆâ¹Æv(&H)" - BEGIN - MENUITEM "ÆgÆsÆbÆNâÃÅÅ¸ÂÃµ(&H)", ID_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "ÆoÂ[ÆWÆâ¡ÆâÂÃ®â¢Ã±(&A)", ID_HELP_ABOUT + MENUITEM "J[lÔð\\¦·é(&S)", ID_VIEW_SHOWKERNELTIMES + END + POPUP "EBhE(&W)" + BEGIN + MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE + MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT + END + POPUP "wv(&H)" + BEGIN + MENUITEM "gsbNÌõ(&H)", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "o[Wîñ(&A)", ID_HELP_ABOUT END END IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE + MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÅ½ÃÂs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)", ID_VIEW_LARGE - MENUITEM "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)", ID_VIEW_SMALL - MENUITEM "ÂÃÂÃ(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE + MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL + MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED END END @@ -100,17 +100,17 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÂÃâÃ¨âÃâÂ¦(&S)", ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT - MENUITEM SEPARATOR - MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE - MENUITEM SEPARATOR - MENUITEM "Æ^ÆXÆNâÃÂIâÂ¹(&E)", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "ÆvÆÂÆZÆXâÃâ¢\\Å½Â¦(&G)", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "ØèÖ¦(&S)", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "^XNÌI¹(&E)", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "vZXÌ\\¦(&G)", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -119,10 +119,10 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÅÂ³âÃÆTÆCÆYâÃâÃâÂ·(&R)", ID_RESTORE - MENUITEM "â¢ÃâÂ¶âÃ©(&C)", ID_FILE_EXIT - MENUITEM SEPARATOR - MENUITEM "ÂÃâÃÅ½Ã¨âOâÃâ¢\\Å½Â¦(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "³ÌTCYÉß·(&R)", ID_RESTORE + MENUITEM "Â¶é(&C)", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -130,28 +130,28 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÆvÆÂÆZÆXâÃÂIâÂ¹(&E)", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "ÆvÆÂÆZÆX ÆcÆÅ Â[âÃÂIâÂ¹(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE - - MENUITEM "ÆfÆoÆbÆO(&D)", ID_PROCESS_PAGE_DEBUG - MENUITEM SEPARATOR - POPUP "âDÂÃ¦âxâÃÂÃâÃ¨(&P)" + MENUITEM "vZXÌI¹(&E)", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "vZX c[ÌI¹(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "fobO(&D)", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "DæxÌÝè(&P)" BEGIN - MENUITEM "ÆÅ ÆAÆâ¹Æ^ÆCÆâ¬(&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME - - MENUITEM "Ââ(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH - - MENUITEM "âÃÂÃËÃÂÃ£(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - - MENUITEM "âÃÂÃ(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL - - MENUITEM "âÃÂÃËÃâ°Âº(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - - MENUITEM "âÃ¡(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW + MENUITEM "A^C(&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "ÊíÈã(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "Êí(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "ÊíÈº(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "á(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "Å ÃÅWâÃÂÃâÃ¨(&A)...", ID_PROCESS_PAGE_SETAFFINITY - MENUITEM "ÆfÆoÆbÆO Æ`ÆÆÆâÆlÆâ¹âÃâ¢ÃÂX(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS + MENUITEM "ÖWÌÝè(&A)...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "fobO `lÌÏX(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -166,7 +166,7 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Task Manager" +CAPTION "^XN }l[W" MENU IDR_TASKMANAGER FONT 9, "MS UI Gothic" BEGIN @@ -179,9 +179,9 @@ BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "ÂVâÂµâÂ¢Æ^ÆXÆN(&N)...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "ÂÃâÃ¨âÃâÂ¦(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "Æ^ÆXÆNâÃÂIâÂ¹(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "Vµ¢^XN(&N)...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "ØèÖ¦(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "^XNÌI¹(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 @@ -191,8 +191,8 @@ CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "ÆvÆÂÆZÆXâÃÂIâÂ¹(&E)",IDC_ENDPROCESS,171,189,69,14 - CONTROL "âSÆâ Â[ÆUÂ[âÃÆvÆÂÆZÆXâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)",IDC_SHOWALLPROCESSES, + PUSHBUTTON "vZXÌI¹(&E)",IDC_ENDPROCESS,171,189,69,14 + CONTROL "S[U[ÌvZXð\\¦·é(&S)",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -201,77 +201,77 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "CPU Å½gâpâÂ¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT - GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT - GROUPBOX "Ââ¡Åv",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "ÆRÆ~ÆbÆg Æ`ÆÆÂ[ÆW (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "â¢Â¨âÂÆÂÆâÆÅ (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "ÆJÂ[ÆlÆâ¹ ÆÂÆâÆÅ (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "ÆnÆâÆhÆâ¹",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "ÆXÆÅÆbÆh",IDS_TOTALS_THREAD_COUNT,12,140,27,8 - LTEXT "ÆvÆÂÆZÆX",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + GROUPBOX "CPU gp¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT + GROUPBOX "gpÊ",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT + GROUPBOX "v",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "R~bg `[W (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "¨ (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "J[l (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "nh",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Xbh",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "vZX",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ââ¡Åv",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "ÂÂ§ÅÃâl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER - LTEXT "ÂÃâÃ¥âl",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + LTEXT "v",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "§Àl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER + LTEXT "Åål",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ââ¡Åv",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "Available",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "ÆVÆXÆeÆâ¬ ÆLÆÆÆbÆVÆâ¦",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "v",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "pÂ\\",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "VXe LbV",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ââ¡Åv",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "ÆyÂ[ÆW",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "âÃ±ÆyÂ[ÆW",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "v",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "y[W",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "ñy[W",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - GROUPBOX "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT - GROUPBOX "ÆÂÆâÆÅ Å½gâpâÃâÃâÅ¡âÃ°",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU Å½gâpâÂ¦âÃâ¢\\Å½Â¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "ÆÂÆâÆÅ Å½gâpâÃâÃâ¢\\Å½Â¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + GROUPBOX "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "gpÊÌð",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "CPU gp¦Ì\\¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "gpÊÌ\\¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "ÆÂÆâÆÅ Å½gâpâÃâÃâÅ¡âÃ°",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "gpÊÌð",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÆfÆoÆbÆO Æ`ÆÆÆâÆlÆâ¹" +CAPTION "fobO `l" FONT 9, "MS UI Gothic" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING,7,7,233,177 - PUSHBUTTON "â¢ÃâÂ¶âÃ©",IDOK,171,189,69,14 + PUSHBUTTON "Â¶é",IDOK,171,189,69,14 END IDD_AFFINITY_DIALOG DIALOGEX DISCARDABLE 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÆvÆÂÆZÆbÆTâÃÅ ÃÅW" +CAPTION "vZbTÌÖW" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 - PUSHBUTTON "ÆLÆÆÆâÆZÆâ¹",IDCANCEL,174,133,50,14 - LTEXT "ÆvÆÂÆZÆbÆTâÃÅ ÃÅWâÃÂÃâÃ¨âÃÂAâÃâÃ CPU âÃÆvÆÂÆZÆXâÃ°Å½ÃÂsâÂ·âÃ©âÂ©âÃ°ÂÂ§ÅÃ¤âÂµâÃâÂ·ÂB", + PUSHBUTTON "LZ",IDCANCEL,174,133,50,14 + LTEXT "vZbTÌÖWÌÝèÍAÇÌ CPU ÅvZXðÀs·é©ð§äµÜ·B", IDC_STATIC,5,5,220,16 CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 11,28,37,10 @@ -341,62 +341,62 @@ IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 195, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "âÃ±âÃâIâÃ°" +CAPTION "ñÌIð" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "ÆLÆÆÆâÆZÆâ¹",IDCANCEL,138,178,50,14 - LTEXT "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ [ÆvÆÂÆZÆX] ÆyÂ[ÆWâÃâ¢\\Å½Â¦âÂ·âÃ©âÃ±âÃ°âIâÃ°âÂµâÃâÂ·ÂB", + PUSHBUTTON "LZ",IDCANCEL,138,178,50,14 + LTEXT "^XN }l[WÌ [vZX] y[WÉ\\¦·éñðIðµÜ·B", IDC_STATIC,7,7,181,17 - CONTROL "ÆCÆÂÂ[ÆWâÂ¼(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + CONTROL "C[W¼(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 - CONTROL "PID (ÆvÆÂÆZÆX ID)(&P)",IDC_PID,"Button", + CONTROL "PID (vZX ID)(&P)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 - CONTROL "CPU Å½gâpâÂ¦(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU gp¦(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 - CONTROL "CPU Å½Å¾Å Ã(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU Ô(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 - CONTROL "ÆÂÆâÆÅ Å½gâpâÃ(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "gpÊ(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,63,10 - CONTROL "ÆÂÆâÆÅ Å½gâpâÃÆfÆâ¹Æ^(&D)",IDC_MEMORYUSAGEDELTA,"Button", + CONTROL "gpÊf^(&D)",IDC_MEMORYUSAGEDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 - CONTROL "ÂÃâÃ¥ÆÂÆâÆÅ Å½gâpâÃ(&K)",IDC_PEAKMEMORYUSAGE,"Button", + CONTROL "ÅågpÊ(&K)",IDC_PEAKMEMORYUSAGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 - CONTROL "ÆyÂ[ÆW ÆtÆHÆâ¹Æg(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + CONTROL "y[W tHg(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,105,53,10 - CONTROL "USER ÆIÆuÆWÆFÆNÆg(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "USER IuWFNg(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,62,10 - CONTROL "I/O âÃâÃÅ½Ã¦âÃ¨",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O ÇÝæè",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,49,10 - CONTROL "I/O Read Bytes",IDC_IOREADBYTES,"Button", + CONTROL "I/O ÇÝæèoCg",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 - CONTROL "ÆZÆbÆVÆâ¡Æâ ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + CONTROL "ZbV ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 - CONTROL "Æâ Â[ÆUÂ[âÂ¼(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + CONTROL "[U[¼(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,51,10 - CONTROL "ÆyÂ[ÆW ÆtÆHÆâ¹Æg ÆfÆâ¹Æ^(&A)",IDC_PAGEFAULTSDELTA,"Button", + CONTROL "y[W tHg f^(&A)",IDC_PAGEFAULTSDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 - CONTROL "â°Â¼âzÆÂÆâÆÅ ÆTÆCÆY(&V)",IDC_VIRTUALMEMORYSIZE,"Button", + CONTROL "¼z TCY(&V)",IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 - CONTROL "ÆyÂ[ÆW ÆvÂ[Æâ¹(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + CONTROL "y[W v[(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,50,53,10 - CONTROL "âÃ±ÆyÂ[ÆW ÆvÂ[Æâ¹(&O)",IDC_NONPAGEDPOOL,"Button", + CONTROL "ñy[W v[(&O)",IDC_NONPAGEDPOOL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 - CONTROL "Å Ã®â{âDÂÃ¦âx(&R)",IDC_BASEPRIORITY,"Button", + CONTROL "î{Dæx(&R)",IDC_BASEPRIORITY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 - CONTROL "ÆnÆâÆhÆâ¹âÃÂâ(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "nhÌ(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,83,59,10 - CONTROL "ÆXÆÅÆbÆhâÃÂâ(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "XbhÌ(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,94,59,10 - CONTROL "GDI ÆIÆuÆWÆFÆNÆg",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "GDI IuWFNg",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,105,55,10 - CONTROL "I/O Writes",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O «Ý",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,116,49,10 - CONTROL "I/O Write Bytes",IDC_IOWRITEBYTES,"Button", + CONTROL "I/O «ÝoCg",IDC_IOWRITEBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 - CONTROL "I/O âÂ»âÃâÂ¼",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O »Ì¼",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,138,46,10 - CONTROL "I/O Other Bytes",IDC_IOOTHERBYTES,"Button", + CONTROL "I/O »Ì¼ÌoCg",IDC_IOOTHERBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 END @@ -521,135 +521,135 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "Task Manager" - IDC_TASKMGR "Task Manager" + IDS_APP_TITLE "^XN }l[W" + IDC_TASKMGR "^XN }l[W" IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEW "ÂVâÂµâÂ¢ÆvÆÂÆOÆâ°Æâ¬âÃ°Å½ÃÂsâÂµâÃâÂ·" - ID_OPTIONS_ALWAYSONTOP "ÂÃÂÂ¬â°Â»âÂ³âÃªâÃâÂ¢ÅÃâÃ¨ÂAÂÃâÃÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÂªâÃâÂ©âÃâÂ·âÃâÃâÃÆEÆBÆâÆhÆEâÃ¦âÃ¨âÃ Å½Ã¨âOâÃâ¢\\Å½Â¦âÂ³âÃªâÃâÂ·" + ID_FILE_NEW "Vµ¢vOðÀsµÜ·" + ID_OPTIONS_ALWAYSONTOP "Å¬»³êÈ¢ÀèAíÉ^XN }l[WªÙ©Ì·×ÄÌEBhEæèàèOÉ\\¦³êÜ·" ID_OPTIONS_MINIMIZEONUSE - "[ÂÃâÃ¨âÃâÂ¦] ââ¬ÂÃ¬âÃ°Å½ÃÂsâÂ·âÃ©âÃÂAÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÂªÂÃÂÂ¬â°Â»âÂ³âÃªâÃâÂ·" - ID_OPTIONS_HIDEWHENMINIMIZED "ÂÃÂÂ¬â°Â»âÂ³âÃªâÂ½âÃâÂ«âÃÂAÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°â°BâÂµâÃâÂ·" - ID_VIEW_REFRESH "[ÂXÂVâÃâ¢pâx] âÃÂÃâÃ¨âÃâÂ©âÂ©âÃâÃ§âÂ¸ÂAÂÂ¡âÂ·âÂ®Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°ÂXÂVâÂµâÃâÂ·" - ID_VIEW_LARGE "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆââÃ°Å½gâÃâÃÆ^ÆXÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_SMALL "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆââÃ°Å½gâÃâÃÆ^ÆXÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_DETAILS "Å eÆ^ÆXÆNâÃÂÃ®â¢Ã±âÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_UPDATESPEED_HIGH "âËâ¢b 2 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" - ID_VIEW_UPDATESPEED_NORMAL "2 â¢bâÃ 1 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" - ID_VIEW_UPDATESPEED_LOW "4 â¢bâÃ 1 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" + "[ØèÖ¦] ìðÀs·éÆA^XN }l[WªÅ¬»³êÜ·" + ID_OPTIONS_HIDEWHENMINIMIZED "Å¬»³ê½Æ«ÉA^XN }l[WðBµÜ·" + ID_VIEW_REFRESH "[XVÌpx] ÌÝèÉ©©íç¸A¡·®^XN }l[WðXVµÜ·" + ID_VIEW_LARGE "å«¢ACRðgÁÄ^XNð\\¦µÜ·" + ID_VIEW_SMALL "¬³¢ACRðgÁÄ^XNð\\¦µÜ·" + ID_VIEW_DETAILS "e^XNÌîñð\\¦µÜ·" + ID_VIEW_UPDATESPEED_HIGH "b 2 ñ\\¦ðXVµÜ·" + ID_VIEW_UPDATESPEED_NORMAL "2 bÉ 1 ñ\\¦ðXVµÜ·" + ID_VIEW_UPDATESPEED_LOW "4 bÉ 1 ñ\\¦ðXVµÜ·" END STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "â¢\\Å½Â¦âÃ°Å½Â©âÂ®âIâÃÂXÂVâÂµâÃâÂ¹âÃ±" + ID_VIEW_UPDATESPEED_PAUSED "\\¦ð©®IÉXVµÜ¹ñ" ID_WINDOWS_TILEHORIZONTALLY - "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃ§âÃâÂ¢âÃ¦âÂ¤âÃÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_WINDOWS_TILEVERTICALLY "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃ§âÃâÂ¢âÃ¦âÂ¤âÃÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_WINDOWS_MINIMIZE "ÆEÆBÆâÆhÆEâÃ°ÂÃÂÂ¬â°Â»âÂµâÃâÂ·" - ID_WINDOWS_MAXIMIZE "ÆEÆBÆâÆhÆEâÃ°ÂÃâÃ¥â°Â»âÂµâÃâÂ·" - ID_WINDOWS_CASCADE "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_WINDOWS_BRINGTOFRONT "ÆEÆBÆâÆhÆEâÃ°Å½Ã¨âOâÃâ¢\\Å½Â¦âÂµâÃâÂ·âÂªÂAÂÃâÃ¨âÃâÂ¦âÃâÂ¹âÃ±ÂB" - ID_HELP_TOPICS "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃÆwÆâ¹Æv ÆgÆsÆbÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_HELP_ABOUT "ÆvÆÂÆOÆâ°Æâ¬ÂÃ®â¢Ã±ÂAÆoÂ[ÆWÆâ¡ÆââÃÂâ ÂAâËÂÃ¬ÅÂ âÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_FILE_EXIT "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆ ÆAÆvÆÅ ÆPÂ[ÆVÆâ¡ÆââÃ°ÂIâÂ¹âÂµâÃâÂ·" + "fXNgbvãÅEBhEðdÈçÈ¢æ¤ÉãºÉÀ×Ä\\¦µÜ·" + ID_WINDOWS_TILEVERTICALLY "fXNgbvãÅEBhEðdÈçÈ¢æ¤É¶EÉÀ×Ä\\¦µÜ·" + ID_WINDOWS_MINIMIZE "EBhEðÅ¬»µÜ·" + ID_WINDOWS_MAXIMIZE "EBhEðÅå»µÜ·" + ID_WINDOWS_CASCADE "fXNgbvãÅEBhEðdËÄ\\¦µÜ·" + ID_WINDOWS_BRINGTOFRONT "EBhEðèOÉ\\¦µÜ·ªAØèÖ¦Ü¹ñB" + ID_HELP_TOPICS "^XN }l[WÌwv gsbNð\\¦µÜ·" + ID_HELP_ABOUT "vOîñAo[WÔAì ð\\¦µÜ·" + ID_FILE_EXIT "^XN }l[W AvP[VðI¹µÜ·" ID_OPTIONS_SHOW16BITTASKS - "16 ÆrÆbÆg Æ^ÆXÆNâÃ°ÂAÅ ÃËAâ¢tâÂ¯âÃ§âÃªâÂ½ ntvdm.exe âÃâ°ÂºâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_SELECTCOLUMNS "[ÆvÆÂÆZÆX] ÆyÂ[ÆWâÃâ¢\\Å½Â¦âÂ·âÃ©âÃ±âÃ°âIâÃ°âÂµâÃâÂ·" - ID_VIEW_SHOWKERNELTIMES "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°ÆpÆtÆHÂ[Æ}ÆâÆX ÆOÆâ°ÆtÂÃ£âÃâ¢\\Å½Â¦âÂµâÃâÂ·" + "16 rbg ^XNðAÖAt¯çê½ ntvdm.exe ÌºÉ\\¦µÜ·" + ID_VIEW_SELECTCOLUMNS "[vZX] y[WÉ\\¦·éñðIðµÜ·" + ID_VIEW_SHOWKERNELTIMES "J[lÔðptH[}X OtãÉ\\¦µÜ·" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "1 âÃâÃâÅ¡âÃ°ÆOÆâ°ÆtâÃ CPU Å½gâpâÂ¦âÃÂâ¡ÅvâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°âÃ° CPU âÂ²âÃâÃÆOÆâ°ÆtâÃâ¢\\Å½Â¦âÂµâÃâÂ·" + "1 ÂÌðOtÅ CPU gp¦Ìvð\\¦µÜ·" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU gp¦Ìðð CPU ²ÆÉOtÅ\\¦µÜ·" ID_APPLICATION_PAGE_SWITCHTO - "Æ^ÆXÆNâÃ°Å½Ã¨âOâÃâ¢\\Å½Â¦âÂµÂAÆtÆHÂ[ÆJÆXâÃ°ÂÃâÃ¨âÃâÂ¦âÃâÂ·" + "^XNðèOÉ\\¦µAtH[JXðØèÖ¦Ü·" END STRINGTABLE DISCARDABLE BEGIN - ID_ENDTASK "âIâÃ°âÂ³âÃªâÃâÂ¢âÃ©Æ^ÆXÆNâÃÂIâÂ¹âÂ·âÃ©âÃ¦âÂ¤Å½wÅ½Â¦âÂµâÃâÂ·" - ID_GOTOPROCESS "âIâÃ°âÂ³âÃªâÃâÂ¢âÃ©Æ^ÆXÆNâÃÆvÆÂÆZÆXâÃÆtÆHÂ[ÆJÆXâÃ°ÂÃâÃ¨âÃâÂ¦âÃâÂ·" - ID_RESTORE "â°BâÃªâÃâÂ¢âÂ½Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°ÅÂ³âÃâÃâÂµâÃâÂ·" - ID_PROCESS_PAGE_ENDPROCESS "ÆVÆXÆeÆâ¬âÂ©âÃ§ÆvÆÂÆZÆXâÃ°ÂÃÂÅâÂµâÃâÂ·" + ID_ENDTASK "Ið³êÄ¢é^XNÉI¹·éæ¤w¦µÜ·" + ID_GOTOPROCESS "Ið³êÄ¢é^XNÌvZXÉtH[JXðØèÖ¦Ü·" + ID_RESTORE "BêÄ¢½^XN }l[Wð³ÉßµÜ·" + ID_PROCESS_PAGE_ENDPROCESS "VXe©çvZXðíµÜ·" ID_PROCESS_PAGE_ENDPROCESSTREE - "âÂ±âÃÆvÆÂÆZÆXâÃÅ½qÆvÆÂÆZÆXâÃ°âÂ·âÃâÃÂÃÂÅâÂµâÃâÂ·" - ID_PROCESS_PAGE_DEBUG "âÂ±âÃÆvÆÂÆZÆXâÃÆfÆoÆbÆKâÃ°âYâ¢tâÂµâÃâÂ·" + "±ÌvZXÆqvZXð·×ÄíµÜ·" + ID_PROCESS_PAGE_DEBUG "±ÌvZXÉfobKðYtµÜ·" ID_PROCESS_PAGE_SETAFFINITY - "âÃâÃÆvÆÂÆZÆbÆTâÃÆvÆÂÆZÆXâÃ°Å½ÃÂsâÂ·âÃ©âÂ©âÃ°ÂÂ§ÅÃ¤âÂµâÃâÂ·" + "ÇÌvZbTÅvZXðÀs·é©ð§äµÜ·" ID_PROCESS_PAGE_SETPRIORITY_REALTIME - "ÆvÆÂÆZÆXâÃ°ÆÅ ÆAÆâ¹Æ^ÆCÆâ¬âDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" - ID_PROCESS_PAGE_SETPRIORITY_HIGH "ÆvÆÂÆZÆXâÃ°ÂââDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðA^CDæxNXÉÝèµÜ·" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "vZXðDæxNXÉÝèµÜ·" ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - "ÆvÆÂÆZÆXâÃ°âÃÂÃËÃÂÃ£âÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðÊíÈãÌDæxNXÉÝèµÜ·" ID_PROCESS_PAGE_SETPRIORITY_NORMAL - "ÆvÆÂÆZÆXâÃ°âÃÂÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðÊíDæxNXÉÝèµÜ·" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - "ÆvÆÂÆZÆXâÃ°âÃÂÃËÃâ°ÂºâÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" - ID_PROCESS_PAGE_SETPRIORITY_LOW "ÆvÆÂÆZÆXâÃ°âÃ¡âDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðÊíÈºÌDæxNXÉÝèµÜ·" + ID_PROCESS_PAGE_SETPRIORITY_LOW "vZXðáDæxNXÉÝèµÜ·" END STRINGTABLE DISCARDABLE BEGIN - IDS_TAB_APPS "Applications" - IDS_TAB_PROCESSES "ÆvÆÂÆZÆX" - IDS_TAB_PERFORMANCE "ÆpÆtÆHÂ[Æ}ÆâÆX" - IDS_TAB_TASK "Æ^ÆXÆN" - IDS_TAB_STATUS "Status" - IDS_TAB_IMAGENAME "ÆCÆÂÂ[ÆWâÂ¼" + IDS_TAB_APPS "AvP[V" + IDS_TAB_PROCESSES "vZX" + IDS_TAB_PERFORMANCE "ptH[}X" + IDS_TAB_TASK "^XN" + IDS_TAB_STATUS "óÔ" + IDS_TAB_IMAGENAME "C[W¼" IDS_TAB_PID "PID" - IDS_TAB_USERNAME "Æâ Â[ÆUÂ[âÂ¼" - IDS_TAB_SESSIONID "ÆZÆbÆVÆâ¡Æâ ID" + IDS_TAB_USERNAME "[U[¼" + IDS_TAB_SESSIONID "ZbV ID" IDS_TAB_CPU "CPU" - IDS_TAB_CPUTIME "CPU Time" - IDS_TAB_MEMUSAGE "Mem Usage" - IDS_TAB_PEAKMEMUSAGE "Peak Mem Usage" - IDS_TAB_MEMDELTA "ÆÂÆâÆÅ ÆfÆâ¹Æ^" - IDS_TAB_PAGEFAULT "ÆyÂ[ÆW ÆtÆHÆâ¹Æg" - IDS_TAB_PFDELTA "ÆyÂ[ÆW ÆtÆHÆâ¹Æg ÆfÆâ¹Æ^" - IDS_TAB_VMSIZE "â°Â¼âzÆÂÆâÆÅ ÆTÆCÆY" - IDS_TAB_PAGEDPOOL "ÆyÂ[ÆW ÆvÂ[Æâ¹" - IDS_TAB_NPPOOL "âÃ±ÆyÂ[ÆW ÆvÂ[Æâ¹" - IDS_TAB_BASEPRI "Å Ã®â{âDÂÃ¦âx" - IDS_TAB_HANDLES "ÆnÆâÆhÆâ¹" - IDS_TAB_THREADS "ÆXÆÅÆbÆh" - IDS_TAB_USERPBJECTS "USER ÆIÆuÆWÆFÆNÆg" - IDS_TAB_GDIOBJECTS "GDI ÆIÆuÆWÆFÆNÆg" - IDS_TAB_IOREADS "I/O âÃâÃÅ½Ã¦âÃ¨" - IDS_TAB_IOWRITES "I/O Writes" - IDS_TAB_IOOTHER "I/O âÂ»âÃâÂ¼" - IDS_TAB_IOREADBYTES "I/O Read Bytes" - IDS_TAB_IOWRITESBYTES "I/O Write Bytes" - IDS_TAB_IOOTHERBYTES "I/O Other Bytes" - IDS_MENU_SELECTCOLUMNS "âÃ±âÃâIâÃ°(&S)..." - IDS_MENU_16BITTASK "16 ÆrÆbÆg Æ^ÆXÆNâÃâ¢\\Å½Â¦(&S)" - IDS_MENU_WINDOWS "ÆEÆBÆâÆhÆE(&W)" - IDS_MENU_LARGEICONS "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)" - IDS_MENU_SMALLICONS "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)" - IDS_MENU_DETAILS "ÂÃÂÃ(&D)" - IDS_MENU_ONEGRAPHALLCPUS "âÂ·âÃâÃâÃ CPU âÃ 1 ÆOÆâ°Æt(&O)" - IDS_MENU_ONEGRAPHPERCPU "CPU âÂ²âÃâÃ 1 ÆOÆâ°Æt(&P)" - IDS_MENU_CPUHISTORY "CPU âÅ¡âÃ°(&C)" - IDS_MENU_SHOWKERNELTIMES "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)" - IDS_CREATENEWTASK "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÂÃ¬ÂÂ¬" - IDS_CREATENEWTASK_DESC "Å½ÃÂsâÂ·âÃ©ÆvÆÂÆOÆâ°Æâ¬âÂ¼ÂAâÃâÂ½âÃÅ JâÂÆtÆHÆâ¹Æ_âÃ¢ÆhÆLÆâ¦ÆÂÆâÆgâÂ¼ÂAÆCÆâÆ^Â[ÆlÆbÆg ÆÅ Æ\\Â[ÆXâÂ¼âÃ°âÃ¼âÃâÂµâÃâÂâÂ¾âÂ³âÂ¢ÂB" - IDS_MSG_ACCESSPROCESSAFF "ÆvÆÂÆZÆXâÃÅ ÃÅWâÃâÃÆAÆNÆZÆXâÃâÂ½âÃÂÃâÃ¨âÂªâÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_PROCESSONEPRO "ÆvÆÂÆZÆXâÃÂAÂÂâÃâÂâÃâÃ 1 âÃâÃÆvÆÂÆZÆbÆTâÃÅ ÃÅWâÃ°Å½ÂâÂ½âÃâÂ¯âÃªâÃâÃâÃ¨âÃâÂ¹âÃ±ÂB" - IDS_MSG_INVALIDOPTION "Invalid Option" - IDS_MSG_UNABLEDEBUGPROCESS "ÆfÆoÆbÆKâÃ°âYâ¢tâÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_WARNINGDEBUG "ÅxÂÂ: âÂ±âÃÆvÆÂÆZÆXâÃ°ÆfÆoÆbÆOâÂ·âÃ©âÃÂAÆfÂ[Æ^âÂªÅ½Â¸âÃâÃªâÃ©â°Ãâ\\ÂÂ«âÂªâÂ âÃ¨âÃâÂ·ÂB\nÆfÆoÆbÆKâÃ°âYâ¢tâÂµâÃâÂ·âÂ©?" - IDS_MSG_TASKMGRWARNING "Task Manager Warning" - IDS_MSG_WARNINGTERMINATING "ÅxÂÂ: ÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂ·âÃ©âÃÂAÆfÂ[Æ^âÂªÅ½Â¸âÃâÃªâÂ½âÃ¨ÂAÆVÆXÆeÆâ¬âÂª\nâ¢sËÃâÃ¨âÃâÃâÃâÂ½âÃ¨âÂ·âÃ©âÃâÃâÃÂAâ\\Å ÃºâÂµâÃâÂ¢Åâ¹â°ÃâÃâÃâÃ©âÂ±âÃâÂªâÂ âÃ¨âÃâÂ·ÂB\nÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂ·âÃ©âOâÃÂAÂÃ³âÃâÃâÂ½âÃÆfÂ[Æ^âÃ°â¢ÃâÂ¶âÂ·âÃ©âÂ©âÃâÂ¤âÂ©âÃ\nÅ mâFÆÂÆbÆZÂ[ÆWâÃâ¢\\Å½Â¦âÂ³âÃªâÃâÂ¹âÃ±ÂBÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂµâÃâÂ·âÂ©?" - IDS_MSG_UNABLETERMINATEPRO "ÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_UNABLECHANGEPRIORITY "âDÂÃ¦âxâÃ°â¢ÃÂXâÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_WARNINGCHANGEPRIORITY "ÅxÂÂ: âÂ±âÃÆvÆÂÆZÆXâÃâDÂÃ¦âxÆNÆâ°ÆXâÃ°â¢ÃÂXâÂ·âÃ©âÃÂAÆVÆXÆeÆâ¬âÂªâ¢sËÃâÃ¨âÃ\nâÃâÃ©âÃâÃÂAâ\\Å ÃºâÂµâÃâÂ¢Åâ¹â°ÃâÃâÃâÃ©âÂ±âÃâÂªâÂ âÃ¨âÃâÂ·ÂB\nâDÂÃ¦âxÆNÆâ°ÆXâÃ°â¢ÃÂXâÂµâÃâÂ·âÂ©?" - IDS_MSG_TRAYICONCPUUSAGE "CPU Å½gâpâÂ¦: %d%%" - IDS_STATUS_MEMUSAGE "ÆÂÆâÆÅ Å½gâpâÃ: %dKB / %dKB" - IDS_STATUS_CPUUSAGE "CPU Å½gâpâÂ¦: %3d%%" - IDS_STATUS_PROCESSES "ÆvÆÂÆZÆX: %d" - IDS_Not_Responding "â°Å¾âÅ¡âÃâÂµ" - IDS_Running "Å½ÃÂsââ " + IDS_TAB_CPUTIME "CPU Ô" + IDS_TAB_MEMUSAGE "gpÊ" + IDS_TAB_PEAKMEMUSAGE "ÅågpÊ" + IDS_TAB_MEMDELTA " f^" + IDS_TAB_PAGEFAULT "y[W tHg" + IDS_TAB_PFDELTA "y[W tHg f^" + IDS_TAB_VMSIZE "¼z TCY" + IDS_TAB_PAGEDPOOL "y[W v[" + IDS_TAB_NPPOOL "ñy[W v[" + IDS_TAB_BASEPRI "î{Dæx" + IDS_TAB_HANDLES "nh" + IDS_TAB_THREADS "Xbh" + IDS_TAB_USERPBJECTS "USER IuWFNg" + IDS_TAB_GDIOBJECTS "GDI IuWFNg" + IDS_TAB_IOREADS "I/O ÇÝæè" + IDS_TAB_IOWRITES "I/O «Ý" + IDS_TAB_IOOTHER "I/O »Ì¼" + IDS_TAB_IOREADBYTES "I/O ÇÝæèoCg" + IDS_TAB_IOWRITESBYTES "I/O «ÝoCg" + IDS_TAB_IOOTHERBYTES "I/O »Ì¼ÌoCg" + IDS_MENU_SELECTCOLUMNS "ñÌIð(&S)..." + IDS_MENU_16BITTASK "16 rbg ^XNÌ\\¦(&S)" + IDS_MENU_WINDOWS "EBhE(&W)" + IDS_MENU_LARGEICONS "å«¢ACR(&G)" + IDS_MENU_SMALLICONS "¬³¢ACR(&M)" + IDS_MENU_DETAILS "Ú×(&D)" + IDS_MENU_ONEGRAPHALLCPUS "·×ÄÌ CPU Å 1 Ot(&O)" + IDS_MENU_ONEGRAPHPERCPU "CPU ²ÆÉ 1 Ot(&P)" + IDS_MENU_CPUHISTORY "CPU ð(&C)" + IDS_MENU_SHOWKERNELTIMES "J[lÔð\\¦·é(&S)" + IDS_CREATENEWTASK "Vµ¢^XNÌì¬" + IDS_CREATENEWTASK_DESC "Às·évO¼AÜ½ÍJtH_âhLg¼AC^[lbg \\[X¼ðüÍµÄ¾³¢B" + IDS_MSG_ACCESSPROCESSAFF "vZXÌÖWÖÌANZXÜ½ÍÝèªÅ«Ü¹ñ" + IDS_MSG_PROCESSONEPRO "vZXÍAÈÆà 1 ÂÌvZbTÆÖWð½È¯êÎÈèÜ¹ñB" + IDS_MSG_INVALIDOPTION "³øÈIvV" + IDS_MSG_UNABLEDEBUGPROCESS "fobKðYtÅ«Ü¹ñ" + IDS_MSG_WARNINGDEBUG "x: ±ÌvZXðfobO·éÆAf[^ª¸íêéÂ\\«ª èÜ·B\nfobKðYtµÜ·©?" + IDS_MSG_TASKMGRWARNING "^XN }l[WÌx" + IDS_MSG_WARNINGTERMINATING "x: vZXðI¹·éÆAf[^ª¸íê½èAVXeª\nsÀèÉÈÁ½è·éÈÇÌA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nvZXðI¹·éOÉAóÔÜ½Íf[^ðÛ¶·é©Ç¤©Ì\nmFbZ[WÍ\\¦³êÜ¹ñBvZXðI¹µÜ·©?" + IDS_MSG_UNABLETERMINATEPRO "vZXðI¹Å«Ü¹ñ" + IDS_MSG_UNABLECHANGEPRIORITY "DæxðÏXÅ«Ü¹ñ" + IDS_MSG_WARNINGCHANGEPRIORITY "x: ±ÌvZXÌDæxNXðÏX·éÆAVXeªsÀèÉ\nÈéÈÇA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nDæxNXðÏXµÜ·©?" + IDS_MSG_TRAYICONCPUUSAGE "CPU gp¦: %d%%" + IDS_STATUS_MEMUSAGE "gpÊ: %dKB / %dKB" + IDS_STATUS_CPUUSAGE "CPU gp¦: %3d%%" + IDS_STATUS_PROCESSES "vZX: %d" + IDS_Not_Responding "Èµ" + IDS_Running "Às" END

1 0

[tkreuzer] 50643: Merge resource file related changes from cmake branch part 2
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 10:45:45 2011 New Revision: 50643 URL: http://svn.reactos.org/svn/reactos?rev=50643&view=rev Log: Merge resource file related changes from cmake branch part 2 Modified: trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc trunk/reactos/dll/win32/kernel32/nls/azl.nls trunk/reactos/dll/win32/kernel32/nls/csy.nls trunk/reactos/dll/win32/kernel32/nls/far.nls trunk/reactos/dll/win32/kernel32/nls/fos.nls trunk/reactos/dll/win32/kernel32/nls/hrv.nls trunk/reactos/dll/win32/kernel32/nls/mon.nls trunk/reactos/dll/win32/mpr/mpr_Bg.rc trunk/reactos/dll/win32/mpr/mpr_Cs.rc trunk/reactos/dll/win32/mpr/mpr_Da.rc trunk/reactos/dll/win32/mpr/mpr_De.rc trunk/reactos/dll/win32/mpr/mpr_En.rc trunk/reactos/dll/win32/mpr/mpr_Es.rc trunk/reactos/dll/win32/mpr/mpr_Fr.rc trunk/reactos/dll/win32/mpr/mpr_Hu.rc trunk/reactos/dll/win32/mpr/mpr_It.rc trunk/reactos/dll/win32/mpr/mpr_Ja.rc trunk/reactos/dll/win32/mpr/mpr_Ko.rc trunk/reactos/dll/win32/mpr/mpr_Lt.rc trunk/reactos/dll/win32/mpr/mpr_Nl.rc trunk/reactos/dll/win32/mpr/mpr_No.rc trunk/reactos/dll/win32/mpr/mpr_Pl.rc trunk/reactos/dll/win32/mpr/mpr_Pt.rc trunk/reactos/dll/win32/mpr/mpr_Ro.rc trunk/reactos/dll/win32/mpr/mpr_Ru.rc trunk/reactos/dll/win32/mpr/mpr_Si.rc trunk/reactos/dll/win32/mpr/mpr_Sv.rc trunk/reactos/dll/win32/mpr/mpr_Tr.rc trunk/reactos/dll/win32/mpr/mpr_Uk.rc trunk/reactos/dll/win32/mpr/mpr_Zh.rc trunk/reactos/dll/win32/shdoclc/Es.rc trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/He.rc trunk/reactos/dll/win32/shdocvw/It.rc trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/Lt.rc trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/Ro.rc trunk/reactos/dll/win32/shdocvw/Si.rc trunk/reactos/dll/win32/shdocvw/Sr.rc trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/Uk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Da.rc trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Lt.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Si.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Sk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Zh.rc trunk/reactos/dll/win32/wininet/wininet_Bg.rc trunk/reactos/dll/win32/wininet/wininet_Cs.rc trunk/reactos/dll/win32/wininet/wininet_Da.rc trunk/reactos/dll/win32/wininet/wininet_De.rc trunk/reactos/dll/win32/wininet/wininet_En.rc trunk/reactos/dll/win32/wininet/wininet_Es.rc trunk/reactos/dll/win32/wininet/wininet_Fi.rc trunk/reactos/dll/win32/wininet/wininet_Fr.rc trunk/reactos/dll/win32/wininet/wininet_Hu.rc trunk/reactos/dll/win32/wininet/wininet_It.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Lt.rc trunk/reactos/dll/win32/wininet/wininet_Nl.rc trunk/reactos/dll/win32/wininet/wininet_No.rc trunk/reactos/dll/win32/wininet/wininet_Pl.rc trunk/reactos/dll/win32/wininet/wininet_Pt.rc trunk/reactos/dll/win32/wininet/wininet_Ro.rc trunk/reactos/dll/win32/wininet/wininet_Ru.rc trunk/reactos/dll/win32/wininet/wininet_Si.rc trunk/reactos/dll/win32/wininet/wininet_Sv.rc trunk/reactos/dll/win32/wininet/wininet_Tr.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/wininet/wininet_Zh.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Da… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/kernel32/nls/azl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/azl… Modified: trunk/reactos/dll/win32/kernel32/nls/csy.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/csy… Modified: trunk/reactos/dll/win32/kernel32/nls/far.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/far… Modified: trunk/reactos/dll/win32/kernel32/nls/fos.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fos… Modified: trunk/reactos/dll/win32/kernel32/nls/hrv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hrv… Modified: trunk/reactos/dll/win32/kernel32/nls/mon.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mon… Modified: trunk/reactos/dll/win32/mpr/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Bg.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Cs.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Da.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_De.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_En.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Es.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Fr.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Hu.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_It.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Lt.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Nl.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_No.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pt.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ro.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ru.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Si.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Sv.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Tr.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Uk.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Zh.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Es.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/De.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/En.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Es.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fr.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/He.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/It.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Lt.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Nl.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pt.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ro.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Si.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sr.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sv.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Uk.rc?re… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_…

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