Skip to content

Commit 93b9443

Browse files
committed
[ARWINSS]
- Fix winent.drv compiling. svn path=/branches/arwinss/; revision=69526
1 parent aa7af46 commit 93b9443

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

arwinss/client/winent.drv/clipboard.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,13 @@ static Window thread_selection_wnd(void)
269269
void NTDRV_InitClipboard(void)
270270
{
271271
UINT i;
272-
WINE_CLIPFORMAT *format;
273272

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

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

282281
#if 0

arwinss/client/winent.drv/dib.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ INT CDECL RosDrv_SetDIBitsToDevice( PDC_ATTR pdcattr, INT xDest, INT yDest, DWOR
136136
INT CDECL RosDrv_SetDIBits( PDC_ATTR pdcattr, HBITMAP hbitmap, UINT startscan,
137137
UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse )
138138
{
139-
LONG height, width, tmpheight;
139+
LONG height, width;
140140
WORD infoBpp, compression;
141141
PVOID safeBits = NULL;
142142
INT result, bitsSize;
@@ -146,7 +146,6 @@ INT CDECL RosDrv_SetDIBits( PDC_ATTR pdcattr, HBITMAP hbitmap, UINT startscan,
146146
&infoBpp, &compression ) == -1)
147147
return 0;
148148

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

arwinss/client/winent.drv/mouse.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y,
117117
cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0;
118118
}
119119
SERVER_END_REQ;
120+
121+
TRACE("cursor: 0x%x\n", cursor);
120122
}
121123

122124
/***********************************************************************

arwinss/client/winent.drv/window.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ void sync_window_position( struct ntdrv_win_data *data,
317317
{
318318
//DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE );
319319
LONG width, height;
320-
LONG x, y;
320+
//LONG x, y;
321321

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

@@ -331,12 +331,12 @@ void sync_window_position( struct ntdrv_win_data *data,
331331
//GrResizeWindow(data->whole_window, width, height);
332332

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

341341
if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))
342342
{
@@ -375,7 +375,7 @@ static void sync_client_position( struct ntdrv_win_data *data,
375375
const RECT *old_whole_rect )
376376
{
377377
LONG width, height;
378-
BOOL resize = FALSE;
378+
//BOOL resize = FALSE;
379379
RECT old = *old_client_rect;
380380
RECT new = data->client_rect;
381381

@@ -388,13 +388,13 @@ static void sync_client_position( struct ntdrv_win_data *data,
388388
{
389389
if ((width = new.right - new.left) <= 0) width = 1;
390390
else if (width > 65535) width = 65535;
391-
resize = TRUE;
391+
//resize = TRUE;
392392
}
393393
if (old.bottom - old.top != new.bottom - new.top)
394394
{
395395
if ((height = new.bottom - new.top) <= 0) height = 1;
396396
else if (height > 65535) height = 65535;
397-
resize = TRUE;
397+
//resize = TRUE;
398398
}
399399

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

0 commit comments

Comments
 (0)