diff org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/dnd/Clipboard.d @ 43:b98647bc0aef

swt win compiles for d2+phobos
author Frank Benoit <benoit@tionex.de>
date Wed, 25 Mar 2009 17:08:05 +0100
parents 52184e4b815c
children 9f4c18c268b2
line wrap: on
line diff
--- 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(); }