Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 05:15:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK] Add missing definitions to wingdi.h

Browse source 
[WIN32K] Fix MSVC warnings

svn path=/trunk/; revision=55974
This commit is contained in:
Timo Kreuzer 2012-03-03 20:57:42 +00:00
parent b541b98d59
commit f99547ad97
17 changed files with 86 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/psdk/wingdi.h
View file

@ -2721,6 +2721,8 @@ typedef struct _BLENDFUNCTION {
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;

30
reactos/include/reactos/win32k/ntuser.h
View file

@ -386,7 +386,7 @@ typedef struct _CLSMENUNAME
typedef struct tagSBDATA
{
INT posMin;
INT posMax;
INT posMax;
INT page;
INT pos;
} SBDATA, *PSBDATA;
@ -471,7 +471,7 @@ typedef struct _CLS
//PCURSOR spcur;
HBRUSH hbrBackground;
PWSTR lpszMenuName; // kernel use
PSTR lpszAnsiClassName; // "
PSTR lpszAnsiClassName; // "
HANDLE hIconSm; /* FIXME - Use pointer! */
//PCURSOR spicnSm;
@ -730,7 +730,7 @@ typedef LONG_PTR (NTAPI *PFN_FNID)(PWND, UINT, WPARAM, LPARAM, ULONG_PTR);
#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 @@ typedef struct _USERCONNECT
} 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 @@ NtUserConvertMemHandle(
PVOID pData,
DWORD cbData);
int
ULONG
NTAPI
NtUserCopyAcceleratorTable(
HACCEL Table,
LPACCEL Entries,
int EntriesCount);
ULONG EntriesCount);
DWORD
NTAPI
@ -1548,7 +1548,7 @@ HACCEL
NTAPI
NtUserCreateAcceleratorTable(
LPACCEL Entries,
SIZE_T EntriesCount);
ULONG EntriesCount);
BOOL
NTAPI
@ -1943,7 +1943,7 @@ ULONG_PTR
NTAPI
NtUserGetCPD(
HWND hWnd,
GETCPD Flags,
GETCPD Flags,
ULONG_PTR Proc);
HCURSOR
@ -3194,7 +3194,7 @@ NtUserWin32PoolAllocationStats(
HWND
NTAPI
NtUserWindowFromPhysicalPoint(
NtUserWindowFromPhysicalPoint(
POINT Point);
HWND

2
reactos/subsystems/win32/win32k/dib/alphablend.c
View file

@ -26,7 +26,7 @@ typedef union
static __inline UCHAR
Clamp8(ULONG val)
{
return (val > 255) ? 255 : val;
return (val > 255) ? 255 : (UCHAR)val;
}
BOOLEAN

10
reactos/subsystems/win32/win32k/dib/dib16bpp.c
View file

@ -68,7 +68,7 @@ DIB_16BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
if (0 != (cx & 0x01))
{
*((PWORD) addr) = c;
*((PWORD) addr) = (WORD)c;
cx++;
addr = (PDWORD)((PWORD)(addr) + 1);
}
@ -80,7 +80,7 @@ DIB_16BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
}
if (cx < x2)
{
*((PWORD) addr) = c;
*((PWORD) addr) = (WORD)c;
}
#endif /* _M_IX86 */
}
@ -400,7 +400,7 @@ DIB_16BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
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;

12
reactos/subsystems/win32/win32k/dib/dib1bpp.c
View file

