[ros-diffs] [tkreuzer] 55974: [PSDK] Add missing definitions to wingdi.h [WIN32K] Fix MSVC warnings
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Sat Mar 3 20:57:42 UTC 2012
Author: tkreuzer
Date: Sat Mar 3 20:57:42 2012
New Revision: 55974
URL: http://svn.reactos.org/svn/reactos?rev=55974&view=rev
Log:
[PSDK] Add missing definitions to wingdi.h
[WIN32K] Fix MSVC warnings
Modified:
trunk/reactos/include/psdk/wingdi.h
trunk/reactos/include/reactos/win32k/ntuser.h
trunk/reactos/subsystems/win32/win32k/dib/alphablend.c
trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c
trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c
trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c
trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c
trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c
trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c
trunk/reactos/subsystems/win32/win32k/eng/alphablend.c
trunk/reactos/subsystems/win32/win32k/eng/engwindow.c
trunk/reactos/subsystems/win32/win32k/eng/surface.c
trunk/reactos/subsystems/win32/win32k/eng/xlate.c
trunk/reactos/subsystems/win32/win32k/include/accelerator.h
trunk/reactos/subsystems/win32/win32k/include/surface.h
trunk/reactos/subsystems/win32/win32k/misc/file.c
trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c
Modified: trunk/reactos/include/psdk/wingdi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -2721,6 +2721,8 @@
BYTE SourceConstantAlpha;
BYTE AlphaFormat;
} BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION;
+#define STAMP_DESIGNVECTOR (0x8000000 + 'd' + ('v' << 8))
+#define STAMP_AXESLIST (0x8000000 + 'a' + ('l' << 8))
#define MM_MAX_NUMAXES 16
typedef struct _DESIGNVECTOR {
DWORD dvReserved;
Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntuser.h?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -386,7 +386,7 @@
typedef struct tagSBDATA
{
INT posMin;
- INT posMax;
+ INT posMax;
INT page;
INT pos;
} SBDATA, *PSBDATA;
@@ -471,7 +471,7 @@
//PCURSOR spcur;
HBRUSH hbrBackground;
PWSTR lpszMenuName; // kernel use
- PSTR lpszAnsiClassName; // "
+ PSTR lpszAnsiClassName; // "
HANDLE hIconSm; /* FIXME - Use pointer! */
//PCURSOR spicnSm;
@@ -730,7 +730,7 @@
#define FNID_SENDMESSAGEWTOOPTION 0x02B3
#define FNID_SENDMESSAGECALLPROC 0x02B4
#define FNID_BROADCASTSYSTEMMESSAGE 0x02B5
-#define FNID_TOOLTIPS 0x02B6
+#define FNID_TOOLTIPS 0x02B6
#define FNID_SENDNOTIFYMESSAGE 0x02B7
#define FNID_SENDMESSAGECALLBACK 0x02B8
#define FNID_LAST 0x02B9
@@ -956,21 +956,21 @@
} USERCONNECT, *PUSERCONNECT;
typedef struct tagGETCLIPBDATA
-{
+{
UINT uFmtRet;
- BOOL fGlobalHandle;
+ BOOL fGlobalHandle;
union
- {
+ {
HANDLE hLocale;
- HANDLE hPalette;
+ HANDLE hPalette;
};
-} GETCLIPBDATA, *PGETCLIPBDATA;
+} GETCLIPBDATA, *PGETCLIPBDATA;
typedef struct tagSETCLIPBDATA
-{
+{
BOOL fGlobalHandle;
BOOL fIncSerialNumber;
-} SETCLIPBDATA, *PSETCLIPBDATA;
+} SETCLIPBDATA, *PSETCLIPBDATA;
DWORD
NTAPI
@@ -1533,12 +1533,12 @@
PVOID pData,
DWORD cbData);
-int
+ULONG
NTAPI
NtUserCopyAcceleratorTable(
HACCEL Table,
LPACCEL Entries,
- int EntriesCount);
+ ULONG EntriesCount);
DWORD
NTAPI
@@ -1548,7 +1548,7 @@
NTAPI
NtUserCreateAcceleratorTable(
LPACCEL Entries,
- SIZE_T EntriesCount);
+ ULONG EntriesCount);
BOOL
NTAPI
@@ -1943,7 +1943,7 @@
NTAPI
NtUserGetCPD(
HWND hWnd,
- GETCPD Flags,
+ GETCPD Flags,
ULONG_PTR Proc);
HCURSOR
@@ -3194,7 +3194,7 @@
HWND
NTAPI
-NtUserWindowFromPhysicalPoint(
+NtUserWindowFromPhysicalPoint(
POINT Point);
HWND
Modified: trunk/reactos/subsystems/win32/win32k/dib/alphablend.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/alphablend.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/alphablend.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/alphablend.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -26,7 +26,7 @@
static __inline UCHAR
Clamp8(ULONG val)
{
- return (val > 255) ? 255 : val;
+ return (val > 255) ? 255 : (UCHAR)val;
}
BOOLEAN
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -68,7 +68,7 @@
if (0 != (cx & 0x01))
{
- *((PWORD) addr) = c;
+ *((PWORD) addr) = (WORD)c;
cx++;
addr = (PDWORD)((PWORD)(addr) + 1);
}
@@ -80,7 +80,7 @@
}
if (cx < x2)
{
- *((PWORD) addr) = c;
+ *((PWORD) addr) = (WORD)c;
}
#endif /* _M_IX86 */
}
@@ -400,7 +400,7 @@
BOOLEAN
DIB_16BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{
- ULONG DestY;
+ LONG DestY;
#if defined(_M_IX86) && !defined(_MSC_VER)
/* This is about 10% faster than the generic C code below */
@@ -449,8 +449,8 @@
RECTL* DestRect, RECTL *SourceRect,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
- ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest;
- ULONG *DestBits;
+ LONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, wd;
+ ULONG *DestBits, Source, Dest;
LONG DstHeight;
LONG DstWidth;
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -92,7 +92,7 @@
shift = (dl-sl)&7;
- xormask = 0xFF * XLATEOBJ_iXlate(pxlo, 0);
+ xormask = 0xFF * (BYTE)XLATEOBJ_iXlate(pxlo, 0);
if ( DestRect->top <= SourcePoint->y )
{
@@ -316,15 +316,15 @@
BOOLEAN
DIB_1BPP_BitBlt(PBLTINFO BltInfo)
{
- ULONG DestX, DestY;
- ULONG SourceX, SourceY;
- ULONG PatternY = 0;
+ LONG DestX, DestY;
+ LONG SourceX, SourceY;
+ LONG PatternY = 0;
ULONG Dest, Source = 0, Pattern = 0;
ULONG Index;
BOOLEAN UsesSource;
BOOLEAN UsesPattern;
PULONG DestBits;
- ULONG RoundedRight;
+ LONG RoundedRight;
UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);
UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);
@@ -457,7 +457,7 @@
BOOLEAN
DIB_1BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{
- ULONG DestY;
+ LONG DestY;
for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
{
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -40,7 +40,7 @@
while(y1++ < y2)
{
*(PUSHORT)(addr) = c & 0xFFFF;
- *(addr + 2) = c >> 16;
+ *(addr + 2) = (BYTE)(c >> 16);
addr += lDelta;
}
@@ -94,7 +94,7 @@
xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest,
(*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1)));
*DestLine++ = xColor & 0xff;
- *(PWORD)DestLine = xColor >> 8;
+ *(PWORD)DestLine = (WORD)(xColor >> 8);
DestLine += 2;
if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; }
sx++;
@@ -118,7 +118,7 @@
{
xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits);
*DestBits = xColor & 0xff;
- *(PWORD)(DestBits + 1) = xColor >> 8;
+ *(PWORD)(DestBits + 1) = (WORD)(xColor >> 8);
SourceBits += 1;
DestBits += 3;
}
@@ -140,7 +140,7 @@
{
xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceLine_16BPP);
*DestLine++ = xColor & 0xff;
- *(PWORD)DestLine = xColor >> 8;
+ *(PWORD)DestLine = (WORD)(xColor >> 8);
DestLine += 2;
SourceLine_16BPP++;
}
@@ -207,7 +207,7 @@
{
xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *((PDWORD) SourceBits));
*DestBits = xColor & 0xff;
- *(PWORD)(DestBits + 1) = xColor >> 8;
+ *(PWORD)(DestBits + 1) = (WORD)(xColor >> 8);
SourceBits += 4;
DestBits += 3;
}
@@ -228,9 +228,9 @@
BOOLEAN
DIB_24BPP_BitBlt(PBLTINFO BltInfo)
{
- ULONG DestX, DestY;
- ULONG SourceX, SourceY;
- ULONG PatternY = 0;
+ LONG DestX, DestY;
+ LONG SourceX, SourceY;
+ LONG PatternY = 0;
ULONG Dest, Source = 0, Pattern = 0;
BOOL UsesSource;
BOOL UsesPattern;
@@ -279,7 +279,7 @@
Dest = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFFFF;
*(PUSHORT)(DestBits) = Dest & 0xFFFF;
- *(DestBits + 2) = Dest >> 16;
+ *(DestBits + 2) = (BYTE)(Dest >> 16);
}
SourceY++;
@@ -299,7 +299,7 @@
BOOLEAN
DIB_24BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{
- ULONG DestY;
+ LONG DestY;
#if defined(_M_IX86) && !defined(_MSC_VER)
PBYTE xaddr = (PBYTE)DestSurface->pvScan0 + DestRect->top * DestSurface->lDelta + (DestRect->left << 1) + DestRect->left;
@@ -400,7 +400,8 @@
RECTL* DestRect, RECTL *SourceRect,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
- ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd, Dest;
+ LONG X, Y, SourceX, SourceY = 0, wd;
+ ULONG Source = 0, Dest;
BYTE *DestBits;
LONG DstHeight;
@@ -430,9 +431,9 @@
Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY);
if(Source != iTransColor)
{
- Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF;
+ Dest = (BYTE)XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF;
*(PUSHORT)(DestBits) = Dest & 0xFFFF;
- *(DestBits + 2) = Dest >> 16;
+ *(DestBits + 2) = (BYTE)(Dest >> 16);
}
}
}
@@ -456,7 +457,7 @@
static __inline UCHAR
Clamp8(ULONG val)
{
- return (val > 255) ? 255 : val;
+ return (val > 255) ? 255 : (UCHAR)val;
}
BOOLEAN
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -284,8 +284,8 @@
RECTL* DestRect, RECTL *SourceRect,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
- ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd;
- ULONG *DestBits;
+ LONG X, Y, SourceX, SourceY = 0, wd;
+ ULONG *DestBits, Source = 0;
LONG DstHeight;
LONG DstWidth;
@@ -338,7 +338,7 @@
static __inline UCHAR
Clamp8(ULONG val)
{
- return (val > 255) ? 255 : val;
+ return (val > 255) ? 255 : (UCHAR)val;
}
BOOLEAN
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -16,7 +16,7 @@
DIB_4BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE addr = (PBYTE)SurfObj->pvScan0 + (x>>1) + y * SurfObj->lDelta;
- *addr = (*addr & notmask[x&1]) | (c << ((1-(x&1))<<2));
+ *addr = (*addr & notmask[x&1]) | (BYTE)(c << ((1-(x&1))<<2));
}
ULONG
@@ -34,7 +34,7 @@
while(cx < x2)
{
- *addr = (*addr & notmask[x1&1]) | (c << ((1-(x1&1))<<2));
+ *addr = (*addr & notmask[x1&1]) | (BYTE)(c << ((1-(x1&1))<<2));
if((++x1 & 1) == 0)
++addr;
++cx;
@@ -50,7 +50,7 @@
addr += (x>>1) + y1 * lDelta;
while(y1++ < y2)
{
- *addr = (*addr & notmask[x&1]) | (c << ((1-(x&1))<<2));
+ *addr = (*addr & notmask[x&1]) | (BYTE)(c << ((1-(x&1))<<2));
addr += lDelta;
}
}
@@ -127,7 +127,7 @@
for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
{
*DestLine = (*DestLine & notmask[f2]) |
- ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceLine_8BPP)) << ((4 * (1 - f2))));
+ (BYTE)((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceLine_8BPP)) << ((4 * (1 - f2))));
if(f2 == 1) { DestLine++; f2 = 0; } else { f2 = 1; }
SourceLine_8BPP++;
}
@@ -151,7 +151,7 @@
{
xColor = *((PWORD) SourceBits);
*DestBits = (*DestBits & notmask[f2]) |
- ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
+ (BYTE)((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
if(f2 == 1) { DestBits++; f2 = 0; } else { f2 = 1; }
SourceBits += 2;
}
@@ -176,7 +176,7 @@
(*(SourceLine_24BPP + 1) << 0x08) +
(*(SourceLine_24BPP));
*DestLine = (*DestLine & notmask[f2]) |
- ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
+ (BYTE)((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
if(f2 == 1) { DestLine++; f2 = 0; } else { f2 = 1; }
SourceLine_24BPP+=3;
}
@@ -200,7 +200,7 @@
{
xColor = *((PDWORD) SourceBits);
*DestBits = (*DestBits & notmask[f2]) |
- ((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
+ (BYTE)((XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor)) << ((4 * (1 - f2))));
if(f2 == 1) { DestBits++; f2 = 0; } else { f2 = 1; }
SourceBits += 4;
}
@@ -220,9 +220,9 @@
BOOLEAN
DIB_4BPP_BitBlt(PBLTINFO BltInfo)
{
- ULONG DestX, DestY;
- ULONG SourceX, SourceY;
- ULONG PatternY = 0;
+ LONG DestX, DestY;
+ LONG SourceX, SourceY;
+ LONG PatternY = 0;
ULONG Dest, Source = 0, Pattern = 0;
BOOLEAN UsesSource;
BOOLEAN UsesPattern;
@@ -358,7 +358,7 @@
BOOLEAN
DIB_4BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{
- ULONG DestY;
+ LONG DestY;
for (DestY = DestRect->top; DestY < DestRect->bottom; DestY++)
{
Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -18,7 +18,7 @@
{
PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta + x;
- *byteaddr = c;
+ *byteaddr = (BYTE)c;
}
ULONG
@@ -45,7 +45,7 @@
byteaddr = addr;
while(y1++ < y2)
{
- *addr = c;
+ *addr = (BYTE)c;
addr += lDelta;
}
@@ -144,7 +144,7 @@
DestBits = DestLine;
for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
{
- *DestBits++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits++);
+ *DestBits++ = (BYTE)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits++);
}
SourceLine += BltInfo->SourceSurface->lDelta;
DestLine += BltInfo->DestSurface->lDelta;
@@ -160,7 +160,7 @@
DestBits = DestLine;
for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++)
{
- *DestBits++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits++);
+ *DestBits++ = (BYTE)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *SourceBits++);
}
SourceLine -= BltInfo->SourceSurface->lDelta;
DestLine -= BltInfo->DestSurface->lDelta;
@@ -181,7 +181,7 @@
for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
{
xColor = *((PWORD) SourceBits);
- *DestBits = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
+ *DestBits = (BYTE)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
SourceBits += 2;
DestBits += 1;
}
@@ -205,7 +205,7 @@
xColor = (*(SourceBits + 2) << 0x10) +
(*(SourceBits + 1) << 0x08) +
(*(SourceBits));
- *DestBits = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
+ *DestBits = (BYTE)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
SourceBits += 3;
DestBits += 1;
}
@@ -227,7 +227,7 @@
for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++)
{
xColor = *((PDWORD) SourceBits);
- *DestBits = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
+ *DestBits = (BYTE)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor);
SourceBits += 4;
DestBits += 1;
}
@@ -249,7 +249,7 @@
BOOLEAN
DIB_8BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{
- ULONG DestY;
+ LONG DestY;
for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
{
DIB_8BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color);
@@ -263,8 +263,8 @@
RECTL* DestRect, RECTL *SourceRect,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
- ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, Dest;
- ULONG *DestBits;
+ LONG RoundedRight, X, Y, SourceX = 0, SourceY = 0;
+ ULONG *DestBits, Source, Dest;
LONG DstHeight;
LONG DstWidth;
Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng/alphablend.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -38,7 +38,7 @@
LONG ClippingType;
RECT_ENUM RectEnum;
BOOL EnumMore;
- INT i;
+ ULONG i;
BOOLEAN Ret;
DPRINT("EngAlphaBlend(psoDest:0x%p, psoSource:0x%p, ClipRegion:0x%p, ColorTranslation:0x%p,\n", psoDest, psoSource, ClipRegion, ColorTranslation);
Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng/engwindow.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -82,7 +82,7 @@
visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top,
visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom);
{
- INT i;
+ ULONG i;
for (i = 0; i < visRgn->rdh.nCount; i++)
{
DPRINT(" Rect #%d: %d,%d %d,%d\n", i+1,
Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng/surface.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -132,7 +132,7 @@
PSURFACE
NTAPI
SURFACE_AllocSurface(
- IN ULONG iType,
+ IN USHORT iType,
IN ULONG cx,
IN ULONG cy,
IN ULONG iFormat)
@@ -173,7 +173,7 @@
NTAPI
SURFACE_bSetBitmapBits(
IN PSURFACE psurf,
- IN USHORT fjBitmap,
+ IN ULONG fjBitmap,
IN ULONG ulWidth,
IN PVOID pvBits OPTIONAL)
{
@@ -245,10 +245,10 @@
{
/* Inversed bitmap (bottom up) */
pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ulWidth);
- pso->lDelta = -ulWidth;
- }
-
- pso->fjBitmap = fjBitmap;
+ pso->lDelta = -(LONG)ulWidth;
+ }
+
+ pso->fjBitmap = (USHORT)fjBitmap;
/* Success */
return TRUE;
Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng/xlate.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -349,8 +349,8 @@
pexlo->hColorTransform = NULL;
pexlo->ppalSrc = ppalSrc;
pexlo->ppalDst = ppalDst;
- pexlo->xlo.iSrcType = ppalSrc->flFlags;
- pexlo->xlo.iDstType = ppalDst->flFlags;
+ pexlo->xlo.iSrcType = (USHORT)ppalSrc->flFlags;
+ pexlo->xlo.iDstType = (USHORT)ppalDst->flFlags;
pexlo->ppalDstDc = &gpalRGB;
if (ppalDst == ppalSrc)
@@ -634,7 +634,7 @@
{
PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo;
PPALETTE ppal;
- INT i;
+ ULONG i;
if (!pxlo)
{
Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/accelerator.h?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -3,7 +3,7 @@
typedef struct _ACCELERATOR_TABLE
{
HEAD head;
- int Count;
+ ULONG Count;
LPACCEL Table;
} ACCELERATOR_TABLE, *PACCELERATOR_TABLE;
Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/surface.h?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -104,7 +104,7 @@
PSURFACE
NTAPI
SURFACE_AllocSurface(
- IN ULONG iType,
+ IN USHORT iType,
IN ULONG cx,
IN ULONG cy,
IN ULONG iFormat);
@@ -113,7 +113,7 @@
NTAPI
SURFACE_bSetBitmapBits(
IN PSURFACE psurf,
- IN USHORT fjBitmap,
+ IN ULONG fjBitmap,
IN ULONG ulWidth,
IN PVOID pvBits OPTIONAL);
Modified: trunk/reactos/subsystems/win32/win32k/misc/file.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/misc/file.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/misc/file.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/misc/file.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -127,8 +127,7 @@
ULONG_PTR ulViewSize;
PVOID pvBase = 0;
- ulViewSize =
- liSectionOffset.QuadPart = ulSectionOffset;
+ liSectionOffset.QuadPart = ulViewSize = ulSectionOffset;
Status = ZwMapViewOfSection(hSection,
NtCurrentProcess(),
&pvBase,
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c?rev=55974&r1=55973&r2=55974&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Sat Mar 3 20:57:42 2012
@@ -177,15 +177,15 @@
/* SYSCALLS *****************************************************************/
-int
+ULONG
APIENTRY
NtUserCopyAcceleratorTable(
HACCEL hAccel,
LPACCEL Entries,
- int EntriesCount)
+ ULONG EntriesCount)
{
PACCELERATOR_TABLE Accel;
- int Ret;
+ ULONG Ret;
DECLARE_RETURN(int);
TRACE("Enter NtUserCopyAcceleratorTable\n");
@@ -239,11 +239,11 @@
APIENTRY
NtUserCreateAcceleratorTable(
LPACCEL Entries,
- SIZE_T EntriesCount)
+ ULONG EntriesCount)
{
PACCELERATOR_TABLE Accel;
HACCEL hAccel;
- INT Index;
+ ULONG Index;
NTSTATUS Status = STATUS_SUCCESS;
DECLARE_RETURN(HACCEL);
More information about the Ros-diffs
mailing list