Changeset 381 for trunk

Timestamp:

Nov 15, 2007, 3:26:33 AM (17 years ago)

Author:

dai

Message:

COMインターフェイスが扱えないデグレを修正。
※COMインターフェイスの定義では必ずIUnkownを継承してください

Location:

trunk

Files:

• Include/Classes/System/Collections/ArrayList.ab (modified) (1 diff)
• Include/Classes/System/IO/Stream.ab (modified) (1 diff)
• Include/Classes/System/Threading/WaitHandle.ab (modified) (1 diff)
• Include/Classes/System/Windows/Forms/Control.ab (modified) (2 diffs)
• Include/directx9/d3dx9tex.sbp (modified) (1 diff)
• Include/unknwn.sbp (modified) (1 diff)
• bin/BasicCompiler32.exe (modified) ( previous)
• bin/BasicCompiler64.exe (modified) ( previous)

trunk/Include/Classes/System/Collections/ArrayList.ab

@@ -7 +7 @@
 
 Class ArrayList
-    Inherits IList /*, ICollection, IEnumerable, ICloneable*/
+    Implements IList /*, ICollection, IEnumerable, ICloneable*/
 
     pObject As *Object

trunk/Include/Classes/System/IO/Stream.ab

@@ -4 +4 @@
 
 Class Stream
-    Inherits System.IDisposable
+    Implements System.IDisposable
 
 Public 'Protected

trunk/Include/Classes/System/Threading/WaitHandle.ab

@@ -14 +14 @@
 
 Class WaitHandle
-    Inherits System.IDisposable
+    Implements System.IDisposable
 Public
     ' Properties

trunk/Include/Classes/System/Windows/Forms/Control.ab

@@ -28 +28 @@
 
 Class AsyncResultForInvoke
-    Inherits System.IAsyncResult
+    Implements System.IAsyncResult
 Public
     ' Properties
@@ -35 +35 @@
     End Sub
 
-    Override Function AsyncState() As Object
+    Function AsyncState() As Object
         Return Nothing
     End Function
 
-    Override Function AsyncWaitHandle() As System.Threading.WaitHandle
+    Function AsyncWaitHandle() As System.Threading.WaitHandle
         Return waitHandle
     End Function
 
-    Override Function CompletedSynchronously() As Boolean
+    Function CompletedSynchronously() As Boolean
         Return False
     End Function
 
-    Override Function IsCompleted() As Boolean
+    Function IsCompleted() As Boolean
         Return waitHandle.WaitOne(0, False)
     End Function

trunk/Include/directx9/d3dx9tex.sbp

@@ -118 +118 @@
 Declare Function D3DXCreateTextureFromFileEx Lib "dx9abm" Alias "D3DXCreateTextureFromFileEx_abm" (pDevice As LPDIRECT3DDEVICE9, pSrcFile As BytePtr, Width As DWord, Height As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppTexture As *LPDIRECT3DTEXTURE9) As DWord
 Declare Function D3DXCreateCubeTextureFromFileEx Lib "dx9abm" Alias "D3DXCreateCubeTextureFromFileEx_abm" (pDevice As LPDIRECT3DDEVICE9, pSrcFile As BytePtr, Size As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppCubeTexture As *LPDIRECT3DCUBETEXTURE9) As DWord
-Declare Function D3DXCreateVolumeTextureFromFileEx Lib "dx9abm" Alias "D3DXCreateVolumeTextureFromFileEx_abm" (pDevice As LPDIRECT3DDEVICE9, pSrcFile As BytePtr, Width As DWord, Height As Dword, Depth As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppVolumeTexture As *LPDIRECT3DVOLUMETEXTURE9) As DWord
+Declare Function D3DXCreateVolumeTextureFromFileEx Lib "dx9abm" Alias "D3DXCreateVolumeTextureFromFileEx_abm" (pDevice As LPDIRECT3DDEVICE9, pSrcFile As BytePtr, Width As DWord, Height As DWord, Depth As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppVolumeTexture As *LPDIRECT3DVOLUMETEXTURE9) As DWord
 Declare Function D3DXCreateTextureFromResourceEx Lib "dx9abm" Alias "D3DXCreateTextureFromResourceEx_abm" (pDevice As LPDIRECT3DDEVICE9, hSrcModule As HINSTANCE, pSrcResource As BytePtr, Width As DWord, Height As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppTexture As *LPDIRECT3DTEXTURE9) As DWord
 Declare Function D3DXCreateCubeTextureFromResourceEx Lib "dx9abm" Alias "D3DXCreateCubeTextureFromResourceEx_abm" (pDevice As LPDIRECT3DDEVICE9, hSrcModule As HINSTANCE, pSrcResource As BytePtr, Size As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppCubeTexture As *LPDIRECT3DCUBETEXTURE9) As DWord
-Declare Function D3DXCreateVolumeTextureFromResourceEx Lib "dx9abm" Alias "D3DXCreateVolumeTextureFromResourceEx_abm" (pDevice As LPDIRECT3DDEVICE9, hSrcModule As HINSTANCE, pSrcResource As BytePtr, Width As DWord, Height As Dword, Depth As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppVolumeTexture As *LPDIRECT3DVOLUMETEXTURE9) As DWord
+Declare Function D3DXCreateVolumeTextureFromResourceEx Lib "dx9abm" Alias "D3DXCreateVolumeTextureFromResourceEx_abm" (pDevice As LPDIRECT3DDEVICE9, hSrcModule As HINSTANCE, pSrcResource As BytePtr, Width As DWord, Height As DWord, Depth As DWord, MipLevels As DWord, Usage As DWord, Format As D3DFORMAT, Pool As D3DPOOL, Filter As DWord, MipFilter As DWord, ColorKey As D3DCOLOR, pSrcInfo As *D3DXIMAGE_INFO, pPalette As *PALETTEENTRY, ppVolumeTexture As *LPDIRECT3DVOLUMETEXTURE9) As DWord
 Declare Function D3DXCreateTextureFromFileInMemory Lib "dx9abm" Alias "D3DXCreateTextureFromFileInMemory_abm" (pDevice As LPDIRECT3DDEVICE9, pSrcData As VoidPtr, SrcDataSize As DWord, ppTexture As *LPDIRECT3DTEXTURE9) As DWord
 Declare Function D3DXCreateCubeTextureFromFileInMemory Lib "dx9abm" Alias "D3DXCreateCubeTextureFromFileInMemory_abm" (pDevice As LPDIRECT3DDEVICE9, pSrcData As VoidPtr, SrcDataSize As DWord, ppCubeTexture As *LPDIRECT3DCUBETEXTURE9) As DWord

trunk/Include/unknwn.sbp

@@ -12 +12 @@
 
 Interface IUnknown
+    __COM
     Function QueryInterface(ByRef riid As IID, ByRef pvObj As Any) As HRESULT
     Function AddRef() As DWord