Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[navaraf] 19442: Put the function type declarations at the right place. Patch by Brezenbak.

by navaraf＠svn.reactos.com

Put the function type declarations at the right place. Patch by Brezenbak. Modified: trunk/reactos/w32api/include/ddk/winddi.h _____ Modified: trunk/reactos/w32api/include/ddk/winddi.h --- trunk/reactos/w32api/include/ddk/winddi.h 2005-11-22 00:50:12 UTC (rev 19441) +++ trunk/reactos/w32api/include/ddk/winddi.h 2005-11-22 01:06:05 UTC (rev 19442) @@ -318,8 +318,8 @@ typedef struct _DRIVEROBJ *PDRIVEROBJ; -typedef BOOL APIENTRY CALLBACK -(*FREEOBJPROC)( +typedef BOOL +(APIENTRY CALLBACK *FREEOBJPROC)( IN PDRIVEROBJ pDriverObj); typedef struct _DRIVEROBJ { @@ -1103,7 +1103,7 @@ ULONG *pulXlate; } XLATEOBJ; -typedef VOID APIENTRY (CALLBACK *WNDOBJCHANGEPROC)( +typedef VOID (APIENTRY CALLBACK *WNDOBJCHANGEPROC)( IN WNDOBJ *pwo, IN FLONG fl); @@ -3516,14 +3516,14 @@ #define WOC_SPRITE_OVERLAP 0x00000080 #define WOC_SPRITE_NO_OVERLAP 0x00000100 -typedef VOID APIENTRY -(CALLBACK * WNDOBJCHANGEPROC)( +typedef VOID +(APIENTRY CALLBACK * WNDOBJCHANGEPROC)( WNDOBJ *pwo, FLONG fl); -typedef BOOL APIENTRY -(*PFN_DrvAlphaBlend)( +typedef BOOL +(APIENTRY *PFN_DrvAlphaBlend)( IN SURFOBJ *psoDest, IN SURFOBJ *psoSrc, IN CLIPOBJ *pco, @@ -3532,13 +3532,13 @@ IN RECTL *prclSrc, IN BLENDOBJ *pBlendObj); -typedef BOOL APIENTRY -(*PFN_DrvAssertMode)( +typedef BOOL +(APIENTRY *PFN_DrvAssertMode)( IN DHPDEV dhpdev, IN BOOL bEnable); -typedef BOOL APIENTRY -(*PFN_DrvBitBlt)( +typedef BOOL +(APIENTRY *PFN_DrvBitBlt)( IN SURFOBJ *psoTrg, IN SURFOBJ *psoSrc, IN SURFOBJ *psoMask, @@ -3551,13 +3551,13 @@ IN POINTL *pptlBrush, IN ROP4 rop4); -typedef VOID APIENTRY -(*PFN_DrvCompletePDEV)( +typedef VOID +(APIENTRY *PFN_DrvCompletePDEV)( IN DHPDEV dhpdev, IN HDEV hdev); -typedef BOOL APIENTRY -(*PFN_DrvCopyBits)( +typedef BOOL +(APIENTRY *PFN_DrvCopyBits)( IN SURFOBJ *psoDest, IN SURFOBJ *psoSrc, IN CLIPOBJ *pco, @@ -3565,53 +3565,53 @@ IN RECTL *prclDest, IN POINTL *pptlSrc); -typedef HBITMAP APIENTRY -(*PFN_DrvCreateDeviceBitmap)( +typedef HBITMAP +(APIENTRY *PFN_DrvCreateDeviceBitmap)( IN DHPDEV dhpdev, IN SIZEL sizl, IN ULONG iFormat); -typedef VOID APIENTRY -(*PFN_DrvDeleteDeviceBitmap)( +typedef VOID +(APIENTRY *PFN_DrvDeleteDeviceBitmap)( IN DHSURF dhsurf); -typedef HBITMAP APIENTRY -(*PFN_DrvDeriveSurface)( +typedef HBITMAP +(APIENTRY *PFN_DrvDeriveSurface)( DD_DIRECTDRAW_GLOBAL *pDirectDraw, DD_SURFACE_LOCAL *pSurface); -typedef LONG APIENTRY -(*PFN_DrvDescribePixelFormat)( +typedef LONG +(APIENTRY *PFN_DrvDescribePixelFormat)( IN DHPDEV dhpdev, IN LONG iPixelFormat, IN ULONG cjpfd, OUT PIXELFORMATDESCRIPTOR *ppfd); -typedef VOID APIENTRY -(*PFN_DrvDestroyFont)( +typedef VOID +(APIENTRY *PFN_DrvDestroyFont)( IN FONTOBJ *pfo); -typedef VOID APIENTRY -(*PFN_DrvDisableDriver)( +typedef VOID +(APIENTRY *PFN_DrvDisableDriver)( VOID); -typedef VOID APIENTRY -(*PFN_DrvDisablePDEV)( +typedef VOID +(APIENTRY *PFN_DrvDisablePDEV)( IN DHPDEV dhpdev); -typedef VOID APIENTRY -(*PFN_DrvDisableSurface)( +typedef VOID +(APIENTRY *PFN_DrvDisableSurface)( IN DHPDEV dhpdev); -typedef ULONG APIENTRY -(*PFN_DrvDitherColor)( +typedef ULONG +(APIENTRY *PFN_DrvDitherColor)( IN DHPDEV dhpdev, IN ULONG iMode, IN ULONG rgb, OUT ULONG *pul); -typedef ULONG APIENTRY -(*PFN_DrvDrawEscape)( +typedef ULONG +(APIENTRY *PFN_DrvDrawEscape)( IN SURFOBJ *pso, IN ULONG iEsc, IN CLIPOBJ *pco, @@ -3619,14 +3619,14 @@ IN ULONG cjIn, IN PVOID pvIn); -typedef BOOL APIENTRY -(*PFN_DrvEnableDriver)( +typedef BOOL +(APIENTRY *PFN_DrvEnableDriver)( IN ULONG iEngineVersion, IN ULONG cj, OUT DRVENABLEDATA *pded); #if 0 -typedef DHPDEV APIENTRY -(*PFN_DrvEnablePDEV)( +typedef DHPDEV +(APIENTRY *PFN_DrvEnablePDEV)( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, IN ULONG cPat, @@ -3639,17 +3639,17 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver); #endif -typedef HSURF APIENTRY -(*PFN_DrvEnableSurface)( +typedef HSURF +(APIENTRY *PFN_DrvEnableSurface)( IN DHPDEV dhpdev); -typedef BOOL APIENTRY -(*PFN_DrvEndDoc)( +typedef BOOL +(APIENTRY *PFN_DrvEndDoc)( IN SURFOBJ *pso, IN FLONG fl); -typedef ULONG APIENTRY -(*PFN_DrvEscape)( +typedef ULONG +(APIENTRY *PFN_DrvEscape)( IN SURFOBJ *pso, IN ULONG iEsc, IN ULONG cjIn, @@ -3657,8 +3657,8 @@ IN ULONG cjOut, OUT PVOID pvOut); -typedef BOOL APIENTRY -(*PFN_DrvFillPath)( +typedef BOOL +(APIENTRY *PFN_DrvFillPath)( IN SURFOBJ *pso, IN PATHOBJ *ppo, IN CLIPOBJ *pco, @@ -3667,8 +3667,8 @@ IN MIX mix, IN FLONG flOptions); -typedef ULONG APIENTRY -(*PFN_DrvFontManagement)( +typedef ULONG +(APIENTRY *PFN_DrvFontManagement)( IN SURFOBJ *pso, IN FONTOBJ *pfo, IN ULONG iMode, @@ -3677,29 +3677,29 @@ IN ULONG cjOut, OUT PVOID pvOut); -typedef VOID APIENTRY -(*PFN_DrvFree)( +typedef VOID +(APIENTRY *PFN_DrvFree)( IN PVOID pv, IN ULONG_PTR id); -typedef ULONG APIENTRY -(*PFN_DrvGetGlyphMode)( +typedef ULONG +(APIENTRY *PFN_DrvGetGlyphMode)( IN DHPDEV dhpdev, IN FONTOBJ *pfo); -typedef ULONG APIENTRY -(*PFN_DrvGetModes)( +typedef ULONG +(APIENTRY *PFN_DrvGetModes)( IN HANDLE hDriver, IN ULONG cjSize, OUT DEVMODEW *pdm); -typedef PVOID APIENTRY -(*PFN_DrvGetTrueTypeFile)( +typedef PVOID +(APIENTRY *PFN_DrvGetTrueTypeFile)( IN ULONG_PTR iFile, IN ULONG *pcj); -typedef BOOL APIENTRY -(*PFN_DrvGradientFill)( +typedef BOOL +(APIENTRY *PFN_DrvGradientFill)( IN SURFOBJ *psoDest, IN CLIPOBJ *pco, IN XLATEOBJ *pxlo, @@ -3711,15 +3711,15 @@ IN POINTL *pptlDitherOrg, IN ULONG ulMode); -typedef BOOL APIENTRY -(*PFN_DrvIcmCheckBitmapBits)( +typedef BOOL +(APIENTRY *PFN_DrvIcmCheckBitmapBits)( IN DHPDEV dhpdev, IN HANDLE hColorTransform, IN SURFOBJ *pso, OUT PBYTE paResults); -typedef HANDLE APIENTRY -(*PFN_DrvIcmCreateColorTransform)( +typedef HANDLE +(APIENTRY *PFN_DrvIcmCreateColorTransform)( IN DHPDEV dhpdev, IN LPLOGCOLORSPACEW pLogColorSpace, IN PVOID pvSourceProfile, @@ -3730,19 +3730,19 @@ IN ULONG cjTargetProfile, IN DWORD dwReserved); -typedef BOOL APIENTRY -(*PFN_DrvIcmDeleteColorTransform)( +typedef BOOL +(APIENTRY *PFN_DrvIcmDeleteColorTransform)( IN DHPDEV dhpdev, IN HANDLE hcmXform); -typedef BOOL APIENTRY -(*PFN_DrvIcmSetDeviceGammaRamp)( +typedef BOOL +(APIENTRY *PFN_DrvIcmSetDeviceGammaRamp)( IN DHPDEV dhpdev, IN ULONG iFormat, IN LPVOID lpRamp); -typedef BOOL APIENTRY -(*PFN_DrvLineTo)( +typedef BOOL +(APIENTRY *PFN_DrvLineTo)( SURFOBJ *pso, CLIPOBJ *pco, BRUSHOBJ *pbo, @@ -3753,8 +3753,8 @@ RECTL *prclBounds, MIX mix); -typedef ULONG_PTR APIENTRY -(*PFN_DrvLoadFontFile)( +typedef ULONG_PTR +(APIENTRY *PFN_DrvLoadFontFile)( ULONG cFiles, ULONG_PTR *piFile, PVOID *ppvView, @@ -3763,41 +3763,41 @@ ULONG ulLangID, ULONG ulFastCheckSum); -typedef VOID APIENTRY -(*PFN_DrvMovePointer)( +typedef VOID +(APIENTRY *PFN_DrvMovePointer)( IN SURFOBJ *pso, IN LONG x, IN LONG y, IN RECTL *prcl); -typedef BOOL APIENTRY -(*PFN_DrvNextBand)( +typedef BOOL +(APIENTRY *PFN_DrvNextBand)( IN SURFOBJ *pso, IN POINTL *pptl); -typedef VOID APIENTRY -(*PFN_DrvNotify)( +typedef VOID +(APIENTRY *PFN_DrvNotify)( IN SURFOBJ *pso, IN ULONG iType, IN PVOID pvData); -typedef BOOL APIENTRY -(*PFN_DrvOffset)( +typedef BOOL +(APIENTRY *PFN_DrvOffset)( IN SURFOBJ *pso, IN LONG x, IN LONG y, IN FLONG flReserved); -typedef BOOL APIENTRY -(*PFN_DrvPaint)( +typedef BOOL +(APIENTRY *PFN_DrvPaint)( IN SURFOBJ *pso, IN CLIPOBJ *pco, IN BRUSHOBJ *pbo, IN POINTL *pptlBrushOrg, IN MIX mix); -typedef BOOL APIENTRY -(*PFN_DrvPlgBlt)( +typedef BOOL +(APIENTRY *PFN_DrvPlgBlt)( IN SURFOBJ *psoTrg, IN SURFOBJ *psoSrc, IN SURFOBJ *psoMsk, @@ -3810,8 +3810,8 @@ IN POINTL *pptl, IN ULONG iMode); -typedef BOOL APIENTRY -(*PFN_DrvQueryAdvanceWidths)( +typedef BOOL +(APIENTRY *PFN_DrvQueryAdvanceWidths)( IN DHPDEV dhpdev, IN FONTOBJ *pfo, IN ULONG iMode, @@ -3819,8 +3819,8 @@ OUT PVOID pvWidths, IN ULONG cGlyphs); -typedef BOOL APIENTRY -(*PFN_DrvQueryDeviceSupport)( +typedef BOOL +(APIENTRY *PFN_DrvQueryDeviceSupport)( SURFOBJ *pso, XLATEOBJ *pxlo, XFORMOBJ *pxo, @@ -3830,27 +3830,27 @@ ULONG cjOut, PVOID pvOut); -typedef BOOL APIENTRY -(*PFN_DrvQueryDriverInfo)( +typedef BOOL +(APIENTRY *PFN_DrvQueryDriverInfo)( DWORD dwMode, PVOID pBuffer, DWORD cbBuf, PDWORD pcbNeeded); -typedef PIFIMETRICS APIENTRY -(*PFN_DrvQueryFont)( +typedef PIFIMETRICS +(APIENTRY *PFN_DrvQueryFont)( IN DHPDEV dhpdev, IN ULONG_PTR iFile, IN ULONG iFace, IN ULONG_PTR *pid); -typedef LONG APIENTRY -(*PFN_DrvQueryFontCaps)( +typedef LONG +(APIENTRY *PFN_DrvQueryFontCaps)( IN ULONG culCaps, OUT ULONG *pulCaps); -typedef LONG APIENTRY -(*PFN_DrvQueryFontData)( +typedef LONG +(APIENTRY *PFN_DrvQueryFontData)( IN DHPDEV dhpdev, IN FONTOBJ *pfo, IN ULONG iMode, @@ -3859,33 +3859,33 @@ IN OUT PVOID pv, IN ULONG cjSize); -typedef LONG APIENTRY -(*PFN_DrvQueryFontFile)( +typedef LONG +(APIENTRY *PFN_DrvQueryFontFile)( IN ULONG_PTR iFile, IN ULONG ulMode, IN ULONG cjBuf, IN ULONG *pulBuf); -typedef PVOID APIENTRY -(*PFN_DrvQueryFontTree)( +typedef PVOID +(APIENTRY *PFN_DrvQueryFontTree)( IN DHPDEV dhpdev, IN ULONG_PTR iFile, IN ULONG iFace, IN ULONG iMode, IN ULONG_PTR *pid); -typedef PFD_GLYPHATTR APIENTRY -(*PFN_DrvQueryGlyphAttrs)( +typedef PFD_GLYPHATTR +(APIENTRY *PFN_DrvQueryGlyphAttrs)( IN FONTOBJ *pfo, IN ULONG iMode); -typedef ULONG APIENTRY -(*PFN_DrvQueryPerBandInfo)( +typedef ULONG +(APIENTRY *PFN_DrvQueryPerBandInfo)( IN SURFOBJ *pso, IN OUT PERBANDINFO *pbi); -typedef LONG APIENTRY -(*PFN_DrvQueryTrueTypeOutline)( +typedef LONG +(APIENTRY *PFN_DrvQueryTrueTypeOutline)( IN DHPDEV dhpdev, IN FONTOBJ *pfo, IN HGLYPH hglyph, @@ -3894,8 +3894,8 @@ IN ULONG cjBuf, OUT TTPOLYGONHEADER *ppoly); -typedef LONG APIENTRY -(*PFN_DrvQueryTrueTypeTable)( +typedef LONG +(APIENTRY *PFN_DrvQueryTrueTypeTable)( IN ULONG_PTR iFile, IN ULONG ulFont, IN ULONG ulTag, @@ -3905,8 +3905,8 @@ OUT PBYTE *ppjTable, OUT ULONG *pcjTable); -typedef BOOL APIENTRY -(*PFN_DrvRealizeBrush)( +typedef BOOL +(APIENTRY *PFN_DrvRealizeBrush)( IN BRUSHOBJ *pbo, IN SURFOBJ *psoTarget, IN SURFOBJ *psoPattern, @@ -3914,43 +3914,43 @@ IN XLATEOBJ *pxlo, IN ULONG iHatch); -typedef ULONG APIENTRY -(*PFN_DrvResetDevice)( +typedef ULONG +(APIENTRY *PFN_DrvResetDevice)( IN DHPDEV dhpdev, IN PVOID Reserved); -typedef BOOL APIENTRY -(*PFN_DrvResetPDEV)( +typedef BOOL +(APIENTRY *PFN_DrvResetPDEV)( DHPDEV dhpdevOld, DHPDEV dhpdevNew); -typedef ULONG_PTR APIENTRY -(*PFN_DrvSaveScreenBits)( +typedef ULONG_PTR +(APIENTRY *PFN_DrvSaveScreenBits)( IN SURFOBJ *pso, IN ULONG iMode, IN ULONG_PTR ident, IN RECTL *prcl); -typedef BOOL APIENTRY -(*PFN_DrvSendPage)( +typedef BOOL +(APIENTRY *PFN_DrvSendPage)( IN SURFOBJ *pso); -typedef BOOL APIENTRY -(*PFN_DrvSetPalette)( +typedef BOOL +(APIENTRY *PFN_DrvSetPalette)( IN DHPDEV dhpdev, IN PALOBJ *ppalo, IN FLONG fl, IN ULONG iStart, IN ULONG cColors); -typedef BOOL APIENTRY -(*PFN_DrvSetPixelFormat)( +typedef BOOL +(APIENTRY *PFN_DrvSetPixelFormat)( IN SURFOBJ *pso, IN LONG iPixelFormat, IN HWND hwnd); -typedef ULONG APIENTRY -(*PFN_DrvSetPointerShape)( +typedef ULONG +(APIENTRY *PFN_DrvSetPointerShape)( IN SURFOBJ *pso, IN SURFOBJ *psoMask, IN SURFOBJ *psoColor, @@ -3962,23 +3962,23 @@ IN RECTL *prcl, IN FLONG fl); -typedef BOOL APIENTRY -(*PFN_DrvStartBanding)( +typedef BOOL +(APIENTRY *PFN_DrvStartBanding)( IN SURFOBJ *pso, IN POINTL *pptl); -typedef BOOL APIENTRY -(*PFN_DrvStartDoc)( +typedef BOOL +(APIENTRY *PFN_DrvStartDoc)( IN SURFOBJ *pso, IN LPWSTR pwszDocName, IN DWORD dwJobId); -typedef BOOL APIENTRY -(*PFN_DrvStartPage)( +typedef BOOL +(APIENTRY *PFN_DrvStartPage)( IN SURFOBJ *pso); -typedef BOOL APIENTRY -(*PFN_DrvStretchBlt)( +typedef BOOL +(APIENTRY *PFN_DrvStretchBlt)( IN SURFOBJ *psoDest, IN SURFOBJ *psoSrc, IN SURFOBJ *psoMask, @@ -3991,8 +3991,8 @@ IN POINTL *pptlMask, IN ULONG iMode); -typedef BOOL APIENTRY -(*PFN_DrvStretchBltROP)( +typedef BOOL +(APIENTRY *PFN_DrvStretchBltROP)( IN SURFOBJ *psoDest, IN SURFOBJ *psoSrc, IN SURFOBJ *psoMask, @@ -4007,8 +4007,8 @@ IN BRUSHOBJ *pbo, IN DWORD rop4); -typedef BOOL APIENTRY -(*PFN_DrvStrokeAndFillPath)( +typedef BOOL +(APIENTRY *PFN_DrvStrokeAndFillPath)( IN SURFOBJ *pso, IN PATHOBJ *ppo, IN CLIPOBJ *pco, @@ -4020,8 +4020,8 @@ IN MIX mixFill, IN FLONG flOptions); -typedef BOOL APIENTRY -(*PFN_DrvStrokePath)( +typedef BOOL +(APIENTRY *PFN_DrvStrokePath)( IN SURFOBJ *pso, IN PATHOBJ *ppo, IN CLIPOBJ *pco, @@ -4031,24 +4031,24 @@ IN LINEATTRS *plineattrs, IN MIX mix); -typedef BOOL APIENTRY -(*PFN_DrvSwapBuffers)( +typedef BOOL +(APIENTRY *PFN_DrvSwapBuffers)( IN SURFOBJ *pso, IN WNDOBJ *pwo); -typedef VOID APIENTRY -(*PFN_DrvSynchronize)( +typedef VOID +(APIENTRY *PFN_DrvSynchronize)( IN DHPDEV dhpdev, IN RECTL *prcl); -typedef VOID APIENTRY -(*PFN_DrvSynchronizeSurface)( +typedef VOID +(APIENTRY *PFN_DrvSynchronizeSurface)( IN SURFOBJ *pso, IN RECTL *prcl, IN FLONG fl); -typedef BOOL APIENTRY -(*PFN_DrvTextOut)( +typedef BOOL +(APIENTRY *PFN_DrvTextOut)( IN SURFOBJ *pso, IN STROBJ *pstro, IN FONTOBJ *pfo, @@ -4060,8 +4060,8 @@ IN POINTL *pptlOrg, IN MIX mix); -typedef BOOL APIENTRY -(*PFN_DrvTransparentBlt)( +typedef BOOL +(APIENTRY *PFN_DrvTransparentBlt)( IN SURFOBJ *psoDst, IN SURFOBJ *psoSrc, IN CLIPOBJ *pco, @@ -4071,8 +4071,8 @@ IN ULONG iTransColor, IN ULONG ulReserved); -typedef BOOL APIENTRY -(*PFN_DrvUnloadFontFile)( +typedef BOOL +(APIENTRY *PFN_DrvUnloadFontFile)( IN ULONG_PTR iFile);

18 years, 10 months

[ion] 19441: - Don't use STATIC

by ion＠svn.reactos.com

- Don't use STATIC Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-11-22 00:47:58 UTC (rev 19440) +++ trunk/reactos/lib/rtl/unicode.c 2005-11-22 00:50:12 UTC (rev 19441) @@ -1770,7 +1770,7 @@ RtlStringFromGUID (IN REFGUID Guid, OUT PUNICODE_STRING GuidString) { - STATIC CONST PWCHAR Hex = L"0123456789ABCDEF"; + static CONST PWCHAR Hex = L"0123456789ABCDEF"; WCHAR Buffer[40]; PWCHAR BufferPtr; ULONG i; _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-22 00:47:58 UTC (rev 19440) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-22 00:50:12 UTC (rev 19441) @@ -25,7 +25,7 @@ /* FUNCTIONS ***************************************************************/ -STATIC +static ULONG NTAPI ComputeUnicodeNameLength(IN PUNICODE_STRING UnicodeName) @@ -44,8 +44,7 @@ return NamesFound; } - -STATIC +static RTL_GENERIC_COMPARE_RESULTS NTAPI CompareUnicodeStrings(IN PUNICODE_STRING Prefix,

18 years, 10 months

[navaraf] 19440: Change some FS:x reading macros for better compatibility with MSVC compiler and move KeGetCurrentKPCR/KeGetCurrentPrcb from DDK into ntoskrnl.

by navaraf＠svn.reactos.com

Change some FS:x reading macros for better compatibility with MSVC compiler and move KeGetCurrentKPCR/KeGetCurrentPrcb from DDK into ntoskrnl. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-11-22 00:38:45 UTC (rev 19439) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-11-22 00:47:58 UTC (rev 19440) @@ -78,7 +78,7 @@ *ThreadKernelTime = Prcb->KernelTime + Prcb->UserTime; *TotalCpuTime = Prcb->CurrentThread->KernelTime; - *ProcessorNumber = KeGetCurrentKPCR()->Number; + *ProcessorNumber = KeGetCurrentProcessorNumber(); } /* _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-11-22 00:38:45 UTC (rev 19439) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-11-22 00:47:58 UTC (rev 19440) @@ -35,8 +35,8 @@ /* Assert only on "checked" version */ #ifndef NASSERT #ifdef CONFIG_SMP -#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->Number), DbgBreakPoint(); } -#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->Number), DbgBreakPoint(); } +#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber()), DbgBreakPoint(); } +#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber()), DbgBreakPoint(); } #else #define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } #define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-11-22 00:38:45 UTC (rev 19439) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-11-22 00:47:58 UTC (rev 19440) @@ -275,7 +275,39 @@ #error Unknown compiler for inline assembler #endif +static __inline struct _KPCR * KeGetCurrentKPCR( + VOID) +{ + ULONG Value; +#if defined(__GNUC__) + __asm__ __volatile__ ("movl %%fs:0x1C, %0\n\t" + : "=r" (Value) + : /* no inputs */ + ); +#elif defined(_MSC_VER) + __asm mov eax, fs:[1Ch] + __asm mov [Value], eax #endif + return (struct _KPCR *) Value; +} + +static __inline struct _KPRCB * KeGetCurrentPrcb( + VOID) +{ + ULONG Value; +#if defined(__GNUC__) + __asm__ __volatile__ ("movl %%fs:0x20, %0\n\t" + : "=r" (Value) + : /* no inputs */ + ); +#elif defined(_MSC_VER) + __asm mov eax, fs:[20h] + __asm mov [Value], eax +#endif + return (struct _KPRCB *) Value; +} + +#endif #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-11-22 00:38:45 UTC (rev 19439) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-11-22 00:47:58 UTC (rev 19440) @@ -1355,7 +1355,7 @@ if (Thread->State == Running) { - ProcessorMask = 1 << KeGetCurrentKPCR()->Number; + ProcessorMask = 1 << KeGetCurrentProcessorNumber(); if (Thread == KeGetCurrentThread()) { if (!(Affinity & ProcessorMask)) { _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-22 00:38:45 UTC (rev 19439) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-22 00:47:58 UTC (rev 19440) @@ -140,38 +140,6 @@ */ #define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) -static __inline struct _KPCR * KeGetCurrentKPCR( - VOID) -{ - ULONG Value; -#if defined(__GNUC__) - __asm__ __volatile__ ("movl %%fs:0x1C, %0\n\t" - : "=r" (Value) - : /* no inputs */ - ); -#elif defined(_MSC_VER) - __asm mov eax, fs:[1Ch] - __asm mov [Value], eax -#endif - return (struct _KPCR *) Value; -} - -static __inline struct _KPRCB * KeGetCurrentPrcb( - VOID) -{ - ULONG Value; -#if defined(__GNUC__) - __asm__ __volatile__ ("movl %%fs:0x20, %0\n\t" - : "=r" (Value) - : /* no inputs */ - ); -#elif defined(_MSC_VER) - __asm mov eax, fs:[20h] - __asm mov [Value], eax -#endif - return (struct _KPRCB *) Value; -} - /* ** Simple structures */ @@ -179,7 +147,6 @@ typedef LONG KPRIORITY; typedef UCHAR KIRQL, *PKIRQL; typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; -typedef ULONG KAFFINITY, *PKAFFINITY; typedef UCHAR KPROCESSOR_MODE; typedef enum _MODE { @@ -4976,13 +4943,29 @@ KeGetCurrentIrql( VOID); -/* - * ULONG - * KeGetCurrentProcessorNumber( - * VOID) - */ -#define KeGetCurrentProcessorNumber() \ - ((ULONG)KeGetCurrentKPCR()->Number) +static __inline +ULONG +DDKAPI +KeGetCurrentProcessorNumber(VOID) +{ +#if defined(__GNUC__) + ULONG ret; + __asm__ __volatile__ ( + "movl %%fs:%c1, %0\n" + : "=r" (ret) + : "i" (FIELD_OFFSET(KPCR, Number)) + ); + return ret; +#elif defined(_MSC_VER) +#if _MSC_FULL_VER >= 13012035 + return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); +#else + __asm { movzx eax, _PCR KPCR.Number } +#endif +#else +#error Unknown compiler +#endif +} #if !defined(__INTERLOCKED_DECLARED) #define __INTERLOCKED_DECLARED @@ -8419,6 +8402,8 @@ KeLeaveCriticalRegion( VOID); +#ifdef _X86_ + static __inline VOID KeMemoryBarrier( @@ -8432,6 +8417,8 @@ #endif } +#endif + NTOSAPI LONG DDKAPI _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-11-22 00:38:45 UTC (rev 19439) +++ trunk/reactos/w32api/include/winnt.h 2005-11-22 00:47:58 UTC (rev 19440) @@ -3609,6 +3609,16 @@ #elif defined(_MSC_VER) +#if (_MSC_FULL_VER >= 13012035) + +DWORD __readfsdword(DWORD); +#pragma intrinsic(__readfsdword) + +__inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } +__inline struct _TEB * NtCurrentTeb(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x18); } + +#else + static __inline PVOID GetCurrentFiber(void) { PVOID p; @@ -3625,6 +3635,8 @@ return p; } +#endif /* _MSC_FULL_VER */ + #endif /* __GNUC__/__WATCOMC__/_MSC_VER */ static __inline PVOID GetFiberData(void)

18 years, 10 months

[navaraf] 19439: Fix compilation.

by navaraf＠svn.reactos.com

Fix compilation. Modified: trunk/reactos/drivers/dd/sndblst/sbdebug.h _____ Modified: trunk/reactos/drivers/dd/sndblst/sbdebug.h --- trunk/reactos/drivers/dd/sndblst/sbdebug.h 2005-11-22 00:34:46 UTC (rev 19438) +++ trunk/reactos/drivers/dd/sndblst/sbdebug.h 2005-11-22 00:38:45 UTC (rev 19439) @@ -3,19 +3,19 @@ if (! NT_SUCCESS(s)) \ { \ if (s == STATUS_NO_MORE_ENTRIES) \ - DPRINT("NTSTATUS == NO MORE ENTRIES\n") \ + DPRINT("NTSTATUS == NO MORE ENTRIES\n"); \ else if (s == STATUS_BUFFER_OVERFLOW) \ - DPRINT("NTSTATUS == BUFFER OVERFLOW\n") \ + DPRINT("NTSTATUS == BUFFER OVERFLOW\n"); \ else if (s == STATUS_BUFFER_TOO_SMALL) \ - DPRINT("NTSTATUS == BUFFER TOO SMALL\n") \ + DPRINT("NTSTATUS == BUFFER TOO SMALL\n"); \ else if (s == STATUS_INVALID_PARAMETER) \ - DPRINT("NTSTATUS == INVALID PARAMETER\n") \ + DPRINT("NTSTATUS == INVALID PARAMETER\n"); \ else if (s == STATUS_OBJECT_NAME_NOT_FOUND) \ - DPRINT("NTSTATUS == OBJECT NAME NOT FOUND\n") \ + DPRINT("NTSTATUS == OBJECT NAME NOT FOUND\n"); \ else if (s == STATUS_INVALID_HANDLE) \ - DPRINT("NTATATUS == INVALID_HANDLE\n") \ + DPRINT("NTATATUS == INVALID_HANDLE\n"); \ else if (s == STATUS_ACCESS_DENIED) \ - DPRINT("NTSTATUS == ACCESS_DENIED\n") \ + DPRINT("NTSTATUS == ACCESS_DENIED\n"); \ else \ DPRINT("NTSTATUS == FAILURE (Unknown)\n"); \ }

18 years, 10 months

[navaraf] 19438: Change the FS read/write functions to macros and use constant addressing instead of register.

by navaraf＠svn.reactos.com

Change the FS read/write functions to macros and use constant addressing instead of register. Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/mp/mpsirql.c _____ Modified: trunk/reactos/hal/halx86/include/halp.h --- trunk/reactos/hal/halx86/include/halp.h 2005-11-22 00:29:22 UTC (rev 19437) +++ trunk/reactos/hal/halx86/include/halp.h 2005-11-22 00:34:46 UTC (rev 19438) @@ -60,22 +60,12 @@ #define Ki386DisableInterrupts() __asm__ __volatile__("cli\n\t") #define Ki386EnableInterrupts() __asm__ __volatile__("sti\n\t") #define Ki386HaltProcessor() __asm__ __volatile__("hlt\n\t") -#define Ki386RdTSC(x) __asm__ __volatile__("rdtsc\n\t" : "=A" (x.u.LowPart), "=d" (x.u.HighPart)); +#define Ki386RdTSC(x) __asm__ __volatile__("rdtsc\n\t" : "=A" (x.u.LowPart), "=d" (x.u.HighPart)) #define Ki386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) #define Ki386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) +#define Ki386ReadFsByte(offset,x) __asm__ __volatile__("movb %%fs:%c1,%0" : "=q" (x) : "i" (offset)) +#define Ki386WriteFsByte(offset,x) __asm__ __volatile__("movb %0,%%fs:%c1" : : "q" ((UCHAR)x), "i" (offset)) -static inline BYTE Ki386ReadFsByte(ULONG offset) -{ - BYTE b; - __asm__ __volatile__("movb %%fs:(%1),%0":"=q" (b):"r" (offset)); - return b; -} - -static inline VOID Ki386WriteFsByte(ULONG offset, BYTE value) -{ - __asm__ __volatile__("movb %0,%%fs:(%1)"::"q" (value), "r" (offset)); -} - #elif defined(_MSC_VER) #define Ki386SaveFlags(x) __asm pushfd __asm pop x; #define Ki386RestoreFlags(x) __asm push x __asm popfd; _____ Modified: trunk/reactos/hal/halx86/mp/mpsirql.c --- trunk/reactos/hal/halx86/mp/mpsirql.c 2005-11-22 00:29:22 UTC (rev 19437) +++ trunk/reactos/hal/halx86/mp/mpsirql.c 2005-11-22 00:34:46 UTC (rev 19438) @@ -33,7 +33,7 @@ Ki386SaveFlags(Flags); Ki386DisableInterrupts(); - irql = Ki386ReadFsByte(FIELD_OFFSET(KPCR, Irql)); + Ki386ReadFsByte(FIELD_OFFSET(KPCR, Irql), irql); if (irql > HIGH_LEVEL) { DPRINT1 ("CurrentIrql %x\n", irql); @@ -72,6 +72,7 @@ HalpLowerIrql(KIRQL NewIrql, BOOL FromHalEndSystemInterrupt) { ULONG Flags; + UCHAR DpcRequested; if (NewIrql >= DISPATCH_LEVEL) { KeSetCurrentIrql (NewIrql); @@ -83,7 +84,8 @@ { KeSetCurrentIrql (DISPATCH_LEVEL); APICWrite(APIC_TPR, IRQL2TPR (DISPATCH_LEVEL) & APIC_TPR_PRI); - if (FromHalEndSystemInterrupt || Ki386ReadFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]))) + Ki386ReadFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), DpcRequested); + if (FromHalEndSystemInterrupt || DpcRequested) { Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); Ki386EnableInterrupts();

18 years, 10 months

[navaraf] 19437: Fix some registry structures to match the Windows format.

by navaraf＠svn.reactos.com

Fix some registry structures to match the Windows format. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/ntoskrnl/cm/cm.h Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/tools/mkhive/binhive.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-22 00:16:37 UTC (rev 19436) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-22 00:29:22 UTC (rev 19437) @@ -57,19 +57,20 @@ ULONG UpdateCounter2; /* When this hive file was last modified */ - ULONGLONG DateModified; /* FILETIME */ + ULONGLONG DateModified; - /* Registry format version ? (1?) */ - ULONG Unused3; + /* Registry format major version (1) */ + ULONG MajorVersion; - /* Registry format version ? (3?) */ - ULONG Unused4; + /* Registry format minor version (3) + Version 3 added fast indexes, version 5 has large value optimizations */ + ULONG MinorVersion; - /* Registry format version ? (0?) */ - ULONG Unused5; + /* Registry file type (0 - Primary, 1 - Log) */ + ULONG Type; - /* Registry format version ? (1?) */ - ULONG Unused6; + /* Registry format (1 is the only defined value so far) */ + ULONG Format; /* Offset into file from the byte after the end of the base block. If the hive is volatile, this is the actual pointer to the KEY_CELL */ @@ -82,10 +83,9 @@ ULONG Unused7; /* Name of hive file */ - WCHAR FileName[64]; + WCHAR FileName[48]; - /* ? */ - ULONG Unused8[83]; + ULONG Reserved[99]; /* Checksum of first 0x200 bytes */ ULONG Checksum; @@ -97,20 +97,19 @@ /* Bin identifier "hbin" (0x6E696268) */ ULONG HeaderId; - /* Bin offset */ + /* Block offset of this bin */ BLOCK_OFFSET BinOffset; /* Size in bytes, multiple of the block size (4KB) */ ULONG BinSize; - /* ? */ - ULONG Unused1; + ULONG Reserved[2]; /* When this bin was last modified */ - ULONGLONG DateModified; /* FILETIME */ + ULONGLONG DateModified; - /* ? */ - ULONG Unused2; + /* ? (In-memory only) */ + ULONG MemAlloc; } __attribute__((packed)) HBIN, *PHBIN; @@ -298,15 +297,14 @@ Header->BlockId = REG_HIVE_ID; Header->UpdateCounter1 = 0; Header->UpdateCounter2 = 0; - Header->DateModified = 0ULL; - Header->Unused3 = 1; - Header->Unused4 = 3; - Header->Unused5 = 0; - Header->Unused6 = 1; + Header->DateModified = 0; + Header->MajorVersion = 1; + Header->MinorVersion = 3; + Header->Type = 0; + Header->Format = 1; Header->Unused7 = 1; Header->RootKeyOffset = -1; Header->BlockSize = REG_BLOCK_SIZE; - Header->Unused6 = 1; Header->Checksum = 0; } @@ -717,9 +715,8 @@ tmpBin->BinOffset = RegistryHive->FileSize - REG_BLOCK_SIZE; RegistryHive->FileSize += BinSize; tmpBin->BinSize = BinSize; - tmpBin->Unused1 = 0; tmpBin->DateModified = 0ULL; - tmpBin->Unused2 = 0; + tmpBin->MemAlloc = 0; /* Increase size of list of blocks */ BlockList = MmAllocateMemory (sizeof(PHBIN) * (RegistryHive->BlockListSize + BlockCount)); _____ Modified: trunk/reactos/ntoskrnl/cm/cm.h --- trunk/reactos/ntoskrnl/cm/cm.h 2005-11-22 00:16:37 UTC (rev 19436) +++ trunk/reactos/ntoskrnl/cm/cm.h 2005-11-22 00:29:22 UTC (rev 19437) @@ -70,17 +70,18 @@ /* When this hive file was last modified */ LARGE_INTEGER DateModified; - /* Registry format version ? (1?) */ - ULONG Unused3; + /* Registry format major version (1) */ + ULONG MajorVersion; - /* Registry format version ? (3?) */ - ULONG Unused4; + /* Registry format minor version (3) + Version 3 added fast indexes, version 5 has large value optimizations */ + ULONG MinorVersion; - /* Registry format version ? (0?) */ - ULONG Unused5; + /* Registry file type (0 - Primary, 1 - Log) */ + ULONG Type; - /* Registry format version ? (1?) */ - ULONG Unused6; + /* Registry format (1 is the only defined value so far) */ + ULONG Format; /* Offset into file from the byte after the end of the base block. If the hive is volatile, this is the actual pointer to the KEY_CELL */ @@ -93,10 +94,9 @@ ULONG Unused7; /* Name of hive file */ - WCHAR FileName[64]; + WCHAR FileName[48]; - /* ? */ - ULONG Unused8[83]; + ULONG Reserved[99]; /* Checksum of first 0x200 bytes */ ULONG Checksum; @@ -113,14 +113,13 @@ /* Size in bytes, multiple of the block size (4KB) */ ULONG BinSize; - /* ? */ - ULONG Unused1; + ULONG Reserved[2]; /* When this bin was last modified */ LARGE_INTEGER DateModified; - /* ? */ - ULONG Unused2; + /* ? (In-memory only) */ + ULONG MemAlloc; } HBIN, *PHBIN; typedef struct _CELL_HEADER _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-22 00:16:37 UTC (rev 19436) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-11-22 00:29:22 UTC (rev 19437) @@ -39,14 +39,13 @@ Header->UpdateCounter2 = 0; Header->DateModified.u.LowPart = 0; Header->DateModified.u.HighPart = 0; - Header->Unused3 = 1; - Header->Unused4 = 3; - Header->Unused5 = 0; - Header->Unused6 = 1; + Header->MajorVersion = 1; + Header->MinorVersion = 3; + Header->Type = 0; + Header->Format = 1; Header->Unused7 = 1; Header->RootKeyOffset = (BLOCK_OFFSET)-1; Header->BlockSize = REG_BLOCK_SIZE; - Header->Unused6 = 1; Header->Checksum = 0; } @@ -297,32 +296,32 @@ ASSERT(Header->BlockId == REG_HIVE_ID); } - if (Header->Unused3 != 1) + if (Header->MajorVersion != 1) { - DbgPrint("Unused3 is %.08x (must be 1)\n", - Header->Unused3); - ASSERT(Header->Unused3 == 1); + DbgPrint("MajorVersion is %.08x (must be 1)\n", + Header->MajorVersion); + ASSERT(Header->MajorVersion == 1); } - if (Header->Unused4 != 3) + if (Header->MinorVersion != 3) { - DbgPrint("Unused4 is %.08x (must be 3)\n", - Header->Unused4); - ASSERT(Header->Unused4 == 3); + DbgPrint("MinorVersion is %.08x (must be 3)\n", + Header->MajorVersion); + ASSERT(Header->MajorVersion == 3); } - if (Header->Unused5 != 0) + if (Header->Type != 0) { - DbgPrint("Unused5 is %.08x (must be 0)\n", - Header->Unused5); - ASSERT(Header->Unused5 == 0); + DbgPrint("Type is %.08x (must be 0)\n", + Header->Type); + ASSERT(Header->Type == 0); } - if (Header->Unused6 != 1) + if (Header->Format != 1) { - DbgPrint("Unused6 is %.08x (must be 1)\n", - Header->Unused6); - ASSERT(Header->Unused6 == 1); + DbgPrint("Format is %.08x (must be 1)\n", + Header->Format); + ASSERT(Header->Format == 1); } if (Header->Unused7 != 1) @@ -3252,9 +3251,8 @@ tmpBin->BinOffset = RegistryHive->FileSize - REG_BLOCK_SIZE; RegistryHive->FileSize += BinSize; tmpBin->BinSize = BinSize; - tmpBin->Unused1 = 0; KeQuerySystemTime(&tmpBin->DateModified); - tmpBin->Unused2 = 0; + tmpBin->MemAlloc = 0; DPRINT (" BinOffset %lx BinSize %lx\n", tmpBin->BinOffset,tmpBin->BinSize); _____ Modified: trunk/reactos/tools/mkhive/binhive.c --- trunk/reactos/tools/mkhive/binhive.c 2005-11-22 00:16:37 UTC (rev 19436) +++ trunk/reactos/tools/mkhive/binhive.c 2005-11-22 00:29:22 UTC (rev 19437) @@ -83,17 +83,18 @@ /* When this hive file was last modified */ FILETIME DateModified; - /* Registry format version ? (1?) */ - ULONG Unused3; + /* Registry format major version (1) */ + ULONG MajorVersion; - /* Registry format version ? (3?) */ - ULONG Unused4; + /* Registry format minor version (3) + Version 3 added fast indexes, version 5 has large value optimizations */ + ULONG MinorVersion; - /* Registry format version ? (0?) */ - ULONG Unused5; + /* Registry file type (0 - Primary, 1 - Log) */ + ULONG Type; - /* Registry format version ? (1?) */ - ULONG Unused6; + /* Registry format (1 is the only defined value so far) */ + ULONG Format; /* Offset into file from the byte after the end of the base block. If the hive is volatile, this is the actual pointer to the KEY_CELL */ @@ -106,10 +107,9 @@ ULONG Unused7; /* Name of hive file */ - WCHAR FileName[64]; + WCHAR FileName[48]; - /* ? */ - ULONG Unused8[83]; + ULONG Reserved[99]; /* Checksum of first 0x200 bytes */ ULONG Checksum; @@ -126,14 +126,13 @@ /* Size in bytes, multiple of the block size (4KB) */ ULONG BinSize; - /* ? */ - ULONG Unused1; + ULONG Reserved[2]; /* When this bin was last modified */ FILETIME DateModified; - /* ? */ - ULONG Unused2; + /* ? (In-memory only) */ + ULONG MemAlloc; } GCC_PACKED HBIN, *PHBIN; typedef struct _CELL_HEADER @@ -292,14 +291,13 @@ Header->UpdateCounter1 = 0; Header->UpdateCounter2 = 0; Header->DateModified = 0; - Header->Unused3 = 1; - Header->Unused4 = 3; - Header->Unused5 = 0; - Header->Unused6 = 1; + Header->MajorVersion = 1; + Header->MinorVersion = 3; + Header->Type = 0; + Header->Format = 1; Header->Unused7 = 1; Header->RootKeyOffset = -1; Header->BlockSize = REG_BLOCK_SIZE; - Header->Unused6 = 1; Header->Checksum = 0; } @@ -736,9 +734,8 @@ tmpBin->BinOffset = RegistryHive->FileSize - REG_BLOCK_SIZE; RegistryHive->FileSize += BinSize; tmpBin->BinSize = BinSize; - tmpBin->Unused1 = 0; tmpBin->DateModified = 0; - tmpBin->Unused2 = 0; + tmpBin->MemAlloc = 0; /* Increase size of list of blocks */ tmpBlockList = malloc (sizeof(PHBIN) * (RegistryHive->BlockListSize + BlockCount));

