14 Oct
2015
14 Oct
'15
7:14 p.m.
Author: fireball
Date: Wed Oct 14 19:14:56 2015
New Revision: 69527
URL: http://svn.reactos.org/svn/reactos?rev=69527&view=rev
Log:
[ARWINSS]
- Fix win32k build.
Modified:
branches/arwinss/arwinss/server/CMakeLists.txt
branches/arwinss/arwinss/server/dib/dib1bpp.c
branches/arwinss/arwinss/server/dib/dib8bpp.c
branches/arwinss/arwinss/server/eng/device.c
branches/arwinss/arwinss/server/eng/engblt.c
branches/arwinss/arwinss/server/eng/engpal.c
branches/arwinss/arwinss/server/gre/bitblt.c
branches/arwinss/arwinss/server/gre/drawing.c
branches/arwinss/arwinss/server/gre/font.c
branches/arwinss/arwinss/server/gre/lineto.c
branches/arwinss/arwinss/server/gre/rect.c
branches/arwinss/arwinss/server/include/win32k.h
branches/arwinss/arwinss/server/main/keyboard.c
branches/arwinss/arwinss/server/wine/timeout.c
Modified: branches/arwinss/arwinss/server/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/CMakeLis…
==============================================================================
--- branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -3,7 +3,7 @@
include_directories(
.
include
- ${REACTOS_SOURCE_DIR}/win32ss
+ ${REACTOS_SOURCE_DIR}/win32ss/include
${REACTOS_SOURCE_DIR}/ntoskrnl/include
${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
${REACTOS_SOURCE_DIR}/include/reactos/subsys
Modified: branches/arwinss/arwinss/server/dib/dib1bpp.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/dib/dib1…
==============================================================================
--- branches/arwinss/arwinss/server/dib/dib1bpp.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/dib/dib1bpp.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -82,7 +82,7 @@
int dy2; // dest y end
int sy1; // src y start
- int dx;
+ //int dx;
int shift;
BYTE srcmask, dstmask, xormask;
@@ -139,12 +139,12 @@
pd = d;
ps = s;
srcmask = 0xff;
- dx = dwx; /* dest x for this pass */
+ //dx = dwx; /* dest x for this pass */
if ( dwx < dl )
{
int diff = dl-dwx;
srcmask &= (1<<(8-diff))-1;
- dx = dl;
+ //dx = dl;
}
if ( dwx+7 > dr )
{
Modified: branches/arwinss/arwinss/server/dib/dib8bpp.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/dib/dib8…
==============================================================================
--- branches/arwinss/arwinss/server/dib/dib8bpp.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/dib/dib8bpp.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -263,7 +263,7 @@
RECTL* DestRect, RECTL *SourceRect,
XLATEOBJ *ColorTranslation, ULONG iTransColor)
{
- ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest;
+ ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source/*, wd*/, Dest;
ULONG *DestBits;
LONG DstHeight;
@@ -279,7 +279,7 @@
RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) &
0x3);
DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left +
(DestRect->top * DestSurf->lDelta));
- wd = DestSurf->lDelta - (DestRect->right - DestRect->left);
+ //wd = DestSurf->lDelta - (DestRect->right - DestRect->left);
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
{
Modified: branches/arwinss/arwinss/server/eng/device.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/devi…
==============================================================================
--- branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -736,6 +736,8 @@
if ((dwflags & CDS_SET_PRIMARY) == CDS_SET_PRIMARY)
SetPrimary = TRUE;
dwflags &= ~(CDS_RESET | CDS_SET_PRIMARY);
+
+ DPRINT1("Global: %d, SetPrimary: %d\n", Global, SetPrimary);
if (Reset && NoReset)
return DISP_CHANGE_BADFLAGS;
Modified: branches/arwinss/arwinss/server/eng/engblt.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engb…
==============================================================================
--- branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -315,7 +315,7 @@
{
BOOLEAN ret;
COLORADJUSTMENT ca;
- POINT MaskOrigin;
+ //POINT MaskOrigin;
SURFACE *psurfDest;
SURFACE *psurfSource = NULL;
RECTL InputClippedRect;
@@ -380,10 +380,10 @@
OutputRect = InputClippedRect;
}
- if (pMaskOrigin != NULL)
+ /*if (pMaskOrigin != NULL)
{
MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y;
- }
+ }*/
/* No success yet */
ret = FALSE;
@@ -711,11 +711,11 @@
POINTL Pt;
ULONG Direction;
BOOL UsesSource;
- BOOL UsesPattern;
+ //BOOL UsesPattern;
POINTL AdjustedBrushOrigin;
UsesSource = ROP4_USES_SOURCE(rop4);
- UsesPattern = ROP4_USES_PATTERN(rop4);
+ //UsesPattern = ROP4_USES_PATTERN(rop4);
if (R4_NOOP == rop4)
{
/* Copy destination onto itself: nop */
Modified: branches/arwinss/arwinss/server/eng/engpal.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engp…
==============================================================================
--- branches/arwinss/arwinss/server/eng/engpal.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/engpal.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -460,7 +460,7 @@
int realized = 0;
PDC dc;
HPALETTE systemPalette;
- USHORT sysMode, palMode;
+ //USHORT sysMode, palMode;
dc = DC_LockDc(hDC);
if (!dc) return 0;
@@ -502,8 +502,8 @@
#endif
// need to pass this to IntEngCreateXlate with palettes unlocked
- sysMode = sysGDI->Mode;
- palMode = palGDI->Mode;
+ //sysMode = sysGDI->Mode;
+ //palMode = palGDI->Mode;
PALETTE_UnlockPalette(sysGDI);
PALETTE_UnlockPalette(palGDI);
Modified: branches/arwinss/arwinss/server/gre/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/bitb…
==============================================================================
--- branches/arwinss/arwinss/server/gre/bitblt.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/gre/bitblt.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -1087,7 +1087,7 @@
EXLATEOBJ exlo;
PPALETTE pDDBPalette, pDIBPalette;
HPALETTE DDBPalette, DIBPalette = NULL;
- ULONG DDBPaletteType, DIBPaletteType;
+ ULONG /*DDBPaletteType,*/ DIBPaletteType;
if (!Bits) return 0;
@@ -1145,7 +1145,7 @@
goto Exit;
}
- DDBPaletteType = pDDBPalette->Mode;
+ //DDBPaletteType = pDDBPalette->Mode;
DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType);
if (!DIBPalette)
Modified: branches/arwinss/arwinss/server/gre/drawing.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/draw…
==============================================================================
--- branches/arwinss/arwinss/server/gre/drawing.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/gre/drawing.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -1264,10 +1264,10 @@
{
int Start = ceil(StartArc);
int End = ceil(EndArc);
- BOOL Chord = (arctype == GdiTypeChord), ret;
+ BOOL Chord = (arctype == GdiTypeChord);
// Sort out alignment here.
- ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height),
+ app_fill_arc(dc, rect( XLeft, YLeft, Width, Height),
-End, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End :
-Start,
-Start, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start :
-End,
dc->dclevel.pbrFill, BrushOrigin, Chord);
Modified: branches/arwinss/arwinss/server/gre/font.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/font…
==============================================================================
--- branches/arwinss/arwinss/server/gre/font.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/gre/font.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -318,6 +318,8 @@
/* Release the surface and delete the bitmap */
GreDeleteObject(charBitmap);
+
+ UNREFERENCED_LOCAL_VARIABLE(bRet);
}
static void SmoothGlyphColor(PDC physDev, INT x, INT y,
@@ -456,6 +458,8 @@
/* Release the surface and delete the bitmap */
GreDeleteObject(charBitmap);
+
+ UNREFERENCED_LOCAL_VARIABLE(bRet);
}
/* PUBLIC FUNCTIONS **********************************************************/
Modified: branches/arwinss/arwinss/server/gre/lineto.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/line…
==============================================================================
--- branches/arwinss/arwinss/server/gre/lineto.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/gre/lineto.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -103,7 +103,6 @@
const POINT *ptPoints,
INT count)
{
- BOOLEAN bRet;
POINT ptLine[2];
RECTL DestRect;
MIX Mix;
@@ -125,7 +124,7 @@
DestRect.right = max(ptLine[0].x, ptLine[1].x);
DestRect.bottom = max(ptLine[0].y, ptLine[1].y);
- bRet = GreLineTo(&pDC->dclevel.pSurface->SurfObj,
+ GreLineTo(&pDC->dclevel.pSurface->SurfObj,
pDC->CombinedClip,
&pDC->eboLine.BrushObject,
ptLine[0].x,
Modified: branches/arwinss/arwinss/server/gre/rect.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/rect…
==============================================================================
--- branches/arwinss/arwinss/server/gre/rect.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/gre/rect.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -57,6 +57,7 @@
&BrushOrigin,
ROP3_TO_ROP4(PATCOPY),
TRUE);
+ UNREFERENCED_LOCAL_VARIABLE(bRet);
}
}
@@ -102,7 +103,6 @@
INT count,
PRECTL DestRect)
{
- BOOLEAN bRet;
MIX Mix;
INT i;
POINTL BrushOrigin;
@@ -131,7 +131,7 @@
Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/
for (i=0; i<count-1; i++)
{
- bRet = GreLineTo(&pDC->dclevel.pSurface->SurfObj,
+ GreLineTo(&pDC->dclevel.pSurface->SurfObj,
pDC->CombinedClip,
&pDC->eboLine.BrushObject,
ptPoints[i].x,
Modified: branches/arwinss/arwinss/server/include/win32k.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/…
==============================================================================
--- branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] Wed Oct 14 19:14:56
2015
@@ -45,11 +45,11 @@
#include <pseh/pseh2.h>
/* Public Win32K Headers */
-#include <include/callback.h>
-#include <include/ntusrtyp.h>
-#include <include/ntuser.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
+#include <ntusrtyp.h>
+#include <ntuser.h>
+#include <callback.h>
+#include <ntgdityp.h>
+#include <ntgdihdl.h>
#include <ntgdi.h>
/* Internal Win32K Header */
Modified: branches/arwinss/arwinss/server/main/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/key…
==============================================================================
--- branches/arwinss/arwinss/server/main/keyboard.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/main/keyboard.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -591,6 +591,8 @@
// ret = 0;
//}
+ UNREFERENCED_LOCAL_VARIABLE(KeyNames);
+
cleanup:
//UserLeave();
return ret;
Modified: branches/arwinss/arwinss/server/wine/timeout.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/wine/tim…
==============================================================================
--- branches/arwinss/arwinss/server/wine/timeout.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/wine/timeout.c [iso-8859-1] Wed Oct 14 19:14:56 2015
@@ -212,7 +212,7 @@
ProcessTimers();
UserLeave();
}
- DPRINT1("Timer thread exit!\n");
+ DPRINT1("Timer thread exit! Status 0x%08X\n", Status);
}
VOID
3362
days inactive
3362
days old
0 comments
1 participants
participants (1)
-
fireball＠svn.reactos.org