@ -92,7 +92,7 @@ DIB_1BPP_BitBltSrcCopy_From1BPP (
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 @@ DIB_1BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_1BPP_BitBlt(PBLTINFO BltInfo)
BOOLEAN
DIB_1BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{
ULONG DestY;
LONG DestY;
for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
{

29
reactos/subsystems/win32/win32k/dib/dib24bpp.c
View file

@ -40,7 +40,7 @@ DIB_24BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
while(y1++ < y2)
{
*(PUSHORT)(addr) = c & 0xFFFF;
*(addr + 2) = c >> 16;
*(addr + 2) = (BYTE)(c >> 16);
addr += lDelta;
}
@ -94,7 +94,7 @@ DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
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 @@ DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
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 @@ DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
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 @@ DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_24BPP_BitBlt(PBLTINFO BltInfo)
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 @@ DIB_24BPP_BitBlt(PBLTINFO BltInfo)
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 @@ DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
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 @@ DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
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 @@ typedef union {
static __inline UCHAR
Clamp8(ULONG val)
{
return (val > 255) ? 255 : val;
return (val > 255) ? 255 : (UCHAR)val;
}
BOOLEAN

6
reactos/subsystems/win32/win32k/dib/dib32bpp.c
View file

@ -284,8 +284,8 @@ DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
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 @@ typedef union {
static __inline UCHAR
Clamp8(ULONG val)
{
return (val > 255) ? 255 : val;
return (val > 255) ? 255 : (UCHAR)val;
}
BOOLEAN

22
reactos/subsystems/win32/win32k/dib/dib4bpp.c
View file

@ -16,7 +16,7 @@ VOID
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 @@ DIB_4BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
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 @@ DIB_4BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
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 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
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 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
(*(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 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
{
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 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_4BPP_BitBlt(PBLTINFO BltInfo)
BOOLEAN
DIB_4BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
{
ULONG DestY;
LONG DestY;
for (DestY = DestRect->top; DestY < DestRect->bottom; DestY++)
{

20
reactos/subsystems/win32/win32k/dib/dib8bpp.c
View file

@ -18,7 +18,7 @@ DIB_8BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta + x;
*byteaddr = c;
*byteaddr = (BYTE)c;
}
ULONG
@ -45,7 +45,7 @@ DIB_8BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
byteaddr = addr;
while(y1++ < y2)
{
*addr = c;
*addr = (BYTE)c;
addr += lDelta;
}
@ -144,7 +144,7 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
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 @@ DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
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;

2
reactos/subsystems/win32/win32k/eng/alphablend.c
View file

@ -38,7 +38,7 @@ EngAlphaBlend(IN SURFOBJ *psoDest,
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);

2
reactos/subsystems/win32/win32k/eng/engwindow.c
View file

@ -82,7 +82,7 @@ IntEngWndUpdateClipObj(
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,

8
reactos/subsystems/win32/win32k/eng/surface.c
View file

@ -132,7 +132,7 @@ SURFACE_Cleanup(PVOID ObjectBody)
PSURFACE
NTAPI
SURFACE_AllocSurface(
IN ULONG iType,
IN USHORT iType,
IN ULONG cx,
IN ULONG cy,
IN ULONG iFormat)
@ -173,7 +173,7 @@ BOOL
NTAPI
SURFACE_bSetBitmapBits(
IN PSURFACE psurf,
IN USHORT fjBitmap,
IN ULONG fjBitmap,
IN ULONG ulWidth,
IN PVOID pvBits OPTIONAL)
{
@ -245,10 +245,10 @@ SURFACE_bSetBitmapBits(
{
/* Inversed bitmap (bottom up) */
pso->pvScan0 = (PVOID)((ULONG_PTR)pso->pvBits + pso->cjBits - ulWidth);
pso->lDelta = -ulWidth;
pso->lDelta = -(LONG)ulWidth;
}
pso->fjBitmap = fjBitmap;
pso->fjBitmap = (USHORT)fjBitmap;
/* Success */
return TRUE;

6
reactos/subsystems/win32/win32k/eng/xlate.c
View file

@ -349,8 +349,8 @@ EXLATEOBJ_vInitialize(
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 @@ XLATEOBJ_cGetPalette(XLATEOBJ *pxlo, ULONG iPal, ULONG cPal, ULONG *pPalOut)
{
PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo;
PPALETTE ppal;
INT i;
ULONG i;
if (!pxlo)
{

2
reactos/subsystems/win32/win32k/include/accelerator.h
View file

@ -3,7 +3,7 @@
typedef struct _ACCELERATOR_TABLE
{
HEAD head;
int Count;
ULONG Count;
LPACCEL Table;
} ACCELERATOR_TABLE, *PACCELERATOR_TABLE;

4
reactos/subsystems/win32/win32k/include/surface.h
View file

@ -104,7 +104,7 @@ BOOL NTAPI SURFACE_Cleanup(PVOID ObjectBody);
PSURFACE
NTAPI
SURFACE_AllocSurface(
IN ULONG iType,
IN USHORT iType,
IN ULONG cx,
IN ULONG cy,
IN ULONG iFormat);
@ -113,7 +113,7 @@ BOOL
NTAPI
SURFACE_bSetBitmapBits(
IN PSURFACE psurf,
IN USHORT fjBitmap,
IN ULONG fjBitmap,
IN ULONG ulWidth,
IN PVOID pvBits OPTIONAL);

3
reactos/subsystems/win32/win32k/misc/file.c
View file

@ -127,8 +127,7 @@ W32kMapViewOfSection(
ULONG_PTR ulViewSize;
PVOID pvBase = 0;
ulViewSize =
liSectionOffset.QuadPart = ulSectionOffset;
liSectionOffset.QuadPart = ulViewSize = ulSectionOffset;
Status = ZwMapViewOfSection(hSection,
NtCurrentProcess(),
&pvBase,

10
reactos/subsystems/win32/win32k/ntuser/accelerator.c
View file

@ -177,15 +177,15 @@ co_IntTranslateAccelerator(
/* 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 @@ HACCEL
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);