Removed ddcomm.h, and put the macro SET_FORMATETC into nsClipboard.h, and then removed ddcomm.h from the src

widget/src/windows/DDCOMM.H

@@ -1,33 +0,0 @@
-#ifndef F_DDCOMM
-#define F_DDCOMM
-
-#define STRICT
-#include <windows.h>
-#include <ole2.h>
-#include <ole2ver.h>
-
-//extern "C" GUID CLSID_CfDataObj;
-//#define RCF_FORMAT "RCF Format"
-
-//ReleaseInterface calls 'Release' and NULLs the pointer
-#define RELEASE_INTERFACE(p)\
-            {\
-            if (NULL!=p)\
-                {\
-                p->Release();\
-                p=NULL;\
-                }\
-				}
-
-#define SET_FORMATETC(fe, cf, td, asp, li, med)   \
-	 {\
-	 (fe).cfFormat=cf;\
-	 (fe).ptd=td;\
-	 (fe).dwAspect=asp;\
-	 (fe).lindex=li;\
-	 (fe).tymed=med;\
-	 }
-
-
-#endif
-

widget/src/windows/nsClipboard.cpp

@@ -32,8 +32,6 @@
 #include "nsIComponentManager.h"
 #include "nsWidgetsCID.h"
 
-#include "DDCOMM.h"
-
 #include "nsVoidArray.h"
 #include "nsFileSpec.h"
 

widget/src/windows/nsClipboard.h

@@ -70,4 +70,14 @@ protected:
 
 };
 
+#define SET_FORMATETC(fe, cf, td, asp, li, med)   \
+	 {\
+	 (fe).cfFormat=cf;\
+	 (fe).ptd=td;\
+	 (fe).dwAspect=asp;\
+	 (fe).lindex=li;\
+	 (fe).tymed=med;\
+	 }
+
+
 #endif // nsClipboard_h__

widget/src/windows/nsDataObj.cpp

@@ -16,15 +16,12 @@
  * Reserved.
  */
 
-#include "Ddcomm.h"
-//#include "DragDrop.h"
 #include "nsDataObj.h"
 #include "nsString.h"
 #include "nsVoidArray.h"
 #include "nsITransferable.h"
 #include "IENUMFE.h"
 
-//#include "OLEIDL.h"
 #include "OLE2.h"
 #include "URLMON.h"
 

widget/src/windows/nsDataObjCollection.cpp

@@ -16,7 +16,6 @@
  * Reserved.
  */
 
-#include "Ddcomm.h"
 #include "nsDataObjCollection.h"
 #include "nsString.h"
 #include "nsVoidArray.h"
@@ -183,7 +182,7 @@ STDMETHODIMP nsDataObjCollection::QueryGetData(LPFORMATETC pFE)
   }
 
 
-  for (PRUint32 i=0;i<mDataObjects->Count();i++) {
+  for (PRInt32 i=0;i<mDataObjects->Count();i++) {
     IDataObject * dataObj = (IDataObject *)mDataObjects->ElementAt(i);
     if (S_OK == dataObj->QueryGetData(pFE)) {
       return S_OK;

widget/src/windows/nsDragService.cpp

@@ -29,7 +29,6 @@
 
 #include <OLE2.h>
 #include "OLEIDL.H"
-#include "DDCOMM.h" // SET_FORMATETC macro
 
 static const char * MULTI_MIME = "Mozilla/IDataObjectCollectionFormat";
 

widget/src/windows/nsNativeDragSource.cpp

@@ -16,7 +16,6 @@
  * Reserved.
  */
 
-#include "Ddcomm.h"
 #include "nsNativeDragSource.h"
 #include <stdio.h>
 

widget/src/windows/nsNativeDragTarget.cpp

@@ -18,7 +18,6 @@
  */
 
 #include <stdio.h>
-#include "Ddcomm.h"
 #include "nsIDragService.h"
 #include "nsWidgetsCID.h"
 #include "nsNativeDragTarget.h"

widget/src/windows/nsNativeDragTarget.h

@@ -22,6 +22,7 @@
 #include "nsGUIEvent.h"
 #include "nsCOMPtr.h"
 #include "nsIDragSession.h"
+#include <ole2.h>
 
 class nsIDragService;
 class nsIWidget;