Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[khornicek] 37502: - fix freeing of resources, CID 1295 run 2 - don't redefine _WIN32_WINNT

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Nov 21 03:45:54 2008 New Revision: 37502 URL: http://svn.reactos.org/svn/reactos?rev=37502&view=rev Log: - fix freeing of resources, CID 1295 run 2 - don't redefine _WIN32_WINNT Modified: trunk/reactos/dll/win32/glu32/include/gluos.h trunk/reactos/dll/win32/glu32/libnurbs/interface/insurfeval.cc Modified: trunk/reactos/dll/win32/glu32/include/gluos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/include/gl… ============================================================================== --- trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] Fri Nov 21 03:45:54 2008 @@ -40,7 +40,6 @@ #define NOIME #define NOMINMAX -#define _WIN32_WINNT 0x0400 #ifndef STRICT #define STRICT 1 #endif Modified: trunk/reactos/dll/win32/glu32/libnurbs/interface/insurfeval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/interface/insurfeval.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/interface/insurfeval.cc [iso-8859-1] Fri Nov 21 03:45:54 2008 @@ -1533,8 +1533,8 @@ } //clean up free(leftXYZ); - free(leftXYZ); - free(rightNormal); + free(rightXYZ); + free(leftNormal); free(rightNormal); }

15 years, 10 months

[greatlrd] 37501: Copied dciman.h and dciddi.h from psdk to ddk for they are same

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Nov 21 03:12:27 2008 New Revision: 37501 URL: http://svn.reactos.org/svn/reactos?rev=37501&view=rev Log: Copied dciman.h and dciddi.h from psdk to ddk for they are same Added: branches/reactx/reactos/include/ddk/dciddi.h - copied unchanged from r37500, branches/reactx/reactos/include/psdk/dciddi.h

15 years, 10 months

[greatlrd] 37500: Copied dciman.h and dciddi.h from psdk to ddk for they are same

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Nov 21 03:12:25 2008 New Revision: 37500 URL: http://svn.reactos.org/svn/reactos?rev=37500&view=rev Log: Copied dciman.h and dciddi.h from psdk to ddk for they are same Added: branches/reactx/reactos/include/ddk/dciman.h - copied unchanged from r37499, branches/reactx/reactos/include/psdk/dciman.h

15 years, 10 months

[greatlrd] 37499: delete the dciddi.h we got in ddk, it is same as psdk header

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Nov 21 03:09:06 2008 New Revision: 37499 URL: http://svn.reactos.org/svn/reactos?rev=37499&view=rev Log: delete the dciddi.h we got in ddk, it is same as psdk header Removed: branches/reactx/reactos/include/ddk/dciddi.h Removed: branches/reactx/reactos/include/ddk/dciddi.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/ddk/dcid… ============================================================================== --- branches/reactx/reactos/include/ddk/dciddi.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/ddk/dciddi.h (removed) @@ -1,59 +1,0 @@ -/* - * DCI driver interface - * - * Copyright (C) 2001 Ove Kaaven - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_DCIDDI_H -#define __WINE_DCIDDI_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* DCI Command Escape */ -#define DCICOMMAND 3075 -#define DCI_VERSION 0x0100 - -#define DCICREATEPRIMARYSURFACE 1 -#define DCICREATEOFFSCREENSURFACE 2 -#define DCICREATEOVERLAYSURFACE 3 -#define DCIENUMSURFACE 4 -#define DCIESCAPE 5 - -/* DCI Errors */ -#define DCI_OK 0 - - -typedef int DCIRVAL; /* DCI callback return type */ - -/***************************************************************************** - * Escape command structures - */ -typedef struct _DCICMD { - DWORD dwCommand; - DWORD dwParam1; - DWORD dwParam2; - DWORD dwVersion; - DWORD dwReserved; -} DCICMD,*LPDCICMD; - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __WINE_DCIDDI_H */

15 years, 10 months

[greatlrd] 37498: update the dciddi and dciman header. it does not missing any data now.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Nov 21 03:07:20 2008 New Revision: 37498 URL: http://svn.reactos.org/svn/reactos?rev=37498&view=rev Log: update the dciddi and dciman header. it does not missing any data now. Modified: branches/reactx/reactos/include/psdk/dciddi.h branches/reactx/reactos/include/psdk/dciman.h Modified: branches/reactx/reactos/include/psdk/dciddi.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/psdk/dci… ============================================================================== --- branches/reactx/reactos/include/psdk/dciddi.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/psdk/dciddi.h [iso-8859-1] Fri Nov 21 03:07:20 2008 @@ -92,6 +92,37 @@ #define DCI_CAN_STRETCHXYN (DCI_CAN_STRETCHXN | DCI_CAN_STRETCHYN) #define DCI_CANOVERLAY 0x00010000 +#if (WINVER < 0x0400) + #ifndef RDH_RECTANGLES + + #define RDH_RECTANGLES 0 + + typedef struct tagRECTL + { + LONG left; + LONG top; + LONG right; + LONG bottom; + } RECTL, *PRECTL, *NPRECTL, *LPRECTL, const *LPCRECTL; + + typedef struct tagRGNDATAHEADER + { + DWORD dwSize; + DWORD iType; + DWORD nCount; + DWORD nRgnSize; + RECTL rcBound; + } RGNDATAHEADER *PRGNDATAHEADER, *NPRGNDATAHEADER, *LPRGNDATAHEADER, const RGNDATAHEADER * LPCRGNDATAHEADER; + + typedef struct tagRGNDATA + { + RGNDATAHEADER rdh; + char Buffer[1]; + } RGNDATA, *PRGNDATA, *NPRGNDATA, *LPRGNDATA, const RGNDATA *LPCRGNDATA; + + #endif +#endif + /* FOURCC codes */ #ifndef YVU9 #define YVU9 mmioFOURCC('Y','V','U','9') Modified: branches/reactx/reactos/include/psdk/dciman.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/psdk/dci… ============================================================================== --- branches/reactx/reactos/include/psdk/dciman.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/psdk/dciman.h [iso-8859-1] Fri Nov 21 03:07:20 2008 @@ -21,18 +21,154 @@ #ifndef _INC_DCIMAN #define _INC_DCIMAN -#include <dciddi.h> +#ifdef __cplusplus + #define __inline inline + extern "C" { +#endif + +#include "dciddi.h" + +DECLARE_HANDLE(HWINWATCH); + +#define WINWATCHNOTIFY_START 0 +#define WINWATCHNOTIFY_STOP 1 +#define WINWATCHNOTIFY_DESTROY 2 +#define WINWATCHNOTIFY_CHANGING 3 +#define WINWATCHNOTIFY_CHANGED 4 + + +extern HWINWATCH WINAPI WinWatchOpen(HWND hwnd); +extern void WINAPI WinWatchClose(HWINWATCH hWW); + +extern UINT WINAPI WinWatchGetClipList(HWINWATCH hWW, + LPRECT prc, + UINT size, + LPRGNDATA prd); + +extern BOOL WINAPI WinWatchDidStatusChange(HWINWATCH hWW); + +typedef void (CALLBACK *WINWATCHNOTIFYPROC)(HWINWATCH hww, + HWND hwnd, + DWORD code, + LPARAM lParam); + +extern BOOL WINAPI WinWatchNotify(HWINWATCH hWW, + WINWATCHNOTIFYPROC NotifyCallback, + LPARAM NotifyParam ); + +extern HDC WINAPI DCIOpenProvider(void); +extern void WINAPI DCICloseProvider(HDC hdc); + +extern int WINAPI DCICreatePrimary(HDC hdc, + LPDCISURFACEINFO *lplpSurface); + +extern int WINAPI DCICreateOverlay(HDC hdc, + LPVOID lpOffscreenSurf, + LPDCIOVERLAY *lplpSurface); + +extern int WINAPI DCICreateOffscreen(HDC hdc, + DWORD dwCompression, + DWORD dwRedMask, + DWORD dwGreenMask, + DWORD dwBlueMask, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwDCICaps, + DWORD dwBitCount, + LPDCIOFFSCREEN *lplpSurface); + +extern int WINAPI DCIEnum(HDC hdc, + LPRECT lprDst, + LPRECT lprSrc, + LPVOID lpFnCallback, + LPVOID lpContext); + +extern DCIRVAL WINAPI DCISetSrcDestClip(LPDCIOFFSCREEN pdci, + LPRECT srcrc, + LPRECT destrc, + LPRGNDATA prd); + +extern DWORD WINAPI GetDCRegionData(HDC hdc, DWORD size, LPRGNDATA prd); +extern DWORD WINAPI GetWindowRegionData(HWND hwnd, DWORD size, LPRGNDATA prd); + +#ifdef WIN32 + + extern DCIRVAL WINAPI DCIBeginAccess(LPDCISURFACEINFO pdci, int x, int y, int dx, int dy); + extern void WINAPI DCIEndAccess(LPDCISURFACEINFO pdci); + + extern DCIRVAL WINAPI DCIDraw(LPDCIOFFSCREEN pdci); + extern DCIRVAL WINAPI DCISetClipList(LPDCIOFFSCREEN pdci, LPRGNDATA prd); + extern DCIRVAL WINAPI DCISetDestination(LPDCIOFFSCREEN pdci, LPRECT dst, LPRECT src); + extern void WINAPI DCIDestroy(LPDCISURFACEINFO pdci); +#else + extern int WINAPI DCISendCommand(HDC hdc, VOID *pcmd, int nSize, VOID ** lplpOut); + + __inline DCIRVAL DCISetDestination(LPDCIOFFSCREEN pdci, LPRECT dst, LPRECT src) + { + DCIRVAL retValue = DCI_OK; + + if( pdci->SetDestination != NULL ) + { + retValue = pdci->SetDestination(pdci, dst, src); + } + + return retValue; + } + + __inline DCIRVAL DCIDraw(LPDCIOFFSCREEN pdci) + { + DCIRVAL retValue = DCI_OK; + if( pdci->Draw != NULL ) + { + retValue = pdci->Draw(pdci); + } + return retValue; + } + + __inline DCIRVAL DCIBeginAccess(LPDCISURFACEINFO pdci, int x, int y, int dx, int dy) + { + RECT rc; + DCIRVAL retValue = DCI_OK; + if( pdci->BeginAccess != NULL ) + { + rc.top=y; + rc.left=x; + rc.right = rc.left+dx; + rc.bottom = rc.top+dy; + retValue = pdci->BeginAccess(pdci, &rc); + } + return retValue; + } + + __inline DCIRVAL DCISetClipList(LPDCIOFFSCREEN pdci, LPRGNDATA prd) + { + DCIRVAL retValue = DCI_OK; + if( pdci->SetClipList != NULL ) + { + retValue = pdci->SetClipList(pdci, prd); + } + return retValue; + } + + __inline void DCIDestroy(LPDCISURFACEINFO pdci) + { + if( pdci->DestroySurface != NULL ) + { + pdci->DestroySurface(pdci); + } + } + + __inline void DCIEndAccess(LPDCISURFACEINFO pdci) + { + if( pdci->EndAccess != NULL ) + { + pdci->EndAccess(pdci); + } + } +#endif #ifdef __cplusplus -extern "C" { + } #endif -HDC WINAPI DCIOpenProvider(void); -void WINAPI DCICloseProvider(HDC); -int WINAPI DCICreatePrimary(HDC,LPDCISURFACEINFO*); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _INC_DCIMAN */ +#endif // _INC_DCIMAN

