Fixed a few more headers dependency issues.

dlls/avicap32/avicap32_main.c

@@ -22,6 +22,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "vfw.h"
 #include "winreg.h"
 #include "winternl.h"

dlls/avifil32/extrachunk.c

@@ -22,6 +22,7 @@
 #include "extrachunk.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "windowsx.h"
 #include "vfw.h"
 

dlls/avifil32/factory.c

@@ -23,6 +23,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winnls.h"
 #include "winerror.h"
 

dlls/avifil32/getframe.c

@@ -25,6 +25,7 @@
 #include "winnls.h"
 #include "windowsx.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "vfw.h"
 
 #include "avifile_private.h"

dlls/dplayx/dplay.c

@@ -34,7 +34,6 @@
 #include "winreg.h"
 #include "winnls.h"
 #include "wine/unicode.h"
-#include "dplay.h"
 #include "wine/debug.h"
 
 #include "dpinit.h"

dlls/dplayx/dplaysp.h

@@ -23,6 +23,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "dplay.h"
 #include "dplobby.h"
 

dlls/dplayx/dplayx_global.h

@@ -23,6 +23,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "dplay.h"
 
 BOOL DPLAYX_ConstructData(void);

dlls/dplayx/dplobby.c

@@ -30,11 +30,11 @@
 #include "winnls.h"
 #include "wine/debug.h"
 
-#include "dplobby.h"
-#include "dpinit.h"
 #include "dplayx_global.h"
 #include "dplayx_messages.h"
 #include "dplayx_queue.h"
+#include "dplobby.h"
+#include "dpinit.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 

dlls/dplayx/lobbysp.h

@@ -23,6 +23,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "dplobby.h"
 
 /* GUID for IDPLobbySP {5A4E5A20-2CED-11d0-A889-00A0C905433C} */

dlls/mshtml/main.c

@@ -25,6 +25,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "ole2.h"
 
 #include "uuids.h"

dlls/msvideo/msrle32/msrle_private.h

@@ -28,6 +28,7 @@
 #include "winbase.h"
 #include "mmsystem.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "vfw.h"
 
 #define IDS_NAME        100

dlls/ole32/compositemoniker.c

@@ -26,6 +26,7 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"

dlls/ole32/defaulthandler.c

@@ -51,6 +51,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/unicode.h"
 #include "ole2.h"

dlls/ole32/git.c

@@ -36,6 +36,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "ole2.h"
 #include "winerror.h"

dlls/ole32/hglobalstream.c

@@ -33,6 +33,7 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "ole2.h"
 #include "winerror.h"

dlls/ole32/ifs.c

@@ -28,6 +28,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "ole2.h"
 #include "winerror.h"
 

dlls/ole32/itemmoniker.c

@@ -27,6 +27,7 @@
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "winnls.h"
 #include "wine/debug.h"
 #include "ole2.h"

dlls/ole32/marshal.c

@@ -28,6 +28,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "ole2.h"
 #include "ole2ver.h"

dlls/ole32/memlockbytes.c

@@ -29,6 +29,7 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "wine/winbase16.h"
 #include "objbase.h"
 #include "ole2.h"

dlls/ole32/memlockbytes16.c

@@ -29,6 +29,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wine/winbase16.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "ole2.h"
 #include "winerror.h"

dlls/ole32/moniker.c

@@ -26,6 +26,7 @@
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "wtypes.h"
 #include "wine/debug.h"
 #include "ole2.h"

dlls/ole32/ole16.c

@@ -32,6 +32,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "ole2.h"
 #include "ole2ver.h"

dlls/ole32/oleobj.c

@@ -24,6 +24,7 @@
 #include <string.h>
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/debug.h"
 #include "ole2.h"
@@ -758,4 +759,3 @@ HRESULT WINAPI CreateDataAdviseHolder(
 
   return E_OUTOFMEMORY;
 }
-

dlls/ole32/oleproxy.c

@@ -42,6 +42,7 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "ole2.h"
 #include "rpc.h"

