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/preco... ============================================================================== --- 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/p... ============================================================================== --- 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/reg... ============================================================================== --- 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/rap... ============================================================================== --- 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/f... ============================================================================== --- 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/r... ============================================================================== --- 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/tas... ============================================================================== --- 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/reacto... ============================================================================== --- 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_rea... ============================================================================== --- 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_r... ============================================================================== --- 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/registry... ============================================================================== --- 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/lcf... ============================================================================== --- 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?r... ============================================================================== --- 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?r... ============================================================================== --- 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=50... ============================================================================== --- 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=5... ============================================================================== --- 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=506... ============================================================================== --- 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?re... ============================================================================== --- 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=50650... ============================================================================== --- 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?re... ============================================================================== --- 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?re... ============================================================================== --- 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?r... ============================================================================== --- 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=5... ============================================================================== --- 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/bugcodes... ============================================================================== --- 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/errcodes... ============================================================================== --- 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/ntstatus... ============================================================================== --- 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.h... ============================================================================== --- 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/config... ============================================================================== --- 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/im... ============================================================================== --- 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/cinitexe... ============================================================================== --- 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_hand... ============================================================================== --- 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.c... ============================================================================== --- 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?r... ============================================================================== --- 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.c... ============================================================================== --- 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-r... ============================================================================== --- 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/e... ============================================================================== --- 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/o... ============================================================================== --- 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/t... ============================================================================== --- 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?rev... ============================================================================== --- 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.c... ============================================================================== --- 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=506... ============================================================================== --- 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_)
-
tkreuzer＠svn.reactos.org