18 years, 10 months

[navaraf] 19436: Use a standard header instead of redefining size_t.

by navaraf＠svn.reactos.com

Use a standard header instead of redefining size_t. Modified: trunk/reactos/lib/rtl/qsort.c _____ Modified: trunk/reactos/lib/rtl/qsort.c --- trunk/reactos/lib/rtl/qsort.c 2005-11-22 00:15:47 UTC (rev 19435) +++ trunk/reactos/lib/rtl/qsort.c 2005-11-22 00:16:37 UTC (rev 19436) @@ -38,6 +38,8 @@ * PROGRAMMER: Adapted from CygWin newlib 2000-03-12. */ +#include <stddef.h> + #ifndef __GNUC__ #define inline #endif @@ -45,7 +47,6 @@ /* FIXME: these types should be from the default includes */ typedef int (* _pfunccmp_t) (char *, char *); -typedef int size_t; #define min(a,b) ((a)<(b)?(a):(b))

18 years, 10 months

[navaraf] 19435: Fix a typo.

by navaraf＠svn.reactos.com

Fix a typo. Modified: trunk/reactos/lib/kernel32/debug/debugger.c _____ Modified: trunk/reactos/lib/kernel32/debug/debugger.c --- trunk/reactos/lib/kernel32/debug/debugger.c 2005-11-22 00:05:23 UTC (rev 19434) +++ trunk/reactos/lib/kernel32/debug/debugger.c 2005-11-22 00:15:47 UTC (rev 19435) @@ -77,7 +77,7 @@ /* * NOTE: I'm not sure if the function is complete. * - * @unmplemented + * @unimplemented */ BOOL WINAPI