dlls/ole32/rpc.c

@@ -30,6 +30,7 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "ole2.h"
 #include "ole2ver.h"

dlls/ole32/stg_bigblockfile.c

@@ -42,6 +42,7 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "objbase.h"
 #include "ole2.h"

dlls/oleaut32/ole2disp.c

@@ -26,11 +26,11 @@
 #include "wine/windef16.h"
 #include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "ole2.h"
 #include "oleauto.h"
 #include "winerror.h"
-#include "wingdi.h"
-#include "winuser.h"
 
 #include "ole2disp.h"
 #include "olectl.h"

dlls/olepro32/olepro32stubs.c

@@ -26,6 +26,7 @@
 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "ole2.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);

dlls/quartz/enummoniker.c

@@ -26,6 +26,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "ole2.h"
 #include "strmif.h"
 

dlls/rpcrt4/rpcrt4_main.c

@@ -110,6 +110,7 @@
 #include "windef.h"
 #include "winerror.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "wine/unicode.h"
 #include "rpc.h"
 

dlls/shdocvw/Makefile.in

@@ -5,6 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
 IMPORTS   = ole32 user32 advapi32 kernel32
+EXTRALIBS = $(LIBUUID)
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/shdocvw/events.c

@@ -28,6 +28,9 @@
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 
+static const GUID IID_INotifyDBEvents =
+    { 0xdb526cc0, 0xd188, 0x11cd, { 0xad, 0x48, 0x00, 0xaa, 0x00, 0x3c, 0x9c, 0xb6 } };
+
 /**********************************************************************
  * Implement the IConnectionPointContainer interface
  */

dlls/shdocvw/shdocvw.h

@@ -190,10 +190,4 @@ typedef struct
 
 extern IConnectionPointImpl SHDOCVW_ConnectionPoint;
 
-
-/* Other stuff.. */
-
-DEFINE_GUID(IID_INotifyDBEvents,
-0xdb526cc0, 0xd188, 0x11cd, 0xad, 0x48, 0x0, 0xaa, 0x0, 0x3c, 0x9c, 0xb6);
-
 #endif /* __WINE_SHDOCVW_H */

dlls/shdocvw/shdocvw_main.c

@@ -24,7 +24,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
-#include "initguid.h"
+#include "winuser.h"
 #include "ole2.h"
 #include "shlwapi.h"
 

dlls/shell32/dragdrophelper.c

@@ -28,12 +28,12 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
 
 #include "objbase.h"
 #include "ole2.h"
 #include "shlguid.h"
-#include "wingdi.h"
-#include "winuser.h"
 #include "shlobj.h"
 
 #include "wine/debug.h"

dlls/shell32/shfldr_desktop.c

@@ -35,6 +35,7 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "wingdi.h"
+#include "winuser.h"
 
 #include "ole2.h"
 #include "shlguid.h"

dlls/shell32/shfldr_fs.c

@@ -35,6 +35,7 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "wingdi.h"
+#include "winuser.h"
 
 #include "ole2.h"
 #include "shlguid.h"

dlls/shell32/shlfolder.c

@@ -35,6 +35,7 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "wingdi.h"
+#include "winuser.h"
 
 #include "ole2.h"
 #include "shlguid.h"

include/oleidl.h

@@ -272,7 +272,6 @@ typedef struct IOleInPlaceActiveObject IOleInPlaceActiveObject;
 
 typedef IOleInPlaceActiveObject *LPOLEINPLACEACTIVEOBJECT;
 
-struct tagMSG;
 /*****************************************************************************
  * IOleInPlaceActiveObject interface
  */
@@ -284,14 +283,7 @@ DEFINE_GUID(IID_IOleInPlaceActiveObject, 0x00000117, 0x0000, 0x0000, 0xc0,0x00,
 struct IOleInPlaceActiveObject : public IOleWindow
 {
     virtual HRESULT STDMETHODCALLTYPE TranslateAccelerator(
-        struct tagMSG {
-            HWND hwnd;
-            UINT message;
-            WPARAM wParam;
-            LPARAM lParam;
-            DWORD time;
-            POINT pt;
-        }* lpmsg) = 0;
+        LPMSG lpmsg) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE OnFrameWindowActivate(
         BOOL fActivate) = 0;
@@ -340,7 +332,7 @@ struct IOleInPlaceActiveObjectVtbl {
     /*** IOleInPlaceActiveObject methods ***/
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
         IOleInPlaceActiveObject* This,
-        struct tagMSG* lpmsg);
+        LPMSG lpmsg);
 
     HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)(
         IOleInPlaceActiveObject* This,
@@ -388,7 +380,7 @@ struct IOleInPlaceActiveObjectVtbl {
     STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND* phwnd) PURE; \
     STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL fEnterMode) PURE; \
     /*** IOleInPlaceActiveObject methods ***/ \
-    STDMETHOD_(HRESULT,TranslateAccelerator)(THIS_ struct tagMSG* lpmsg) PURE; \
+    STDMETHOD_(HRESULT,TranslateAccelerator)(THIS_ LPMSG lpmsg) PURE; \
     STDMETHOD_(HRESULT,OnFrameWindowActivate)(THIS_ BOOL fActivate) PURE; \
     STDMETHOD_(HRESULT,OnDocWindowActivate)(THIS_ BOOL fActivate) PURE; \
     STDMETHOD_(HRESULT,ResizeBorder)(THIS_ LPCRECT prcBorder, IOleInPlaceUIWindow* pUIWindow, BOOL fFrameWindow) PURE; \
@@ -403,7 +395,7 @@ void __RPC_STUB IOleInPlaceActiveObject_RemoteTranslateAccelerator_Stub(
     DWORD* pdwStubPhase);
 HRESULT CALLBACK IOleInPlaceActiveObject_TranslateAccelerator_Proxy(
     IOleInPlaceActiveObject* This,
-    struct tagMSG* lpmsg);
+    LPMSG lpmsg);
 HRESULT __RPC_STUB IOleInPlaceActiveObject_TranslateAccelerator_Stub(
     IOleInPlaceActiveObject* This);
 HRESULT CALLBACK IOleInPlaceActiveObject_OnFrameWindowActivate_Proxy(
@@ -652,7 +644,7 @@ struct IOleInPlaceFrame : public IOleInPlaceUIWindow
         BOOL fEnable) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE TranslateAccelerator(
-        struct tagMSG* lpmsg,
+        LPMSG lpmsg,
         WORD wID) = 0;
 
 };
@@ -729,7 +721,7 @@ struct IOleInPlaceFrameVtbl {
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
         IOleInPlaceFrame* This,
-        struct tagMSG* lpmsg,
+        LPMSG lpmsg,
         WORD wID);
 
 };
@@ -776,7 +768,7 @@ struct IOleInPlaceFrameVtbl {
     STDMETHOD_(HRESULT,RemoveMenus)(THIS_ HMENU hmenuShared) PURE; \
     STDMETHOD_(HRESULT,SetStatusText)(THIS_ LPCOLESTR pszStatusText) PURE; \
     STDMETHOD_(HRESULT,EnableModeless)(THIS_ BOOL fEnable) PURE; \
-    STDMETHOD_(HRESULT,TranslateAccelerator)(THIS_ struct tagMSG* lpmsg, WORD wID) PURE;
+    STDMETHOD_(HRESULT,TranslateAccelerator)(THIS_ LPMSG lpmsg, WORD wID) PURE;
 
 HRESULT CALLBACK IOleInPlaceFrame_InsertMenus_Proxy(
     IOleInPlaceFrame* This,
@@ -823,7 +815,7 @@ void __RPC_STUB IOleInPlaceFrame_EnableModeless_Stub(
     DWORD* pdwStubPhase);
 HRESULT CALLBACK IOleInPlaceFrame_TranslateAccelerator_Proxy(
     IOleInPlaceFrame* This,
-    struct tagMSG* lpmsg,
+    LPMSG lpmsg,
     WORD wID);
 void __RPC_STUB IOleInPlaceFrame_TranslateAccelerator_Stub(
     struct IRpcStubBuffer* This,
@@ -2543,7 +2535,7 @@ struct IOleObject : public IUnknown
 
     virtual HRESULT STDMETHODCALLTYPE DoVerb(
         LONG iVerb,
-        struct tagMSG* lpmsg,
+        LPMSG lpmsg,
         IOleClientSite* pActiveSite,
         LONG lindex,
         HWND hwndParent,
@@ -2654,7 +2646,7 @@ struct IOleObjectVtbl {
     HRESULT (STDMETHODCALLTYPE *DoVerb)(
         IOleObject* This,
         LONG iVerb,
-        struct tagMSG* lpmsg,
+        LPMSG lpmsg,
         IOleClientSite* pActiveSite,
         LONG lindex,
         HWND hwndParent,
@@ -2757,7 +2749,7 @@ struct IOleObjectVtbl {
     STDMETHOD_(HRESULT,GetMoniker)(THIS_ DWORD dwAssign, DWORD dwWhichMoniker, IMoniker** ppmk) PURE; \
     STDMETHOD_(HRESULT,InitFromData)(THIS_ IDataObject* pDataObject, BOOL fCreation, DWORD dwReserved) PURE; \
     STDMETHOD_(HRESULT,GetClipboardData)(THIS_ DWORD dwReserved, IDataObject** ppDataObject) PURE; \
-    STDMETHOD_(HRESULT,DoVerb)(THIS_ LONG iVerb, struct tagMSG* lpmsg, IOleClientSite* pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) PURE; \
+    STDMETHOD_(HRESULT,DoVerb)(THIS_ LONG iVerb, LPMSG lpmsg, IOleClientSite* pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) PURE; \
     STDMETHOD_(HRESULT,EnumVerbs)(THIS_ IEnumOLEVERB** ppEnumOleVerb) PURE; \
     STDMETHOD_(HRESULT,Update)(THIS) PURE; \
     STDMETHOD_(HRESULT,IsUpToDate)(THIS) PURE; \
@@ -2845,7 +2837,7 @@ void __RPC_STUB IOleObject_GetClipboardData_Stub(
 HRESULT CALLBACK IOleObject_DoVerb_Proxy(
     IOleObject* This,
     LONG iVerb,
-    struct tagMSG* lpmsg,
+    LPMSG lpmsg,
     IOleClientSite* pActiveSite,
     LONG lindex,
     HWND hwndParent,

include/oleidl.idl

@@ -108,11 +108,9 @@ interface IOleInPlaceActiveObject : IOleWindow
 {
     typedef [unique] IOleInPlaceActiveObject *LPOLEINPLACEACTIVEOBJECT;
 
-cpp_quote("struct tagMSG;")  /* FIXME */
-
     [local]
     HRESULT TranslateAccelerator(
-        [in] struct tagMSG *lpmsg);
+        [in] LPMSG lpmsg);
 
     [call_as(TranslateAccelerator)]
     HRESULT RemoteTranslateAccelerator();
@@ -220,7 +218,7 @@ interface IOleInPlaceFrame : IOleInPlaceUIWindow
         [in] BOOL fEnable);
 
     HRESULT TranslateAccelerator(
-        [in] struct tagMSG *lpmsg,
+        [in] LPMSG lpmsg,
         [in] WORD wID);
 }
 
@@ -686,7 +684,7 @@ interface IOleObject : IUnknown
 
     HRESULT DoVerb(
         [in] LONG iVerb,
-        [in, unique] struct tagMSG *lpmsg,
+        [in, unique] LPMSG lpmsg,
         [in, unique] IOleClientSite *pActiveSite,
         [in] LONG lindex,
         [in] HWND hwndParent,