Fixed some warnings. removed some unneccessary includes, removed one

controls/menu.c

@@ -561,13 +561,11 @@ static MENUITEM *MENU_FindItemByCoords( POPUPMENU *menu,
 					POINT pt, UINT *pos )
 {
     MENUITEM *item;
-    WND *wndPtr;
     UINT i;
+    RECT wrect;
 
-    if (!(wndPtr = WIN_FindWndPtr( menu->hWnd ))) return NULL;
-    pt.x -= wndPtr->rectWindow.left;
-    pt.y -= wndPtr->rectWindow.top;
-    WIN_ReleaseWndPtr(wndPtr);
+    if (!GetWindowRect(menu->hWnd,&wrect)) return NULL;
+    pt.x -= wrect.left;pt.y -= wrect.top;
     item = menu->items;
     for (i = 0; i < menu->nItems; i++, item++)
     {
@@ -4281,7 +4279,7 @@ BOOL WINAPI GetMenuItemRect (HWND hwnd, HMENU hMenu, UINT uItem,
 	 if (itemMenu == NULL) 
 	     return FALSE;
 
-	 if(itemMenu->hWnd == NULL)
+	 if(itemMenu->hWnd == 0)
 	     return FALSE;
 	 referenceHwnd = itemMenu->hWnd;
      }

dlls/shell32/dataobject.c

@@ -198,7 +198,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC
 static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut);
 static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM* pmedium, BOOL fRelease);
 static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC** ppenumFormatEtc);
-static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, LPFORMATETC* pformatetc, DWORD advf, IAdviseSink* pAdvSink, DWORD* pdwConnection);
+static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, FORMATETC* pformatetc, DWORD advf, IAdviseSink* pAdvSink, DWORD* pdwConnection);
 static HRESULT WINAPI IDataObject_fnDUnadvise(LPDATAOBJECT iface, DWORD dwConnection);
 static HRESULT WINAPI IDataObject_fnEnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise);
 
@@ -447,7 +447,7 @@ static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDi
 	FIXME (shell, "(%p)->()\n", This);
 	return E_NOTIMPL;
 }
-static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, LPFORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection)
+static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 	FIXME (shell, "(%p)->()\n", This);

dlls/shell32/shlfolder.c

@@ -76,7 +76,7 @@ static HRESULT WINAPI ISFDropTarget_QueryInterface(
 	}   
 
 	if(*ppvObj)
-	{ IDropTarget_AddRef((ISFDropTarget*)*ppvObj);
+	{ IDropTarget_AddRef((IDropTarget*)*ppvObj);
 	  TRACE(shell,"-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
 	  return S_OK;
 	}

graphics/metafiledrv/text.c

@@ -6,13 +6,8 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
-#include "dc.h"
-#include "gdi.h"
-#include "callback.h"
-#include "heap.h"
+#include "windef.h"
 #include "metafile.h"
-#include "metafiledrv.h"
 #include "debug.h"
 #include "xmalloc.h"
 

include/winioctl.h

@@ -207,7 +207,7 @@
 #define PARTITION_EXTENDED              0x05      /* Extended partition entry */
 #define PARTITION_HUGE                  0x06      /* Huge partition MS-DOS V4 */
 #define PARTITION_IFS                   0x07      /* IFS Partition */
-#define PARTITION_FAT                 0x0B      /* FAT32 */
+#define PARTITION_FAT32                 0x0B      /* FAT32 */
 #define PARTITION_FAT32_XINT13          0x0C      /* FAT32 using extended int13 services */
 #define PARTITION_XINT13                0x0E      /* Win95 partition using extended int13 services */
 #define PARTITION_XINT13_EXTENDED       0x0F      /* Same as type 5 but uses extended int13 services */

win32/kernel32.c

@@ -22,7 +22,6 @@
 #include "heap.h"
 #include "selectors.h"
 #include "task.h"
-#include "win.h"
 #include "file.h"
 #include "debug.h"
 #include "flatthunk.h"