[ros-diffs] [fireball] 69526: [ARWINSS] - Fix winent.drv compiling.

Author: fireball
Date: Wed Oct 14 12:04:19 2015
New Revision: 69526

URL: http://svn.reactos.org/svn/reactos?rev=69526&view=rev
Log:
[ARWINSS]
- Fix winent.drv compiling.

Modified:
    branches/arwinss/arwinss/client/winent.drv/clipboard.c
    branches/arwinss/arwinss/client/winent.drv/dib.c
    branches/arwinss/arwinss/client/winent.drv/mouse.c
    branches/arwinss/arwinss/client/winent.drv/window.c

Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.dr...
==============================================================================
--- branches/arwinss/arwinss/client/winent.drv/clipboard.c	[iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/winent.drv/clipboard.c	[iso-8859-1] Wed Oct 14 12:04:19 2015
@@ -269,14 +269,13 @@
 void NTDRV_InitClipboard(void)
 {
     UINT i;
-    WINE_CLIPFORMAT *format;

/* Register known mapping between window formats and X properties */
     for (i = 0; i < sizeof(PropertyFormatMap)/sizeof(PropertyFormatMap[0]); i++)
         NTDRV_CLIPBOARD_InsertClipboardFormat(PropertyFormatMap[i].lpszFormat);

/* Set up a conversion function from "HTML Format" to "text/html" */
-    format = NTDRV_CLIPBOARD_InsertClipboardFormat(wszHTMLFormat);
+    (VOID)NTDRV_CLIPBOARD_InsertClipboardFormat(wszHTMLFormat);
 }

#if 0

Modified: branches/arwinss/arwinss/client/winent.drv/dib.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.dr...
==============================================================================
--- branches/arwinss/arwinss/client/winent.drv/dib.c	[iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/winent.drv/dib.c	[iso-8859-1] Wed Oct 14 12:04:19 2015
@@ -136,7 +136,7 @@
 INT CDECL RosDrv_SetDIBits( PDC_ATTR pdcattr, HBITMAP hbitmap, UINT startscan,
                             UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse )
 {
-    LONG height, width, tmpheight;
+    LONG height, width;
     WORD infoBpp, compression;
     PVOID safeBits = NULL;
     INT result, bitsSize;
@@ -146,7 +146,6 @@
         &infoBpp, &compression ) == -1)
         return 0;

-    tmpheight = height;
     if (height < 0) height = -height;
     if (!lines || (startscan >= height))
         return 0;

Modified: branches/arwinss/arwinss/client/winent.drv/mouse.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.dr...
==============================================================================
--- branches/arwinss/arwinss/client/winent.drv/mouse.c	[iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/winent.drv/mouse.c	[iso-8859-1] Wed Oct 14 12:04:19 2015
@@ -117,6 +117,8 @@
         cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0;
     }
     SERVER_END_REQ;
+
+    TRACE("cursor: 0x%x\n", cursor);
 }

/***********************************************************************

Modified: branches/arwinss/arwinss/client/winent.drv/window.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.dr...
==============================================================================
--- branches/arwinss/arwinss/client/winent.drv/window.c	[iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/winent.drv/window.c	[iso-8859-1] Wed Oct 14 12:04:19 2015
@@ -317,7 +317,7 @@
 {
     //DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE );
     LONG width, height;
-    LONG x, y;
+    //LONG x, y;

SwmPosChanged(data->whole_window, &data->whole_rect, old_whole_rect, NULL, swp_flags);

@@ -331,12 +331,12 @@
     //GrResizeWindow(data->whole_window, width, height);

/* only the size is allowed to change for the desktop window */
-    if (data->whole_window != root_window)
+    /*if (data->whole_window != root_window)
     {
         x = data->whole_rect.left;
         y = data->whole_rect.top;
-        //GrMoveWindow(data->whole_window, x, y);
-    }
+        GrMoveWindow(data->whole_window, x, y);
+    }*/

if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))
     {
@@ -375,7 +375,7 @@
                                   const RECT *old_whole_rect )
 {
     LONG width, height;
-    BOOL resize = FALSE;
+    //BOOL resize = FALSE;
     RECT old = *old_client_rect;
     RECT new = data->client_rect;

@@ -388,13 +388,13 @@
     {
         if ((width = new.right - new.left) <= 0) width = 1;
         else if (width > 65535) width = 65535;
-        resize = TRUE;
+        //resize = TRUE;
     }
     if (old.bottom - old.top != new.bottom - new.top)
     {
         if ((height = new.bottom - new.top) <= 0) height = 1;
         else if (height > 65535) height = 65535;
-        resize = TRUE;
+        //resize = TRUE;
     }

TRACE( "setting client win %lx pos %d,%d,%dx%d\n",