15 years, 10 months

[janderwald] 37497: - Convert Value of PATHEXT to lowercase - see bug 3875

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Nov 21 02:57:13 2008 New Revision: 37497 URL: http://svn.reactos.org/svn/reactos?rev=37497&view=rev Log: - Convert Value of PATHEXT to lowercase - see bug 3875 Modified: trunk/reactos/base/shell/cmd/where.c Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/where.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/where.c [iso-8859-1] Fri Nov 21 02:57:13 2008 @@ -141,7 +141,7 @@ BOOL SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName) { - static TCHAR pszDefaultPathExt[] = _T(".COM;.EXE;.BAT;.CMD"); + static TCHAR pszDefaultPathExt[] = _T(".com;.exe;.bat;.cmd"); LPTSTR pszPathExt, pszPath; LPTSTR pCh; DWORD dwBuffer; @@ -154,10 +154,15 @@ { pszPathExt = (LPTSTR)cmd_realloc (pszPathExt, dwBuffer * sizeof (TCHAR)); GetEnvironmentVariable (_T("PATHEXT"), pszPathExt, dwBuffer); + _tcslwr(pszPathExt); } else if (0 == dwBuffer) { _tcscpy(pszPathExt, pszDefaultPathExt); + } + else + { + _tcslwr(pszPathExt); } /* Check if valid directly on specified path */

