Changeset 17

Timestamp:

02/17/08 20:47:58 (6 months ago)

Author:

Chris Miller

Message:

Minor

Files:

• trunk/win32/dfl/control.d (modified) (1 diff)
• trunk/win32/dfl/internal/com.d (modified) (6 diffs)
• trunk/win32/dfl/internal/dlib.d (modified) (3 diffs)

trunk/win32/dfl/control.d

@@ -800 +800 @@
-            if(!i)
-                children = children[1 .. children.length];
-
+else 
-                children = children[0 .. i];
-            else

trunk/win32/dfl/internal/com.d

@@ -6 +6 @@
-
-private import dfl.internal.winapi, dfl.internal.wincom, dfl.internal.dlib;
+
+
+version(DFL_TANGO_SEEK_COMPAT)
+{
+}
+else
+{
+    version = DFL_TANGO_NO_SEEK_COMPAT;
+}
-
-
@@ -20 +29 @@
-package class DflComObject: ComObject
-{
- 
+
-    
-    override ULONG AddRef()
@@ -112 +121 @@
-            version(Tango)
-            {
-
+
+
+
+
-            }
-            else
-            {
+                if(!stm.writeable)
+                    return E_NOTIMPL;
-                written = stm.writeBlock(pv, cb);
-            }
@@ -132 +146 @@
-    
-    
+    version(DFL_TANGO_NO_SEEK_COMPAT)
+    {
+    }
+    else
+    {
+        long _fakepos = 0;
+    }
+    
+    
-    HRESULT Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
-    {
-        version(Tango)
-        {
-            auto stmseek = cast(DStream.Seek)stm;
-            if(!stmseek)
-                return S_FALSE; // ?
-        }
-        else
-        {
-            if(!stm.seekable)
-                return S_FALSE; // ?
-        }
-        
-        HRESULT result = S_OK;
-        
+        //printf("seek move=%u, origin=0x%x\n", cast(uint)dlibMove.QuadPart, dwOrigin);
+        
-        try
-        {
@@ -153 +166 @@
-            {
-                long pos;
-
+
+
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
+                else
+                {
+                    switch(dwOrigin)
+                    {
+                        case STREAM_SEEK_SET:
+                            pos = stmseek.seek(dlibMove.QuadPart, DSeekStream.Anchor.Begin);
+                            if(plibNewPosition)
+                                plibNewPosition.QuadPart = pos;
+                            break;
+                        
+                        case STREAM_SEEK_CUR:
+                            pos = stmseek.seek(dlibMove.QuadPart, DSeekStream.Anchor.Current);
+                            if(plibNewPosition)
+                                plibNewPosition.QuadPart = pos;
+                            break;
+                        
+                        case STREAM_SEEK_END:
+                            pos = stmseek.seek(dlibMove.QuadPart, DSeekStream.Anchor.End);
+                            if(plibNewPosition)
+                                plibNewPosition.QuadPart = pos;
+                            break;
+                        
+                        default:
+                            result = STG_E_INVALIDFUNCTION;
+                    }
+                }
-            }
-            else
-            {
+                if(!stm.seekable)
+                    //return S_FALSE; // ?
+                    return E_NOTIMPL; // ?
+                
-                ulong pos;
-                switch(dwOrigin)
@@ -230 +295 @@
-    {
-        // Ignore -grfCommitFlags- and just flush the stream..
-
+
+
+
+
+
+
+
+
+
+
+
+
-        return S_OK; // ?
-    }

trunk/win32/dfl/internal/dlib.d

@@ -45 +45 @@
-    }
-    else version(DFL_TANGO0992)
+    {
+        version = DFL_TANGObefore0994;
+    }
+    else version(DFL_TANGO0993)
-    {
-        version = DFL_TANGObefore0994;
@@ -339 +343 @@
-    private import tango.io.model.IConduit;
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    alias tango.core.Exception.IOException DStreamException; // Note: from tango.core.Exception.
@@ -450 +465 @@
-    
-    alias std.stream.Stream DStream;
+    
+    alias std.stream.OutputStream DOutputStream;
-    
-    alias std.stream.StreamException DStreamException;