18 years, 10 months

[ion] 19434: - Remove usage of STATIC, and use static in the right place.

by ion＠svn.reactos.com

- Remove usage of STATIC, and use static in the right place. Modified: trunk/reactos/lib/kernel32/file/bintype.c Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/synch/event.c Modified: trunk/reactos/lib/user32/controls/scrollbar.c Modified: trunk/reactos/lib/user32/windows/bitmap.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/lib/user32/windows/message.c Modified: trunk/reactos/lib/user32/windows/window.c _____ Modified: trunk/reactos/lib/kernel32/file/bintype.c --- trunk/reactos/lib/kernel32/file/bintype.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/file/bintype.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -17,7 +17,6 @@ #define NDEBUG #include "../include/debug.h" - /* FUNCTIONS ****************************************************************/ /* Check whether a file is an OS/2 or a very old Windows executable @@ -26,7 +25,7 @@ * FIXME: is reading the module imports the only way of discerning * old Windows binaries from OS/2 ones ? At least it seems so... */ -STATIC DWORD STDCALL +static DWORD STDCALL InternalIsOS2OrOldWin(HANDLE hFile, IMAGE_DOS_HEADER *mz, IMAGE_OS2_HEADER *ne) { DWORD CurPos; @@ -78,7 +77,7 @@ return Ret; } -STATIC DWORD STDCALL +static DWORD STDCALL InternalGetBinaryType(HANDLE hFile) { union _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -2898,7 +2898,7 @@ } -BOOL STATIC +static BOOL AddConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) { if (HandlerRoutine == NULL) @@ -2932,7 +2932,7 @@ } -BOOL STATIC +static BOOL RemoveConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine) { ULONG i; _____ Modified: trunk/reactos/lib/kernel32/synch/event.c --- trunk/reactos/lib/kernel32/synch/event.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/kernel32/synch/event.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -90,7 +90,7 @@ } Status = NtCreateEvent(&hEvent, - STANDARD_RIGHTS_ALL | EVENT_READ_ACCESS | EVENT_WRITE_ACCESS, + EVENT_ALL_ACCESS, &ObjectAttributes, (bManualReset ? NotificationEvent : SynchronizationEvent), bInitialState); _____ Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -210,7 +210,7 @@ SelectObject(hDC, hSaveBrush); } -STATIC VOID FASTCALL +static VOID FASTCALL IntDrawScrollArrows(HDC hDC, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { RECT RectLT, RectRB; @@ -253,7 +253,7 @@ DrawFrameControl(hDC, &RectRB, DFC_SCROLL, ScrollDirFlagRB); } -STATIC VOID FASTCALL +static VOID FASTCALL IntScrollDrawMovingThumb(HDC Dc, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical) { INT Pos = ScrollTrackingPos; @@ -291,7 +291,7 @@ ScrollMovingThumb = ! ScrollMovingThumb; } -STATIC LONG FASTCALL +static LONG FASTCALL IntScrollGetObjectId(INT SBType) { if (SB_VERT == SBType) @@ -306,7 +306,7 @@ return OBJID_CLIENT; } -STATIC BOOL FASTCALL +static BOOL FASTCALL IntGetScrollBarInfo(HWND Wnd, INT Bar, PSCROLLBARINFO ScrollBarInfo) { ScrollBarInfo->cbSize = sizeof(SCROLLBARINFO); @@ -382,7 +382,7 @@ } } -STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollPtInRectEx(LPRECT Rect, POINT Pt, BOOL Vertical) { RECT TempRect = *Rect; @@ -400,7 +400,7 @@ return PtInRect(&TempRect, Pt); } -STATIC DWORD FASTCALL +static DWORD FASTCALL IntScrollHitTest(PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, POINT Pt, BOOL Dragging) { INT ArrowSize, ThumbSize, ThumbPos; @@ -479,7 +479,7 @@ * relative to the left or to the top. * Return TRUE if the scrollbar is vertical, FALSE if horizontal. */ -STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollGetScrollBarRect(HWND Wnd, INT Bar, RECT *Rect, INT *ArrowSize, INT *ThumbSize, INT *ThumbPos) @@ -629,7 +629,7 @@ * Compute the current scroll position based on the thumb position in pixels * from the top of the scroll-bar. */ -STATIC UINT FASTCALL +static UINT FASTCALL IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, INT Pos) { @@ -676,7 +676,7 @@ /*********************************************************************** * IntScrollClipPos */ -STATIC POINT IntScrollClipPos(PRECT Rect, POINT Pt) +static POINT IntScrollClipPos(PRECT Rect, POINT Pt) { if (Pt.x < Rect->left) { @@ -704,7 +704,7 @@ * * Draw the size grip. */ -STATIC void FASTCALL +static void FASTCALL IntScrollDrawSizeGrip(HWND Wnd, HDC Dc) { RECT Rect; @@ -723,7 +723,7 @@ * * Handle a keyboard event (only for SB_CTL scrollbars with focus). */ -STATIC void FASTCALL +static void FASTCALL IntScrollHandleKbdEvent( HWND Wnd /* [in] Handle of window with scrollbar(s) */, WPARAM wParam /* [in] Variable input including enable state */, @@ -778,7 +778,7 @@ * Handle a mouse or timer event for the scrollbar. * 'Pt' is the location of the mouse event in drawing coordinates */ -STATIC VOID FASTCALL +static VOID FASTCALL IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) { static POINT PrevPt; /* Previous mouse position for timer events */ @@ -1136,7 +1136,7 @@ } } -STATIC INT FASTCALL +static INT FASTCALL IntScrollGetScrollPos(HWND Wnd, INT Bar) { SCROLLINFO ScrollInfo; @@ -1151,7 +1151,7 @@ return ScrollInfo.nPos; } -STATIC BOOL FASTCALL +static BOOL FASTCALL IntScrollGetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos) { BOOL Result; _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/bitmap.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -70,7 +70,7 @@ } -HANDLE STATIC +static HANDLE LoadCursorImage(HINSTANCE hinst, LPCWSTR lpszName, UINT fuLoad) { HANDLE hResource; @@ -249,7 +249,7 @@ } -HANDLE STATIC +static HANDLE LoadIconImage(HINSTANCE hinst, LPCWSTR lpszName, INT width, INT height, UINT fuLoad) { HANDLE hResource; @@ -443,7 +443,7 @@ } -HANDLE STATIC +static HANDLE LoadBitmapImage(HINSTANCE hInstance, LPCWSTR lpszName, UINT fuLoad) { HANDLE hResource; _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -366,7 +366,7 @@ #define ON_BOTTOM_BORDER(hit) \ (((hit) == HTBOTTOM) || ((hit) == HTBOTTOMLEFT) || ((hit) == HTBOTTOMRIGHT)) -VOID STATIC +static VOID UserDrawWindowFrame(HDC hdc, const RECT *rect, ULONG width, ULONG height) { @@ -394,7 +394,7 @@ SelectObject( hdc, hbrush ); } -VOID STATIC +static VOID UserDrawMovingFrame(HDC hdc, RECT *rect, BOOL thickframe) { if(thickframe) @@ -407,7 +407,7 @@ } } -VOID STATIC +static VOID DefWndDoSizeMove(HWND hwnd, WORD wParam) { HRGN DesktopRgn; @@ -723,7 +723,7 @@ * * Track a mouse button press on the horizontal or vertical scroll-bar. */ -STATIC VOID +static VOID DefWndTrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt) { INT ScrollBar; _____ Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/hook.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -139,7 +139,7 @@ return NtUserCallNextHookEx(Hook, Code, wParam, lParam); } -STATIC +static HHOOK FASTCALL IntSetWindowsHook( _____ Modified: trunk/reactos/lib/user32/windows/message.c --- trunk/reactos/lib/user32/windows/message.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/message.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -963,7 +963,7 @@ } } -STATIC LRESULT FASTCALL +static LRESULT FASTCALL IntCallWindowProcA(BOOL IsAnsiProc, WNDPROC WndProc, HWND hWnd, _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-11-21 22:56:09 UTC (rev 19433) +++ trunk/reactos/lib/user32/windows/window.c 2005-11-22 00:05:23 UTC (rev 19434) @@ -379,9 +379,8 @@ return NtUserGetForegroundWindow(); } - +static BOOL -STATIC User32EnumWindows ( HDESK hDesktop, HWND hWndparent,