15 years, 10 months

[jimtabor] 37496: - Update palette functions and small cleanup in bitmaps.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Nov 21 00:50:36 2008 New Revision: 37496 URL: http://svn.reactos.org/svn/reactos?rev=37496&view=rev Log: - Update palette functions and small cleanup in bitmaps. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Nov 21 00:50:36 2008 @@ -341,8 +341,6 @@ } - - INT STDCALL GetDIBits( @@ -392,7 +390,7 @@ uUsage, cjBmpScanSize, 0); - if ( lpvBits ) + if ( lpvBits != pvSafeBits) { RtlCopyMemory( lpvBits, pvSafeBits, cjBmpScanSize); RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] Fri Nov 21 00:50:36 2008 @@ -2,6 +2,42 @@ #define NDEBUG #include <debug.h> + + +#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ + +static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = +{ + /* first 10 entries in the system palette */ + /* red green blue flags */ + { 0x00, 0x00, 0x00, 0 }, + { 0x80, 0x00, 0x00, 0 }, + { 0x00, 0x80, 0x00, 0 }, + { 0x80, 0x80, 0x00, 0 }, + { 0x00, 0x00, 0x80, 0 }, + { 0x80, 0x00, 0x80, 0 }, + { 0x00, 0x80, 0x80, 0 }, + { 0xc0, 0xc0, 0xc0, 0 }, + { 0xc0, 0xdc, 0xc0, 0 }, + { 0xa6, 0xca, 0xf0, 0 }, + + /* ... c_min/2 dynamic colorcells */ + + /* ... gap (for sparse palettes) */ + + /* ... c_min/2 dynamic colorcells */ + + { 0xff, 0xfb, 0xf0, 0 }, + { 0xa0, 0xa0, 0xa4, 0 }, + { 0x80, 0x80, 0x80, 0 }, + { 0xff, 0x00, 0x00, 0 }, + { 0x00, 0xff, 0x00, 0 }, + { 0xff, 0xff, 0x00, 0 }, + { 0x00, 0x00, 0xff, 0 }, + { 0xff, 0x00, 0xff, 0 }, + { 0x00, 0xff, 0xff, 0 }, + { 0xff, 0xff, 0xff, 0 } /* last 10 */ +}; BOOL WINAPI @@ -50,7 +86,34 @@ UINT cEntries, LPPALETTEENTRY ppe) { - return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); + PALETTEENTRY ippe[256]; + + if (cEntries < 0) return 0; + else + { + if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) + return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); + else + { + if (ppe) + { + RtlZeroMemory( &ippe, sizeof(ippe) ); + RtlCopyMemory( &ippe, &sys_pal_template, sizeof(sys_pal_template) ); + + if (iStartIndex < 256) + { + INT Index = 256 - iStartIndex; + + if ( Index >= cEntries ) Index = cEntries; + + RtlCopyMemory( ppe, + &ippe[iStartIndex], + Index*sizeof(PALETTEENTRY)); + } + } + } + } + return 0; } UINT @@ -60,7 +123,9 @@ UINT cEntries, RGBQUAD *pColors) { - return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetColorTable, FALSE); + if (cEntries) + return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetColorTable, FALSE); + return 0; } /*

15 years, 10 months

