# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1237997285 -3600
# Node ID b98647bc0aefdebf821c463b307a29b98c0e0d17
# Parent  63aa48e5430fcda7adfa4fbd363d072b19e25323
swt win compiles for d2+phobos

diff -r 63aa48e5430f -r b98647bc0aef base/src/java/lang/StringBuffer.d
--- a/base/src/java/lang/StringBuffer.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/base/src/java/lang/StringBuffer.d	Wed Mar 25 17:08:05 2009 +0100
@@ -35,7 +35,7 @@
         }
     }
 
-    public this( String content ){
+    public this( CString content ){
         version(Tango){
             buf = new TBuf( content );
         } else { // Phobos
@@ -77,7 +77,7 @@
         }
     }
 
-    StringBuffer append( String s ){
+    StringBuffer append( CString s ){
         version(Tango){
             buf.append( s );
         } else { // Phobos
@@ -90,7 +90,7 @@
         return this;
     }
 
-    StringBuffer append( String s, int offset, int len ){
+    StringBuffer append( CString s, int offset, int len ){
         return append( s[ offset .. offset+len ] );
     }
 
@@ -144,7 +144,7 @@
     StringBuffer insert(int offset, int i){
         return insert( offset, String_valueOf(i) );
     }
-    StringBuffer insert(int offset, String str){
+    StringBuffer insert(int offset, CString str){
         return replace( offset, offset, str );
     }
 
@@ -152,7 +152,7 @@
         return insert( offset, other.slice());
     }
 
-    StringBuffer replace(int start, int end, String str) {
+    StringBuffer replace(int start, int end, CString str) {
         version(Tango){
             buf.select(start, end-start);
             buf.replace(str);
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/Accessible.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/Accessible.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/Accessible.d	Wed Mar 25 17:08:05 2009 +0100
@@ -443,7 +443,7 @@
      * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
      * must be incremented before returning.  Caller is responsible for releasing ppvObject.
      */
-    HRESULT QueryInterface(REFIID riid, void** ppvObject) {
+    HRESULT QueryInterface(REFCIID riid, void** ppvObject) {
         if (iaccessible is null) return COM.CO_E_OBJNOTCONNECTED;
 
         if (COM.IsEqualGUID(riid, &COM.IIDIUnknown)) {
@@ -1403,14 +1403,14 @@
     this(Accessible p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
     // interface of IDispatch
     HRESULT GetTypeInfoCount(UINT * pctinfo) { return COM.E_NOTIMPL; }
     HRESULT GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo * ppTInfo) { return COM.E_NOTIMPL; }
-    HRESULT GetIDsOfNames(REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { return COM.E_NOTIMPL; }
+    HRESULT GetIDsOfNames(REFCIID riid, LPCOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { return COM.E_NOTIMPL; }
     HRESULT Invoke(DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS* pDispParams,VARIANT* pVarResult,EXCEPINFO* pExcepInfo,UINT* puArgErr) { return COM.E_NOTIMPL; }
 
     // interface of IAccessible
@@ -1477,7 +1477,7 @@
     this(Accessible a) { parent = a; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CTabItem.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CTabItem.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CTabItem.d	Wed Mar 25 17:08:05 2009 +0100
@@ -287,8 +287,8 @@
         // draw selected tab background and outline
         shape = null;
         if (this.parent.onBottom) {
-            int[] left = parent.simple ? CTabFolder.SIMPLE_BOTTOM_LEFT_CORNER : CTabFolder.BOTTOM_LEFT_CORNER;
-            int[] right = parent.simple ? CTabFolder.SIMPLE_BOTTOM_RIGHT_CORNER : parent.curve;
+            int[] left = parent.simple ? cast(int[])CTabFolder.SIMPLE_BOTTOM_LEFT_CORNER : cast(int[])CTabFolder.BOTTOM_LEFT_CORNER;
+            int[] right = parent.simple ? cast(int[])CTabFolder.SIMPLE_BOTTOM_RIGHT_CORNER : parent.curve;
             if (parent.borderLeft is 0 && parent.indexOf(this) is parent.firstIndex) {
                 left = [x, y+height];
             }
@@ -311,8 +311,8 @@
             shape[index++] = parent.simple ? rightEdge - 1 : rightEdge + parent.curveWidth - parent.curveIndent;
             shape[index++] = y - 1;
         } else {
-            int[] left = parent.simple ? CTabFolder.SIMPLE_TOP_LEFT_CORNER : CTabFolder.TOP_LEFT_CORNER;
-            int[] right = parent.simple ? CTabFolder.SIMPLE_TOP_RIGHT_CORNER : parent.curve;
+            int[] left = parent.simple ? cast(int[])CTabFolder.SIMPLE_TOP_LEFT_CORNER : cast(int[])CTabFolder.TOP_LEFT_CORNER;
+            int[] right = parent.simple ? cast(int[])CTabFolder.SIMPLE_TOP_RIGHT_CORNER : parent.curve;
             if (parent.borderLeft is 0 && parent.indexOf(this) is parent.firstIndex) {
                 left = [x, y];
             }
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/DefaultContent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/DefaultContent.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/DefaultContent.d	Wed Mar 25 17:08:05 2009 +0100
@@ -493,7 +493,7 @@
         while ((length_ - 1 >= 0) && isDelimiter(textStore[start+length_-1])) {
             length_--;
         }
-        return textStore[ start .. start + length_].dup;
+        return textStore[ start .. start + length_]._idup();
     } else {
         // gap is in the specified range, strip out the gap
         StringBuffer buf = new StringBuffer();
@@ -531,14 +531,14 @@
     int end = start + length_ - 1;
     if (!gapExists() || (end < gapStart) || (start >= gapEnd)) {
         // line is before or after the gap
-        return textStore[ start .. start + length_ ].dup;
+        return textStore[ start .. start + length_ ]._idup();
     } else {
         // gap is in the specified range, strip out the gap
         StringBuffer buffer = new StringBuffer();
         int gapLength = gapEnd - gapStart;
         buffer.append(textStore[ start .. gapStart ]);
         buffer.append(textStore[ gapEnd .. gapEnd + length_ - gapLength - (gapStart - start) ]);
-        return buffer.toString().dup;
+        return buffer.toString()._idup();
     }
 }
 /**
@@ -697,7 +697,7 @@
  * @return the text
  */
 String getPhysicalText(int start, int length_) {
-    return textStore[ start .. start + length_ ].dup;
+    return textStore[ start .. start + length_ ]._idup();
 }
 /**
  * Returns a string representing the logical content of
@@ -715,15 +715,15 @@
         return "";
     int end= start + length_;
     if (!gapExists() || (end < gapStart))
-        return textStore[ start .. start + length_].dup;
+        return textStore[ start .. start + length_]._idup();
     if (gapStart < start) {
         int gapLength= gapEnd - gapStart;
-        return textStore[ start + gapLength .. start + gapLength + length_ ].dup;
+        return textStore[ start + gapLength .. start + gapLength + length_ ]._idup();
     }
     StringBuffer buf = new StringBuffer();
     buf.append(textStore[ start .. start + gapStart - start ] );
     buf.append(textStore[ gapEnd .. gapEnd + end - gapStart ] );
-    return buf.toString().dup;
+    return buf.toString()._idup();
 }
 /**
  * Removes the specified <code>TextChangeListener</code>.
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/StyledText.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/StyledText.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/StyledText.d	Wed Mar 25 17:08:05 2009 +0100
@@ -648,7 +648,7 @@
             StringBuffer buffer = new StringBuffer(segment.substring (0, pageIndex));
             buffer.append (page);
             buffer.append (segment.substring(pageIndex + pageTagLength));
-            segment = buffer.toString().dup;
+            segment = buffer.toString()._idup();
         }
         if (segment.length > 0) {
             layout.setText(segment);
@@ -5318,8 +5318,7 @@
 
     //paste clipboard selection
     if (event.button is 2) {
-        auto o = cast(ArrayWrapperString)getClipboardContent(DND.SELECTION_CLIPBOARD);
-        String text = o.array;
+        String text = stringcast(getClipboardContent(DND.SELECTION_CLIPBOARD));
         if (text !is null && text.length > 0) {
             // position cursor
             doMouseLocationChange(event.x, event.y, false);
@@ -6030,10 +6029,7 @@
  */
 public void paste(){
     checkWidget();
-    String text = null;
-    if( auto o = cast(ArrayWrapperString) getClipboardContent(DND.CLIPBOARD)){
-        text = o.array;
-    }
+    String text = stringcast( getClipboardContent(DND.CLIPBOARD));
     if (text !is null && text.length > 0) {
         Event event = new Event();
         event.start = selection.x;
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/TableTree.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/TableTree.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/TableTree.d	Wed Mar 25 17:08:05 2009 +0100
@@ -83,10 +83,10 @@
     */
     bool inDispose = false;
 
-    static const TableTreeItem[] EMPTY_ITEMS;
-    static const String[] EMPTY_TEXTS;
-    static const Image[] EMPTY_IMAGES;
-    static const String ITEMID = "TableTreeItemID"; //$NON-NLS-1$
+    static /+const+/ TableTreeItem[] EMPTY_ITEMS;
+    static /+const+/ String[] EMPTY_TEXTS;
+    static /+const+/ Image[] EMPTY_IMAGES;
+    static /+const+/ String ITEMID = "TableTreeItemID"; //$NON-NLS-1$
 
 /**
  * Constructs a new instance of this class given its parent
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/Clipboard.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/Clipboard.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/Clipboard.d	Wed Mar 25 17:08:05 2009 +0100
@@ -78,7 +78,7 @@
         DND.error(SWT.ERROR_THREAD_INVALID_ACCESS);
     }
     this.display = display;
-    TCHAR* chFormatName = StrToTCHARz(0, "Preferred DropEffect"); //$NON-NLS-1$
+    LPCTSTR chFormatName = StrToTCHARz(0, "Preferred DropEffect"); //$NON-NLS-1$
     CFSTR_PREFERREDDROPEFFECT = OS.RegisterClipboardFormat(chFormatName);
     createCOMInterfaces();
     this.AddRef();
@@ -634,7 +634,7 @@
  * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
  * must be incremented before returning.  Caller is responsible for releasing ppvObject.
  */
-HRESULT QueryInterface(GUID* riid, void ** ppvObject) {
+HRESULT QueryInterface(REFCIID riid, void ** ppvObject) {
     if (riid is null || ppvObject is null) return COM.E_INVALIDARG;
     if (COM.IsEqualGUID(riid, &COM.IIDIUnknown) || COM.IsEqualGUID(riid, &COM.IIDIDataObject) ) {
         *ppvObject = cast(void*)cast(IUnknown)iDataObject;
@@ -801,7 +801,7 @@
     this(Clipboard  p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(GUID* riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/DragSource.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/DragSource.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/DragSource.d	Wed Mar 25 17:08:05 2009 +0100
@@ -632,7 +632,7 @@
  * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
  * must be incremented before returning.  Caller is responsible for releasing ppvObject.
  */
-private HRESULT QueryInterface(REFIID riid, void** ppvObject) {
+private HRESULT QueryInterface(REFCIID riid, void** ppvObject) {
     if (riid is null || ppvObject is null)
         return COM.E_INVALIDARG;
 
@@ -739,7 +739,7 @@
     this(DragSource p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
@@ -754,7 +754,7 @@
     this(DragSource p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/DropTarget.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/DropTarget.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/DropTarget.d	Wed Mar 25 17:08:05 2009 +0100
@@ -597,7 +597,7 @@
  * Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
  * must be incremented before returning.  Caller is responsible for releasing ppvObject.
  */
-HRESULT QueryInterface(REFIID riid, void ** ppvObject) {
+HRESULT QueryInterface(REFCIID riid, void ** ppvObject) {
 
     if (riid is null || ppvObject is null)
         return COM.E_INVALIDARG;
@@ -779,7 +779,7 @@
     this(DropTarget p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/FileTransfer.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/FileTransfer.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/FileTransfer.d	Wed Mar 25 17:08:05 2009 +0100
@@ -92,7 +92,7 @@
         allFiles.append(fileNames[i]);
         allFiles.append(CF_HDROP_SEPARATOR); // each name is null terminated
     }
-    TCHAR[] buffer = StrToTCHARs(0, allFiles.toString(), true); // there is an extra null terminator at the very end
+    StringT buffer = StrToTCHARs(0, allFiles.toString(), true); // there is an extra null terminator at the very end
     DROPFILES dropfiles;
     dropfiles.pFiles = DROPFILES.sizeof;
     dropfiles.pt.x = dropfiles.pt.y = 0;
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/HTMLTransfer.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/HTMLTransfer.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/HTMLTransfer.d	Wed Mar 25 17:08:05 2009 +0100
@@ -84,7 +84,7 @@
     if (!checkHTML(object) || !isSupportedType(transferData)) {
         DND.error(DND.ERROR_INVALID_DATA);
     }
-    String string = ( cast(ArrayWrapperString)object ).array;
+    String string = stringcast(object );
     /* NOTE: CF_HTML uses UTF-8 encoding. */
     int cchMultiByte = OS.WideCharToMultiByte(OS.CP_UTF8, 0, StrToTCHARz(string), -1, null, 0, null, null);
     if (cchMultiByte is 0) {
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/OleEnumFORMATETC.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/OleEnumFORMATETC.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/OleEnumFORMATETC.d	Wed Mar 25 17:08:05 2009 +0100
@@ -92,7 +92,7 @@
     }
     return COM.S_FALSE;
 }
-private HRESULT QueryInterface(REFIID riid, void** ppvObject) {
+private HRESULT QueryInterface(REFCIID riid, void** ppvObject) {
 
     if (riid is null || ppvObject is null) return COM.E_NOINTERFACE;
 
@@ -148,7 +148,7 @@
     this(OleEnumFORMATETC   p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/RTFTransfer.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/RTFTransfer.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/RTFTransfer.d	Wed Mar 25 17:08:05 2009 +0100
@@ -80,8 +80,8 @@
         DND.error(DND.ERROR_INVALID_DATA);
     }
     // CF_RTF is stored as a null terminated byte array
-    String string = (cast(ArrayWrapperString)object).array;
-    wchar* chars = StrToWCHARz(string);
+    String string = stringcast(object);
+    LPCWSTR chars = StrToWCHARz(string);
     int codePage = OS.GetACP();
     int cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null, 0, null, null);
     if (cchMultiByte is 0) {
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/TextTransfer.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/TextTransfer.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/TextTransfer.d	Wed Mar 25 17:08:05 2009 +0100
@@ -77,10 +77,10 @@
         DND.error(DND.ERROR_INVALID_DATA);
     }
     transferData.result = COM.E_FAIL;
-    String string = (cast(ArrayWrapperString)object).array;
+    String string = stringcast(object);
     switch (transferData.type) {
         case COM.CF_UNICODETEXT: {
-            wchar[] chars = StrToWCHARs(0,string, true);
+            String16 chars = StrToWCHARs(0,string, true);
             int charCount = chars.length;
             int byteCount = chars.length * 2;
             auto newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount);
@@ -93,7 +93,7 @@
             break;
         }
         case COM.CF_TEXT: {
-            wchar[] chars = StrToWCHARs(0,string, true);
+            String16 chars = StrToWCHARs(0,string, true);
             int count = chars.length;
             int codePage = OS.GetACP();
             int cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars.ptr, -1, null, 0, null, null);
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/Transfer.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/Transfer.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/Transfer.d	Wed Mar 25 17:08:05 2009 +0100
@@ -166,7 +166,7 @@
     // Look name up in the registry
     // If name is not in registry, add it and return assigned value.
     // If name already exists in registry, return its assigned value
-    TCHAR* chFormatName = StrToTCHARz(0, formatName);
+    LPCTSTR chFormatName = StrToTCHARz(0, formatName);
     return OS.RegisterClipboardFormat(chFormatName);
 }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/URLTransfer.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/URLTransfer.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/URLTransfer.d	Wed Mar 25 17:08:05 2009 +0100
@@ -80,9 +80,9 @@
     }
     transferData.result = COM.E_FAIL;
     // URL is stored as a null terminated byte array
-    String url = (cast(ArrayWrapperString)object).array;
+    String url = stringcast(object);
     int codePage = OS.GetACP();
-    wchar[] chars = StrToWCHARs(codePage, url, true );
+    String16 chars = StrToWCHARs(codePage, url, true );
     int cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars.ptr, -1, null, 0, null, null);
     if (cchMultiByte is 0) {
         transferData.stgmedium = new STGMEDIUM();
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Color.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Color.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Color.d	Wed Mar 25 17:08:05 2009 +0100
@@ -115,7 +115,7 @@
  *
  * @see #dispose
  */
-public this (Device device, RGB rgb) {
+public this (Device device, constRGB rgb) {
     super(device);
     if (rgb is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
     init_(rgb.red, rgb.green, rgb.blue);
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/RGB.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/RGB.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/RGB.d	Wed Mar 25 17:08:05 2009 +0100
@@ -229,3 +229,10 @@
 }
 
 }
+
+version(D_Version2){
+    mixin("alias const(RGB) constRGB;");
+} else { // D1
+    alias RGB constRGB;
+}
+
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/COMAPI.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/COMAPI.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/COMAPI.d	Wed Mar 25 17:08:05 2009 +0100
@@ -272,11 +272,11 @@
 STDAPI CreateStdAccessibleObject(
   HWND hwnd,
   LONG idObject,
-  REFIID riidInterface,
+  REFCIID riidInterface,
   void** ppvObject
 );
 LRESULT LresultFromObject(
-  REFIID riid,
+  REFCIID riid,
   WPARAM wParam,
   LPUNKNOWN pAcc
 );
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/OAIDL.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/OAIDL.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/OAIDL.d	Wed Mar 25 17:08:05 2009 +0100
@@ -859,7 +859,7 @@
 {
 HRESULT GetTypeInfoCount(UINT * pctinfo);
 HRESULT GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo * ppTInfo);
-HRESULT GetIDsOfNames(REFIID riid, LPCOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId);
+HRESULT GetIDsOfNames(REFCIID riid, LPCOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId);
 HRESULT Invoke(DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS* pDispParams,VARIANT* pVarResult,EXCEPINFO* pExcepInfo,UINT* puArgErr);
 }
 alias IDispatch LPDISPATCH;
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleClientSite.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleClientSite.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleClientSite.d	Wed Mar 25 17:08:05 2009 +0100
@@ -929,7 +929,7 @@
 private int OnViewChange(int dwAspect, int lindex) {
     return COM.S_OK;
 }
-protected int QueryInterface(REFIID riid, void ** ppvObject) {
+protected int QueryInterface(REFCIID riid, void ** ppvObject) {
 
     if (riid is null || ppvObject is null)
         return COM.E_NOINTERFACE;
@@ -1351,7 +1351,7 @@
     this(OleClientSite  p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
@@ -1369,7 +1369,7 @@
     this(OleClientSite  p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
@@ -1394,7 +1394,7 @@
     this(OleClientSite  p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
@@ -1407,7 +1407,7 @@
     this(OleClientSite  p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
@@ -1437,7 +1437,7 @@
     this(OleClientSite  p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 }
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleControlSite.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleControlSite.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleControlSite.d	Wed Mar 25 17:08:05 2009 +0100
@@ -611,7 +611,7 @@
     state = STATE_INPLACEACTIVE;
     return COM.S_OK;
 }
-override protected HRESULT QueryInterface(REFIID riid, void ** ppvObject) {
+override protected HRESULT QueryInterface(REFCIID riid, void ** ppvObject) {
     int nullv = 0;
     int result = super.QueryInterface(riid, ppvObject);
     if (result is COM.S_OK)
@@ -866,14 +866,14 @@
     this(OleControlSite p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
     // interface of IDispatch : IUnknown
     HRESULT GetTypeInfoCount(UINT * pctinfo) { return COM.E_NOTIMPL; }
     HRESULT GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo * ppTInfo) { return COM.E_NOTIMPL; }
-    HRESULT GetIDsOfNames(REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { return COM.E_NOTIMPL; }
+    HRESULT GetIDsOfNames(REFCIID riid, LPCOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { return COM.E_NOTIMPL; }
     // Note : <Shawn> one argument is short !!!
     HRESULT Invoke(DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS* pDispParams,VARIANT* pVarResult,EXCEPINFO* pExcepInfo,UINT* puArgErr) {
         return parent.Invoke(dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
@@ -886,7 +886,7 @@
     this(OleControlSite p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleEventSink.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleEventSink.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleEventSink.d	Wed Mar 25 17:08:05 2009 +0100
@@ -144,7 +144,7 @@
     eventTable.sendEvent (event);
 }
 
-private HRESULT QueryInterface(REFIID riid, void ** ppvObject) {
+private HRESULT QueryInterface(REFCIID riid, void ** ppvObject) {
 
     if (riid is null || ppvObject is null)
         return COM.E_INVALIDARG;
@@ -182,14 +182,14 @@
     OleEventSink parent;
     this(OleEventSink sink) { parent = sink;}
 extern (Windows) :
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject){
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject){
         return parent.QueryInterface(riid, ppvObject);
     }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
     HRESULT GetTypeInfoCount(UINT * pctinfo) { return COM.E_NOTIMPL; }
     HRESULT GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo * ppTInfo) { return COM.E_NOTIMPL; }
-    HRESULT GetIDsOfNames(REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { return COM.E_NOTIMPL; }
+    HRESULT GetIDsOfNames(REFCIID riid, LPCOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { return COM.E_NOTIMPL; }
     HRESULT Invoke(DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS* pDispParams,VARIANT* pVarResult,EXCEPINFO* pExcepInfo,UINT* puArgErr){
         return parent.Invoke(dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
     }
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleFrame.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleFrame.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OleFrame.d	Wed Mar 25 17:08:05 2009 +0100
@@ -574,7 +574,7 @@
         objIOleInPlaceActiveObject.ResizeBorder(&lpRect, iOleInPlaceFrame, true);
     }
 }
-private HRESULT QueryInterface(REFIID riid, void** ppvObject) {
+private HRESULT QueryInterface(REFCIID riid, void** ppvObject) {
 //  implements IUnknown, IOleInPlaceFrame, IOleContainer, IOleInPlaceUIWindow
     if (riid is null || ppvObject is null)
         return COM.E_INVALIDARG;
@@ -812,7 +812,7 @@
     this(OleFrame p) { parent = p; }
 extern (Windows) :
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }
 
diff -r 63aa48e5430f -r b98647bc0aef org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OlePropertyChangeSink.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OlePropertyChangeSink.d	Wed Mar 25 16:13:14 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/OlePropertyChangeSink.d	Wed Mar 25 17:08:05 2009 +0100
@@ -134,7 +134,7 @@
     notifyListener(dispID,event);
     return (event.doit) ? COM.S_OK : COM.S_FALSE;
 }
-protected HRESULT QueryInterface(REFIID riid, void ** ppvObject) {
+protected HRESULT QueryInterface(REFCIID riid, void ** ppvObject) {
     if (riid is null || ppvObject is null)
         return COM.E_INVALIDARG;
 
@@ -167,7 +167,7 @@
     this(OlePropertyChangeSink  p) { parent = p; }
 extern (Windows):
     // interface of IUnknown
-    HRESULT QueryInterface(REFIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
+    HRESULT QueryInterface(REFCIID riid, void ** ppvObject) { return parent.QueryInterface(riid, ppvObject); }
     ULONG AddRef()  { return parent.AddRef(); }
     ULONG Release() { return parent.Release(); }