18 years, 10 months

[jimtabor] 19433: Removed ActCtx.c.

by jimtabor＠svn.reactos.com

Removed ActCtx.c. Deleted: trunk/reactos/lib/kernel32/misc/ActCtx.c _____ Deleted: trunk/reactos/lib/kernel32/misc/ActCtx.c --- trunk/reactos/lib/kernel32/misc/ActCtx.c 2005-11-21 22:53:25 UTC (rev 19432) +++ trunk/reactos/lib/kernel32/misc/ActCtx.c 2005-11-21 22:56:09 UTC (rev 19433) @@ -1,96 +0,0 @@ -#include <k32.h> - -#define NDEBUG -#include "../include/debug.h" - -/* - * @implemented - */ -BOOL -STDCALL -FindActCtxSectionStringA( - DWORD dwFlags, - const GUID *lpExtensionGuid, - ULONG ulSectionId, - LPCSTR lpStringToFind, - PACTCTX_SECTION_KEYED_DATA ReturnedData - ) -{ - BOOL bRetVal; - LPWSTR lpStringToFindW; - - /* Convert lpStringToFind */ - if (lpStringToFind) - { - BasepAnsiStringToHeapUnicodeString(lpStringToFind, - (LPWSTR*) &lpStringToFindW); - } - - /* Call the Unicode function */ - bRetVal = FindActCtxSectionStringA(dwFlags, - lpExtensionGuid, - ulSectionId, - lpStringToFind, - ReturnedData); - - /* Clean up */ - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpStringToFindW); - - return bRetVal; -} - - -/* - * @implemented - */ -HANDLE -STDCALL -CreateActCtxA( - PCACTCTXA pActCtx - ) -{ - ACTCTXW pActCtxW; - HANDLE hRetVal; - - ZeroMemory(&pActCtxW, sizeof(pActCtxW)); - pActCtxW.cbSize = sizeof(pActCtxW); - pActCtxW.dwFlags = pActCtx->dwFlags; - pActCtxW.wProcessorArchitecture = pActCtx->wProcessorArchitecture; - pActCtxW.dwFlags = pActCtx->wProcessorArchitecture; - - pActCtxW.hModule = pActCtx->hModule; - - /* Convert ActCtx Strings */ - if (pActCtx->lpAssemblyDirectory) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpSource, - (LPWSTR*) &pActCtxW.lpSource); - } - - if (pActCtx->lpAssemblyDirectory) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpAssemblyDirectory, - (LPWSTR*) &pActCtxW.lpAssemblyDirectory); - } - if (pActCtx->lpResourceName) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpResourceName, - (LPWSTR*) &pActCtxW.lpResourceName); - } - if (pActCtx->lpApplicationName) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpApplicationName, - (LPWSTR*) &pActCtxW.lpApplicationName); - } - - /* Call the Unicode function */ - hRetVal = CreateActCtxW(&pActCtxW); - - /* Clean up */ - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpSource); - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpAssemblyDirectory); - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpResourceName); - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpApplicationName); - - return hRetVal; -}

18 years, 10 months

← Newer
1
...
33
34
35
36
37
38
39
...
88
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 2005