Commit 6b9dd2e0 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Lots of warning fixed, one missing WINAPI in ddraw.c added.

parent 49c1ca28
......@@ -536,7 +536,7 @@ INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex )
* NOTES
* retrives the specified icon from the iconcache. if not found try's to load the icon
*/
static HICON SIC_GetIcon (LPCSTR sSourceFile, INT dwSourceIndex, BOOL bSmallIcon )
static HICON WINE_UNUSED SIC_GetIcon (LPCSTR sSourceFile, INT dwSourceIndex, BOOL bSmallIcon )
{ INT index;
TRACE(shell,"%s %i\n", sSourceFile, dwSourceIndex);
......
......@@ -30,6 +30,7 @@
#include "syslevel.h"
#include "server.h"
#include "process.h"
#include "options.h"
#include "debug.h"
/* Define the VFAT ioctl to get both short and long file names */
......
......@@ -162,16 +162,16 @@ HRESULT WINAPI DirectDrawEnumerateExA(
if (DDRAW_DGA_Available()) {
TRACE(ddraw, "Enumerating DGA interface\n");
if (!lpCallback(&DGA_DirectDraw_GUID, "WINE with XFree86 DGA", "display", lpContext, NULL))
if (!lpCallback(&DGA_DirectDraw_GUID, "WINE with XFree86 DGA", "display", lpContext, 0))
return DD_OK;
}
TRACE(ddraw, "Enumerating Xlib interface\n");
if (!lpCallback(&XLIB_DirectDraw_GUID, "WINE with Xlib", "display", lpContext, NULL))
if (!lpCallback(&XLIB_DirectDraw_GUID, "WINE with Xlib", "display", lpContext, 0))
return DD_OK;
TRACE(ddraw, "Enumerating Default interface\n");
if (!lpCallback(NULL,"WINE (default)", "display", lpContext, NULL))
if (!lpCallback(NULL,"WINE (default)", "display", lpContext, 0))
return DD_OK;
return DD_OK;
......@@ -246,7 +246,7 @@ HRESULT WINAPI DirectDrawEnumerateA(
* DirectDrawEnumerateW (DDRAW.*)
*/
static BOOL DirectDrawEnumerateProcW(
static BOOL WINAPI DirectDrawEnumerateProcW(
GUID *lpGUID, LPWSTR lpDriverDescription, LPWSTR lpDriverName,
LPVOID lpContext, HMONITOR hm)
{
......
......@@ -5,11 +5,12 @@
* Copyright 1998 David Lee Lambert
*
*/
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <debug.h>
#include "winbase.h"
#include "font.h"
#include "debug.h"
......
......@@ -170,6 +170,8 @@ extern void PROPERTY_RemoveWindowProps( WND *pWnd ); /* windows/propert
extern BOOL PAINT_RedrawWindow( HWND hwnd, const RECT *rectUpdate,
HRGN hrgnUpdate, UINT flags,
UINT control ); /* windows/painting.c */
extern void WIN_UpdateNCArea(WND* wnd, BOOL bUpdate);
/* controls/widgets.c */
extern BOOL WIDGETS_Init( void );
......
......@@ -23,7 +23,6 @@
#include "queue.h"
#include "sysmetrics.h"
#include "file.h"
#include "gdi.h"
#include "heap.h"
#include "keyboard.h"
#include "mouse.h"
......
......@@ -17,7 +17,7 @@
#include "winuser.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "gdi.h"
#include "ldt.h"
#include "global.h"
#include "heap.h"
#include "callback.h"
......@@ -435,12 +435,13 @@ static BOOL RES_FreeResource( HGLOBAL handle )
/* If this failed, call USER.DestroyIcon32; this will check
whether it is a shared cursor/icon; if not it will call
GlobalFree16() */
if ( retv )
if ( retv ) {
if ( Callout.DestroyIcon32 )
retv = Callout.DestroyIcon32( handle, CID_RESOURCE );
else
retv = GlobalFree16( handle );
}
}
return (BOOL)retv;
}
......
......@@ -486,7 +486,12 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest )
HFILE oldsrc = src;
#define BUFLEN 1000
BYTE buf[BUFLEN];
UINT WINAPI (*xread)(HFILE,LPVOID,UINT);
/* we need that weird typedef, for i can't seem to get function pointer
* casts right. (Or they probably just do not like WINAPI in general)
*/
typedef UINT WINAPI (*_readfun)(HFILE,LPVOID,UINT);
_readfun xread;
TRACE(file,"(%d,%d)\n",src,dest);
if (!IS_LZ_HANDLE(src)) {
......@@ -498,8 +503,8 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest )
/* not compressed? just copy */
if (!IS_LZ_HANDLE(src))
xread=_lread;
else /* Note: Ignore warning, just mismatched INT/UINT */
xread=LZRead;
else
xread=(_readfun)LZRead;
len=0;
while (1) {
ret=xread(src,buf,BUFLEN);
......
......@@ -39,6 +39,7 @@
#include "heap.h"
#include "debug.h"
#include "xmalloc.h"
#include "options.h"
#include "winreg.h"
#include "winversion.h"
......
......@@ -722,7 +722,7 @@ else {
AH_reg(context) = 0;
*(DWORD *)p = *(DWORD *)"VESA";
*(WORD *)(p+0x04) = 0x0200; /* VESA 2.0 */
*(DWORD *)(p+0x06) = NULL; /* pointer to OEM name */
*(DWORD *)(p+0x06) = 0x00000000; /* pointer to OEM name */
*(DWORD *)(p+0x0a) = 0xfffffffd; /* capabilities flags :-) */
}
break;
......
......@@ -13,6 +13,7 @@
#include "winbase.h"
#include "multimedia.h"
#include "xmalloc.h"
#include "options.h"
#include "debug.h"
#ifdef HAVE_OSS
......
......@@ -6,11 +6,10 @@
#include <string.h>
#include <assert.h>
#include "winbase.h"
#include "wingdi.h"
#include "wine/winestring.h"
#include "gdi.h"
#include "winnt.h"
#include "debug.h"
#include "winerror.h"
#include "debug.h"
/*****************************************************************************
* GetEnhMetaFile32A (GDI32.174)
......
......@@ -10,8 +10,8 @@
#include <assert.h>
#include "winerror.h"
#include "wine/obj_moniker.h"
#include "debug.h"
#include "heap.h"
#include "debug.h"
typedef struct ItemMonikerImpl{
......
......@@ -469,7 +469,7 @@ HOLEMENU WINAPI OleCreateMenuDescriptor(
{
FIXME(ole,"(%x,%p),stub!\n", hmenuCombined, lpMenuWidths);
return NULL;
return 0;
}
/***********************************************************************
......
......@@ -318,7 +318,7 @@ static OLEFontImpl* OLEFontImpl_Construct(LPFONTDESC fontDesc)
/*
* Initializing all the other members.
*/
newObject->gdiFont = NULL;
newObject->gdiFont = 0;
newObject->fontLock = 0;
newObject->cyHimetric = 1;
newObject->cyLogical = 1;
......@@ -338,7 +338,7 @@ static void OLEFontImpl_Destroy(OLEFontImpl* fontDesc)
if (fontDesc->description.lpstrName!=0)
HeapFree(GetProcessHeap(), 0, fontDesc->description.lpstrName);
if (fontDesc->gdiFont!=NULL)
if (fontDesc->gdiFont!=0)
DeleteObject(fontDesc->gdiFont);
HeapFree(GetProcessHeap(), 0, fontDesc);
......@@ -923,7 +923,7 @@ static HRESULT WINAPI OLEFontImpl_AddRefHfont(
{
_ICOM_THIS(OLEFontImpl, iface);
if ( (hfont == NULL) ||
if ( (hfont == 0) ||
(hfont != this->gdiFont) )
return E_INVALIDARG;
......@@ -943,7 +943,7 @@ static HRESULT WINAPI OLEFontImpl_ReleaseHfont(
{
_ICOM_THIS(OLEFontImpl, iface);
if ( (hfont == NULL) ||
if ( (hfont == 0) ||
(hfont != this->gdiFont) )
return E_INVALIDARG;
......@@ -955,7 +955,7 @@ static HRESULT WINAPI OLEFontImpl_ReleaseHfont(
if (this->fontLock==0)
{
DeleteObject(this->gdiFont);
this->gdiFont = NULL;
this->gdiFont = 0;
}
return S_OK;
......
......@@ -27,7 +27,6 @@
#include "winuser.h"
#include "winerror.h"
#include "wine/obj_base.h"
#include "gdi.h"
#include "dinput.h"
#include "debug.h"
#include "message.h"
......@@ -890,9 +889,7 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
if (This->acquired == 0) {
POINT point;
/* This stores the current mouse handler.
FIXME : need to be fixed for native USER use */
WND *tempWnd = 0;
/* This stores the current mouse handler. */
This->prev_handler = mouse_event;
/* Store (in a global variable) the current lock */
......
......@@ -19,7 +19,6 @@
#include "wine/winuser16.h"
#include "wine/keyboard16.h"
#include "win.h"
#include "gdi.h"
#include "heap.h"
#include "input.h"
#include "keyboard.h"
......
......@@ -17,7 +17,6 @@
#include "winuser.h"
#include "wine/keyboard16.h"
#include "win.h"
#include "gdi.h"
#include "heap.h"
#include "keyboard.h"
#include "message.h"
......
......@@ -14,7 +14,6 @@
#include "message.h"
#include "winerror.h"
#include "win.h"
#include "gdi.h"
#include "sysmetrics.h"
#include "heap.h"
#include "hook.h"
......
......@@ -10,7 +10,6 @@
#include "win.h"
#include "queue.h"
#include "gdi.h"
#include "dce.h"
#include "heap.h"
#include "debug.h"
......
......@@ -1336,7 +1336,6 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process )
{
HTASK16 htask;
DWORD retvalue;
TDB *tdb;
WND *wndPtr = WIN_FindWndPtr( hwnd );
......
......@@ -12,7 +12,6 @@
#include "winbase.h"
#include "winuser.h"
#include "debug.h"
#include "gdi.h"
#include "tweak.h"
static const char * const DefSysColors[] =
......
......@@ -8,7 +8,6 @@
#include <stdio.h>
#include "winbase.h"
#include "winuser.h"
#include "gdi.h"
#include "monitor.h"
#include "options.h"
#include "sysmetrics.h"
......
......@@ -9,8 +9,8 @@
#include "wine/winbase16.h"
#include "winuser.h"
#include "heap.h"
#include "gdi.h"
#include "user.h"
#include "gdi.h"
#include "task.h"
#include "queue.h"
#include "win.h"
......@@ -18,7 +18,6 @@
#include "menu.h"
#include "cursoricon.h"
#include "hook.h"
#include "debug.h"
#include "toolhelp.h"
#include "message.h"
#include "module.h"
......@@ -28,6 +27,7 @@
#include "local.h"
#include "class.h"
#include "desktop.h"
#include "debug.h"
/***********************************************************************
* GetFreeSystemResources (USER.284)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment