Don't include windows.h & co in the Wine sources.

Remove uneeded COM_NO_WINDOWS_H defines.

dlls/amstream/main.c

@@ -25,7 +25,6 @@
 #include <string.h>
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "windef.h"
 #include "winbase.h"

dlls/amstream/regsvr.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 

dlls/avicap32/avicap32_main.c

@@ -20,8 +20,6 @@
 #include "config.h"
 #include "wine/port.h"
 
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <fcntl.h>

dlls/avifil32/acmstream.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 

dlls/avifil32/api.c

@@ -21,7 +21,6 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "windef.h"
 #include "winbase.h"

dlls/avifil32/avifile.c

@@ -30,7 +30,6 @@
  *    When index is missing it works, but index seems to be okay.
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 

dlls/avifil32/editstream.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 

dlls/avifil32/extrachunk.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 
 #include "extrachunk.h"

dlls/avifil32/factory.c

@@ -20,7 +20,6 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "windef.h"
 #include "winbase.h"

dlls/avifil32/getframe.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 

dlls/avifil32/icmstream.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 

dlls/avifil32/regsvr.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 

dlls/avifil32/tmpfile.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 

dlls/avifil32/wavfile.c

@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 

dlls/comcat/comcat_private.h

@@ -21,7 +21,6 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "windef.h"
 #include "winbase.h"

dlls/comcat/regsvr.c

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 #include <string.h>
 

dlls/comctl32/animate.c

@@ -33,7 +33,6 @@
  *   - check for the 'rec ' list in some AVI files
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 #include "windef.h"

dlls/comdlg32/cdlg.h

@@ -21,7 +21,6 @@
 #ifndef _WINE_DLL_CDLG_H
 #define _WINE_DLL_CDLG_H
 
-#define COM_NO_WINDOWS_H
 #include "dlgs.h"
 #include "wownt32.h"
 

dlls/comdlg32/cdlg16.h

@@ -23,7 +23,6 @@
 #ifndef _WINE_DLL_CDLG16_H
 #define _WINE_DLL_CDLG16_H
 
-#define COM_NO_WINDOWS_H
 #include "dlgs.h"
 #include "wine/windef16.h"
 #include "wine/winbase16.h"

dlls/comdlg32/filedlgbrowser.h

@@ -26,7 +26,6 @@
 #include <stdarg.h>
 #endif
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3dxof/main.c

@@ -25,7 +25,6 @@
 #include <string.h>
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "windef.h"
 #include "winbase.h"

dlls/d3dxof/regsvr.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 

dlls/devenum/devenum_private.h

@@ -32,7 +32,6 @@
 #include "winerror.h"
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "ole2.h"
 #include "strmif.h"

dlls/dxdiagn/regsvr.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 

dlls/dxerr8/dxerr8.c

@@ -21,7 +21,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/dxerr9/dxerr9.c

@@ -21,7 +21,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/dxguid/dx8guid.c

@@ -21,7 +21,6 @@
 
 #include <stdarg.h>
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/dxguid/dx9guid.c

@@ -22,7 +22,6 @@
 
 #include <stdarg.h>
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/dxguid/dxguid.c

@@ -21,7 +21,6 @@
 
 #include <stdarg.h>
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/hhctrl.ocx/regsvr.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 

dlls/mciavi32/private_mciavi.h

@@ -21,7 +21,6 @@
 #ifndef __WINE_PRIVATE_MCIAVI_H
 #define __WINE_PRIVATE_MCIAVI_H
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include "windef.h"
 #include "winbase.h"

dlls/msdmo/dmoreg.c

@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 
 #include "windef.h"

dlls/msdmo/dmort.c

@@ -19,7 +19,6 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "windef.h"
 #include "winbase.h"

dlls/msrle32/msrle_private.h

@@ -23,7 +23,6 @@
 #include <stdarg.h>
 #endif
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "mmsystem.h"

dlls/msvfw32/msvideo16.c

@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>

dlls/msvfw32/msvideo_main.c

@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/objsel/objsel_private.h

@@ -29,7 +29,6 @@
 #include "winuser.h"
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "ole2.h"
 #include "strmif.h"

dlls/oledlg/oledlg_main.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 
 #include "windef.h"

dlls/oledlg/pastespl.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #define COBJMACROS
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION

dlls/olepro32/olepro32stubs.c

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 
 #include "wine/debug.h"

dlls/quartz/enummoniker.c

@@ -22,7 +22,6 @@
  */
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "quartz_private.h"
 

dlls/quartz/filtergraph.c

@@ -32,7 +32,6 @@
 #include "dshow.h"
 #include "wine/debug.h"
 #include "quartz_private.h"
-#define COM_NO_WINDOWS_H
 #include "ole2.h"
 #include "olectl.h"
 #include "strmif.h"

dlls/quartz/filtermapper.c

@@ -31,7 +31,6 @@
 
 #include "quartz_private.h"
 
-#define COM_NO_WINDOWS_H
 #include "ole2.h"
 #include "olectl.h"
 #include "strmif.h"

dlls/quartz/regsvr.c

@@ -21,7 +21,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <string.h>
 

dlls/quartz/systemclock.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include "quartz_private.h"
 
 #include "wine/debug.h"

dlls/shdocvw/shdocvw.h

@@ -22,7 +22,6 @@
 #ifndef __WINE_SHDOCVW_H
 #define __WINE_SHDOCVW_H
 
-#define COM_NO_WINDOWS_H
 #define COBJMACROS
 
 #include <stdarg.h>

dlls/shdocvw/shlinstobj.c

@@ -26,7 +26,6 @@
 #include <stdarg.h>
 
 #define COBJMACROS
-#define COM_NO_WINDOWS_H
 
 #include "windef.h"
 #include "winbase.h"

dlls/shlwapi/msgbox.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include "config.h"
 #include "wine/port.h"
 

dlls/shlwapi/ordinal.c

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include "config.h"
 #include "wine/port.h"
 

dlls/shlwapi/string.c

@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include "config.h"
 #include "wine/port.h"
 

dlls/strmiids/strmiids.c

@@ -21,7 +21,6 @@
 
 #include <stdarg.h>
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/urlmon/regsvr.c

@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>

dlls/urlmon/umon.c

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <stdio.h>
 

dlls/uuid/uuid.c

@@ -22,7 +22,6 @@
 #include <stdarg.h>
 
 #include "windef.h"
-#define COM_NO_WINDOWS_H
 #include "initguid.h"
 
 /* GUIDs defined in uuids.lib */

dlls/winex11.drv/event.c

@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include "config.h"
 
 #include <X11/Xatom.h>
@@ -650,6 +649,8 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
     wine_tsx11_lock();
     XQueryPointer( event->display, win, &w_aux_root, &w_aux_child,
                    &x, &y, &dummy, &dummy, (unsigned int*)&aux_long);
+    x += virtual_screen_rect.left;
+    y += virtual_screen_rect.top;
     wine_tsx11_unlock();
 
     pWnd = WIN_GetPtr(hWnd);
@@ -802,6 +803,8 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
       wine_tsx11_lock();
       XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux,
                      &x, &y, &u.i, &u.i, &u.u);
+      x += virtual_screen_rect.left;
+      y += virtual_screen_rect.top;
       wine_tsx11_unlock();
 
       drop_len += sizeof(DROPFILES) + 1;

dlls/wininet/urlcache.c

@@ -22,7 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COM_NO_WINDOWS_H
 #include "config.h"
 #include "wine/port.h"
 

include/mediaobj.idl

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-cpp_quote("#ifndef COM_NO_WINDOWS_H")
+cpp_quote("#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)")
 cpp_quote("#include <windows.h>")
 cpp_quote("#include <ole2.h>")
 cpp_quote("#endif")