[cgutman] 37495: - Fix the status returned to NDIS when it supplies a buffer which is too small - Set BytesNeeded to the correct value - Return the correct status to NDIS if it gives us an invalid lookahead size

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Nov 20 20:51:48 2008 New Revision: 37495 URL: http://svn.reactos.org/svn/reactos?rev=37495&view=rev Log: - Fix the status returned to NDIS when it supplies a buffer which is too small - Set BytesNeeded to the correct value - Return the correct status to NDIS if it gives us an invalid lookahead size Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c [iso-8859-1] Thu Nov 20 20:51:48 2008 @@ -352,9 +352,9 @@ { if (CopySize > InformationBufferLength) { - *BytesNeeded = (CopySize - InformationBufferLength); + *BytesNeeded = CopySize; *BytesWritten = 0; - Status = NDIS_STATUS_BUFFER_TOO_SHORT; + Status = NDIS_STATUS_INVALID_LENGTH; } else { @@ -362,6 +362,11 @@ *BytesWritten = CopySize; *BytesNeeded = CopySize; } + } + else + { + *BytesWritten = 0; + *BytesNeeded = 0; } NdisDprReleaseSpinLock(&Adapter->Lock); @@ -417,7 +422,7 @@ if (InformationBufferLength < sizeof(ULONG)) { *BytesRead = 0; - *BytesNeeded = sizeof(ULONG) - InformationBufferLength; + *BytesNeeded = sizeof(ULONG); Status = NDIS_STATUS_INVALID_LENGTH; break; } @@ -434,7 +439,7 @@ NDIS_PACKET_TYPE_SOURCE_ROUTING) ) { - *BytesRead = 4; + *BytesRead = sizeof(ULONG); *BytesNeeded = 0; Status = NDIS_STATUS_NOT_SUPPORTED; break; @@ -453,7 +458,7 @@ if (InformationBufferLength < sizeof(ULONG)) { *BytesRead = 0; - *BytesNeeded = sizeof(ULONG) - InformationBufferLength; + *BytesNeeded = sizeof(ULONG); Status = NDIS_STATUS_INVALID_LENGTH; break; } @@ -461,7 +466,7 @@ NdisMoveMemory(&GenericULONG, InformationBuffer, sizeof(ULONG)); if (GenericULONG > 1500) - Status = NDIS_STATUS_INVALID_LENGTH; + Status = NDIS_STATUS_INVALID_DATA; else Adapter->CurrentLookaheadSize = GenericULONG; @@ -474,7 +479,7 @@ if ((InformationBufferLength % 6) != 0) { *BytesRead = 0; - *BytesNeeded = 0; + *BytesNeeded = InformationBufferLength + (InformationBufferLength % 6); Status = NDIS_STATUS_INVALID_LENGTH; break; }

15 years, 10 months

[tkreuzer] 37494: use the real RtlGetCallersAddress in ntoskrnl

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 20 17:29:00 2008 New Revision: 37494 URL: http://svn.reactos.org/svn/reactos?rev=37494&view=rev Log: use the real RtlGetCallersAddress in ntoskrnl Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Thu Nov 20 17:29:00 2008 @@ -13,6 +13,7 @@ #include <psdk/ntverp.h> /* DDK/IFS/NDK Headers */ +#define _REALLY_GET_CALLERS_CALLER_ #ifdef _MSC_VER #include <excpt.h> #include <ntdef.h>

15 years, 10 months

[tkreuzer] 37493: fix amd64 / ia64 default definition of RtlGetCallersAddress

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 20 17:25:09 2008 New Revision: 37493 URL: http://svn.reactos.org/svn/reactos?rev=37493&view=rev Log: fix amd64 / ia64 default definition of RtlGetCallersAddress Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Thu Nov 20 17:25:09 2008 @@ -6696,12 +6696,18 @@ RtlFreeUnicodeString( IN PUNICODE_STRING UnicodeString); +#if (defined(_M_AMD64) || defined(_M_IA64)) && !defined(_REALLY_GET_CALLERS_CALLER_) +#define RtlGetCallersAddress(CallersAddress, CallersCaller) \ + *CallersAddress = (PVOID)_ReturnAddress(); \ + *CallersCaller = NULL; +#else NTSYSAPI VOID NTAPI RtlGetCallersAddress( OUT PVOID *CallersAddress, OUT PVOID *CallersCaller); +#endif NTSYSAPI NTSTATUS

15 years, 10 months

← Newer
1
...
26
27
28
29
30
31
32
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008