Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 37498: update the dciddi and dciman header. it does not missing any data now.
by greatlrd＠svn.reactos.org 21 Nov '08

21 Nov '08

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

1 0

[janderwald] 37497: - Convert Value of PATHEXT to lowercase - see bug 3875
by janderwald＠svn.reactos.org 21 Nov '08

21 Nov '08

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 */

1 0

[jimtabor] 37496: - Update palette functions and small cleanup in bitmaps.
by jimtabor＠svn.reactos.org 21 Nov '08

21 Nov '08

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

1 0

[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 21 Nov '08

21 Nov '08

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

1 0

[tkreuzer] 37494: use the real RtlGetCallersAddress in ntoskrnl
by tkreuzer＠svn.reactos.org 20 Nov '08

20 Nov '08

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>

1 0

[tkreuzer] 37493: fix amd64 / ia64 default definition of RtlGetCallersAddress
by tkreuzer＠svn.reactos.org 20 Nov '08

20 Nov '08

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

1 0

[tkreuzer] 37492: Implement RtlpTryToUnwindEpilog, which tries to unwind a function, if we are in the epilog by parsing the allowed opcodes.
by tkreuzer＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: tkreuzer Date: Thu Nov 20 15:55:44 2008 New Revision: 37492 URL: http://svn.reactos.org/svn/reactos?rev=37492&view=rev Log: Implement RtlpTryToUnwindEpilog, which tries to unwind a function, if we are in the epilog by parsing the allowed opcodes. Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Thu Nov 20 15:55:44 2008 @@ -163,10 +163,146 @@ void FORCEINLINE -SetReg(PCONTEXT Context, UCHAR Reg, ULONG64 Value) -{ - ((PULONG64)(&Context->Rax))[Reg] = Value; -} +SetReg(PCONTEXT Context, BYTE Reg, DWORD64 Value) +{ + ((DWORD64*)(&Context->Rax))[Reg] = Value; +} + +DWORD64 +FORCEINLINE +GetReg(PCONTEXT Context, BYTE Reg) +{ + return ((DWORD64*)(&Context->Rax))[Reg]; +} + +void +FORCEINLINE +PopReg(PCONTEXT Context, BYTE Reg) +{ + DWORD64 Value = *(DWORD64*)Context->Rsp; + Context->Rsp += 8; + SetReg(Context, Reg, Value); +} + +/* Helper function that tries to unwind epilog instructions. + * Returns TRUE we have been in an epilog and it could be unwound. + * FALSE if the instructions were not allowed for an epilog. + * References: + * http://msdn.microsoft.com/en-us/library/8ydc79k6(VS.80).aspx + * http://msdn.microsoft.com/en-us/library/tawsa7cb.aspx + * TODO: + * - Test and compare with Windows behaviour + */ +BOOLEAN +static +inline +RtlpTryToUnwindEpilog( + PCONTEXT Context, + ULONG64 ImageBase, + PRUNTIME_FUNCTION FunctionEntry) +{ + CONTEXT LocalContext; + BYTE *InstrPtr; + DWORD Instr; + BYTE Reg, Mod; + ULONG64 EndAddress; + + /* Make a local copy of the context */ + LocalContext = *Context; + + InstrPtr = (BYTE*)LocalContext.Rip; + + /* Check if first instruction of epilog is "add rsp, x" */ + Instr = *(DWORD*)InstrPtr; + if ( (Instr & 0x00fffdff) == 0x00c48148 ) + { + if ( (Instr & 0x0000ff00) == 0x8300 ) + { + /* This is "add rsp, 0x??" */ + LocalContext.Rsp += Instr >> 24; + InstrPtr += 4; + } + else + { + /* This is "add rsp, 0x???????? */ + LocalContext.Rsp += *(DWORD*)(InstrPtr + 3); + InstrPtr += 7; + } + } + /* Check if first instruction of epilog is "lea rsp, ..." */ + else if ( (Instr & 0x38fffe) == 0x208d48 ) + { + /* Get the register */ + Reg = ((Instr << 8) | (Instr >> 16)) & 0x7; + + LocalContext.Rsp = GetReg(&LocalContext, Reg); + + /* Get adressing mode */ + Mod = (Instr >> 22) & 0x3; + if (Mod == 0) + { + /* No displacement */ + InstrPtr += 3; + } + else if (Mod == 1) + { + /* 1 byte displacement */ + LocalContext.Rsp += Instr >> 24; + InstrPtr += 4; + } + else if (Mod == 2) + { + /* 4 bytes displacement */ + LocalContext.Rsp += *(DWORD*)(InstrPtr + 3); + InstrPtr += 7; + } + } + + /* Loop the following instructions */ + EndAddress = FunctionEntry->EndAddress + ImageBase; + while((DWORD64)InstrPtr < EndAddress) + { + Instr = *(DWORD*)InstrPtr; + + /* Check for a simple pop */ + if ( (Instr & 0xf8) == 0x58 ) + { + /* Opcode pops a basic register from stack */ + Reg = Instr & 0x7; + PopReg(&LocalContext, Reg); + InstrPtr++; + continue; + } + + /* Check for REX + pop */ + if ( (Instr & 0xf8fb) == 0x5841 ) + { + /* Opcode is pop r8 .. r15 */ + Reg = (Instr & 0x7) + 8; + PopReg(&LocalContext, Reg); + InstrPtr += 2; + continue; + } + + /* Check for retn / retf */ + if ( (Instr & 0xf7) == 0xc3 ) + { + /* We are finished */ + break; + } + + /* Opcode not allowed for Epilog */ + return FALSE; + } + + /* Unwind is finished, pop new Rip from Stack */ + LocalContext.Rip = *(DWORD64*)LocalContext.Rsp; + LocalContext.Rsp += sizeof(DWORD64); + + *Context = LocalContext; + return TRUE; +} + PEXCEPTION_ROUTINE NTAPI @@ -184,7 +320,7 @@ ULONG CodeOffset; ULONG i; UNWIND_CODE UnwindCode; - UCHAR Reg; + BYTE Reg; /* Use relative virtual address */ ControlPc -= ImageBase; @@ -201,6 +337,16 @@ /* Calculate relative offset to function start */ CodeOffset = ControlPc - FunctionEntry->BeginAddress; + + /* Check if we are in the function epilog and try to finish it */ + if (CodeOffset > UnwindInfo->SizeOfProlog) + { + if (RtlpTryToUnwindEpilog(Context, ImageBase, FunctionEntry)) + { + /* There's no exception routine */ + return NULL; + } + } /* Skip all Ops with an offset greater than the current Offset */ i = 0;

1 0

[ekohl] 37491: SySync to wine-1.1.1 (Patch 6 of 10): - Rob Shearman <robertshearman@gmail.com> Thu, 3 Jul 2008 widl: Consolidate top-level parameter conformance/variance expression writing into a separate function. Descend through as many pointer types as necessary to find the fundamental type and determine whether it needs a top-level parameter conformance/variance expression to be written. Add support for writing top-level parameter conformance/variance expressions for non-encapsulated unions.
by ekohl＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: ekohl Date: Thu Nov 20 14:37:09 2008 New Revision: 37491 URL: http://svn.reactos.org/svn/reactos?rev=37491&view=rev Log: SySync to wine-1.1.1 (Patch 6 of 10): - Rob Shearman <robertshearman(a)gmail.com> Thu, 3 Jul 2008 widl: Consolidate top-level parameter conformance/variance expression writing into a separate function. Descend through as many pointer types as necessary to find the fundamental type and determine whether it needs a top-level parameter conformance/variance expression to be written. Add support for writing top-level parameter conformance/variance expressions for non-encapsulated unions. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Thu Nov 20 14:37:09 2008 @@ -2770,7 +2770,7 @@ /* returns whether the MaxCount, Offset or ActualCount members need to be * filled in for the specified phase */ -static inline int is_size_needed_for_phase(enum remoting_phase phase) +static inline int is_conformance_needed_for_phase(enum remoting_phase phase) { return (phase != PHASE_UNMARSHAL); } @@ -2791,6 +2791,67 @@ } return x; +} + +static void write_parameter_conf_or_var_exprs(FILE *file, int indent, + enum remoting_phase phase, + const var_t *var) +{ + const type_t *type = var->type; + /* get fundamental type for the argument */ + for (;;) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + break; + else if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + break; + else if (is_array(type) || is_string_type(var->attrs, type)) + { + if (is_conformance_needed_for_phase(phase)) + { + if (type->size_is) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, type->size_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + if (type->length_is) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, type->length_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + } + break; + } + else if (type->type == RPC_FC_NON_ENCAPSULATED_UNION) + { + if (is_conformance_needed_for_phase(phase)) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, get_attrp(var->attrs, ATTR_SWITCHIS), 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + break; + } + else if (type->type == RPC_FC_IP) + { + expr_t *iid; + + if (is_conformance_needed_for_phase(phase) && (iid = get_attrp( var->attrs, ATTR_IIDIS ))) + { + print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); + write_expr( file, iid, 1, 1, NULL, NULL ); + fprintf( file, ";\n\n" ); + } + break; + } + else if (is_ptr(type)) + type = type->ref; + else + break; + } } static void write_remoting_arg(FILE *file, int indent, const func_t *func, @@ -2824,6 +2885,7 @@ break; } + write_parameter_conf_or_var_exprs(file, indent, phase, var); rtype = type->type; if (is_context_handle(type)) @@ -2879,13 +2941,6 @@ print_phase_function(file, indent, "NonConformantString", phase, var, start_offset); else { - if (type->size_is && is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n"); - } - if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type == RPC_FC_UP) print_phase_function(file, indent, "Pointer", phase, var, start_offset - (type->size_is ? 4 : 2)); @@ -2908,43 +2963,14 @@ if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) { - if (is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } array_type = "VaryingArray"; } else if (tc == RPC_FC_CARRAY) { - if (is_size_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } array_type = "ConformantArray"; } else if (tc == RPC_FC_CVARRAY || tc == RPC_FC_BOGUS_ARRAY) { - if (is_size_needed_for_phase(phase)) - { - if (type->size_is) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n"); - } - if (type->length_is) - { - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } - } array_type = (tc == RPC_FC_BOGUS_ARRAY ? "ComplexArray" : "ConformantVaryingArray"); @@ -3029,21 +3055,6 @@ } else { - expr_t *iid; - expr_t *sx = get_size_is_expr(type, var->name); - - if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) - { - print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); - write_expr( file, iid, 1, 1, NULL, NULL ); - fprintf( file, ";\n\n" ); - } - else if (sx) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long) "); - write_expr(file, sx, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } if (var->type->ref->type == RPC_FC_IP) print_phase_function(file, indent, "InterfacePointer", phase, var, start_offset); else

1 0

[fireball] 37490: - Upcase a search expression when calling RtlIsNameInExpression with case-insensitive option (a merge of 37263 from Pierre's branch with changed comments).
by fireball＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: fireball Date: Thu Nov 20 14:24:10 2008 New Revision: 37490 URL: http://svn.reactos.org/svn/reactos?rev=37490&view=rev Log: - Upcase a search expression when calling RtlIsNameInExpression with case-insensitive option (a merge of 37263 from Pierre's branch with changed comments). Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Thu Nov 20 14:24:10 2008 @@ -166,6 +166,7 @@ UNICODE_STRING TempString; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; PVOID Block; NTSTATUS Status; ULONG len; @@ -263,6 +264,13 @@ Record = (PDIR_RECORD)((ULONG_PTR)Record + Record->RecordLength); } + /* Upper case the expression for FsRtlIsNameInExpression */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", @@ -307,8 +315,8 @@ DPRINT("ShortName '%wZ'\n", &ShortName); - if (FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) + if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) { if (Parent && Parent->PathName) { @@ -347,6 +355,7 @@ DPRINT("FindFile: new Pathname %S, new Objectname %S, DirIndex %d\n", Fcb->PathName, Fcb->ObjectName, DirIndex); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return STATUS_SUCCESS; @@ -357,6 +366,7 @@ DirIndex++; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); if (pDirIndex) Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Thu Nov 20 14:24:10 2008 @@ -464,6 +464,7 @@ WCHAR ShortNameBuffer[13]; UNICODE_STRING ShortName; UNICODE_STRING LongName; + UNICODE_STRING FileToFindUpcase; BOOLEAN HasSpaces; GENERATE_NAME_CONTEXT NameContext; @@ -502,6 +503,14 @@ Offset = 0; BlockOffset = 0; Record = (PDIR_RECORD)Block; + + /* Upper case the expression for FsRtlIsNameInExpression */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFind, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + while(TRUE) { if (Record->RecordLength == 0) @@ -543,8 +552,8 @@ DPRINT("ShortName '%wZ'\n", &ShortName); - if (FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) + if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL)) { DPRINT("Match found, %S\n", Name); Status = CdfsMakeFCBFromDirEntry(DeviceExt, @@ -556,6 +565,7 @@ Offset, FoundFCB); + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return(Status); @@ -578,6 +588,7 @@ &Context, &Block)) { DPRINT("CcMapData() failed\n"); + RtlFreeUnicodeString(&FileToFindUpcase); return(STATUS_UNSUCCESSFUL); } Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); @@ -587,6 +598,7 @@ break; } + RtlFreeUnicodeString(&FileToFindUpcase); CcUnpinData(Context); return(STATUS_OBJECT_NAME_NOT_FOUND);

1 0

[ekohl] 37489: SySync to wine-1.1.1 (Patch 5 of 10): - Dan Hipschman <dsh@linux.ucla.edu> Tue, 1 Jul 2008 widl: Factor a small part of the grammar.
by ekohl＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: ekohl Date: Thu Nov 20 14:21:33 2008 New Revision: 37489 URL: http://svn.reactos.org/svn/reactos?rev=37489&view=rev Log: SySync to wine-1.1.1 (Patch 5 of 10): - Dan Hipschman <dsh(a)linux.ucla.edu> Tue, 1 Jul 2008 widl: Factor a small part of the grammar. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37…

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